summaryrefslogtreecommitdiff
path: root/util/xcompile
diff options
context:
space:
mode:
authorPatrick Georgi <patrick@georgi-clan.de>2015-06-04 13:45:40 +0200
committerPatrick Georgi <pgeorgi@google.com>2015-06-04 20:02:01 +0200
commit34de29aeb3a8d5013044fea9387609ea63d8ecf6 (patch)
treeffc9d930d227fe9a352ccb970dc08114f318affb /util/xcompile
parent45dd591ff6e55a71dbe539588de673a9d4a2bc35 (diff)
build system: move more clang handling to xcompile
clang requires some additional options to disable warnings which can be handled by xcompile. Also drop the hard coded clang compilers in Makefile Change-Id: I0f12f755420f315127e6d9adc00b1246c6e7131b Signed-off-by: Patrick Georgi <patrick@georgi-clan.de> Reviewed-on: http://review.coreboot.org/7612 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'util/xcompile')
-rwxr-xr-xutil/xcompile/xcompile17
1 files changed, 12 insertions, 5 deletions
diff --git a/util/xcompile/xcompile b/util/xcompile/xcompile
index 66b011a685..8b20d662f5 100755
--- a/util/xcompile/xcompile
+++ b/util/xcompile/xcompile
@@ -98,13 +98,13 @@ testas() {
# Architecture matched.
GCCPREFIX="$gccprefix"
- if [ -z "$use_dash_twidth" ]; then
- ASFLAGS=""
- CFLAGS_GCC=""
- LDFLAGS=""
- else
+ unset ASFLAGS LDFLAGS
+ unset CFLAGS_GCC CFLAGS_CLANG
+
+ if [ -n "$use_dash_twidth" ]; then
ASFLAGS="--$twidth"
CFLAGS_GCC="-m$twidth"
+ CFLAGS_CLANG="-m$twidth"
LDFLAGS="-b $full_arch"
fi
@@ -114,6 +114,7 @@ testas() {
"elf32-i386" )
LDFLAGS="$LDFLAGS -melf_i386"
CFLAGS_GCC="$CFLAGS_GCC -Wl,-b,elf32-i386 -Wl,-melf_i386"
+ CFLAGS_CLANG="$CFLAGS_GCC -Wl,-b,elf32-i386 -Wl,-melf_i386"
;;
esac
@@ -140,6 +141,8 @@ detect_special_flags() {
x86)
testcc "$GCC" "$CFLAGS_GCC -Wa,--divide" &&
CFLAGS_GCC="$CFLAGS_GCC -Wa,--divide"
+ testcc "$CLANG" "$CFLAGS_CLANG -Wa,--divide" &&
+ CFLAGS_CLANG="$CFLAGS_CLANG -Wa,--divide"
# Always build for i686 -- no sse/mmx instructions since SMM
# modules are compiled using these flags. Note that this
# doesn't prevent a project using xcompile to explicitly
@@ -174,6 +177,10 @@ COMPILER_RT_${TARCH}:=${CC_RT_GCC}
COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_GCC}
else
CC_${TARCH}:=${CLANG}
+CFLAGS_${TARCH}:=${CFLAGS_CLANG}
+CFLAGS_${TARCH}+=-no-integrated-as -Qunused-arguments -m${TWIDTH}
+# tone down compiler warnings
+CFLAGS_${TARCH}+=-Wno-unused-variable -Wno-unused-function -Wno-tautological-compare -Wno-shift-overflow
COMPILER_RT_${TARCH}:=${CC_RT_CLANG}
COMPILER_RT_FLAGS_${TARCH}:=${CC_RT_EXTRA_CLANG}
endif