diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-22 01:18:10 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2013-03-22 01:18:10 +0100 |
| commit | d2b82063e6b35b22f217c85915dba83f5815acf8 (patch) | |
| tree | fc5fc2db9b48003ade8f10d6064d10021011a4ad /mk/llvm | |
| parent | 3e9ad2447b2abd3220b272468d31f903279d22f2 (diff) | |
| download | embtoolkit-d2b82063e6b35b22f217c85915dba83f5815acf8.tar.gz embtoolkit-d2b82063e6b35b22f217c85915dba83f5815acf8.tar.bz2 embtoolkit-d2b82063e6b35b22f217c85915dba83f5815acf8.tar.xz | |
Toolchain: llvm/compiler-rt/ARM: work for clang cflags
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk/llvm')
| -rw-r--r-- | mk/llvm/compiler-rt/Makefile | 2 | ||||
| -rw-r--r-- | mk/llvm/compiler-rt/compiler-rt.mk | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/mk/llvm/compiler-rt/Makefile b/mk/llvm/compiler-rt/Makefile index 1e5cc4e..f99cb28 100644 --- a/mk/llvm/compiler-rt/Makefile +++ b/mk/llvm/compiler-rt/Makefile @@ -73,7 +73,7 @@ CC ?= gcc CXX ?= g++ SANCOMMON_CFLAGS := -W -Wall -fPIC -fno-builtin -fno-exceptions -SANCOMMON_CFLAGS += -fomit-frame-pointer -funwind-tables -fno-rtti +SANCOMMON_CFLAGS += -fomit-frame-pointer -funwind-tables SANCOMMON_CFLAGS += -fvisibility=hidden ARFLAGS := rvs diff --git a/mk/llvm/compiler-rt/compiler-rt.mk b/mk/llvm/compiler-rt/compiler-rt.mk index a4d7fa8..08627c9 100644 --- a/mk/llvm/compiler-rt/compiler-rt.mk +++ b/mk/llvm/compiler-rt/compiler-rt.mk @@ -31,7 +31,15 @@ COMPILER-RT_PACKAGE := compiler-rt-$(COMPILER-RT_VERSION).src.tar.gz COMPILER-RT_SRC_DIR := $(embtk_toolsb)/compiler-rt-$(COMPILER-RT_VERSION).src COMPILER-RT_BUILD_DIR := $(call __embtk_pkg_srcdir,compiler-rt) -COMPILER-RT_MAKE_OPTS := CC="$(TARGETCC)" CFLAGS="$(TARGET_CFLAGS)" +__embtk_compiler-rt_cflags := $(TARGET_CFLAGS) +# +# FIXME: remove this when c++ exceptions handling fully supported in ARM +# +ifeq ($(TARGETCXX),$(TARGETGCXX)) +__embtk_compiler-rt_cflags := $(filter-out $(__clang_cflags),$(__embtk_compiler-rt_cflags)) +endif + +COMPILER-RT_MAKE_OPTS := CC="$(TARGETCC)" CFLAGS="$(__embtk_compiler-rt_cflags)" COMPILER-RT_MAKE_OPTS += CXX="$(TARGETCXX)" LIBDIR="$(LIBDIR)" COMPILER-RT_MAKE_OPTS += AR=$(TARGETAR) RANLIB=$(TARGETRANLIB) COMPILER-RT_MAKE_OPTS += SYSROOT="$(embtk_sysroot)" |