diff options
| author | Patrick Georgi <patrick@georgi-clan.de> | 2014-05-14 21:05:35 +0200 |
|---|---|---|
| committer | Patrick Georgi <patrick@georgi-clan.de> | 2014-05-26 09:23:55 +0200 |
| commit | cc84a001b8b71d457f30e5520c1583bbd297d691 (patch) | |
| tree | bbc17cd3ca8ea102253ff59f010c6d4cf0646d4d | |
| parent | 20ea04034dd1d2a1660e6d5fc9f5e8bc6c7859f4 (diff) | |
build system: re-enable clang use
Change-Id: I6e07fdec449d0b259d77986f65a60aa36d367cc8
Signed-off-by: Patrick Georgi <patrick@georgi-clan.de>
Signed-off-by: Edward O'Callaghan <eocallaghan@alterapraxis.com>
Reviewed-on: http://review.coreboot.org/5747
Tested-by: build bot (Jenkins)
| -rw-r--r-- | Makefile | 24 | ||||
| -rw-r--r-- | Makefile.inc | 2 |
2 files changed, 22 insertions, 4 deletions
@@ -107,13 +107,31 @@ else include $(HAVE_DOTCONFIG) -include toolchain.inc - ifeq ($(CONFIG_COMPILER_LLVM_CLANG),y) -CC:=clang -m32 -mno-mmx -mno-sse -no-integrated-as +# FIXME: armv7/aarch64 won't build right now +CFLAGS_x86_32 = -no-integrated-as -Qunused-arguments -target i386-elf -m32 +CC_x86_32:=clang + +ifneq ($(CONFIG_MMX),y) +CFLAGS_x86_32 += -mno-mmx +endif + +# FIXME: we end up with conflicting flags with this, not clear on this part. +#ifneq ($(CONFIG_SSE),y) +#CFLAGS_x86_32 += -mno-sse +#endif + +CFLAGS_armv7 = -no-integrated-as -Qunused-arguments -target armv7-eabi -ccc-gcc-name $(CC_armv7) +CC_armv7:=clang + +CFLAGS_aarch64 = -no-integrated-as -Qunused-arguments -target aarch64-eabi -ccc-gcc-name $(CC_aarch64) +CC_aarch64:=clang + HOSTCC:=clang endif +include toolchain.inc + strip_quotes = $(subst ",,$(subst \",,$(1))) # The primary target needs to be here before we include the diff --git a/Makefile.inc b/Makefile.inc index 2b62e785f1..b9a3fe9ec4 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -218,7 +218,7 @@ CPPFLAGS_common := -Isrc -Isrc/include -I$(obj) CPPFLAGS_common += -Isrc/device/oprom/include CPPFLAGS_common += -include $(src)/include/kconfig.h -CFLAGS_common = -Os -pipe -g -nostdinc +CFLAGS_common += -Os -pipe -g -nostdinc CFLAGS_common += -nostdlib -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes CFLAGS_common += -Wwrite-strings -Wredundant-decls -Wno-trigraphs CFLAGS_common += -Wstrict-aliasing -Wshadow |