summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2015-02-08 17:12:52 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2015-02-08 17:19:03 +0100
commit2283008525b93422172f15fff11f4c6310b2d55a (patch)
tree393d3e09dc5c6a305c7ae60f8124e95217c349da
parentf662070be39619437d9a15fceec9c908a81b2296 (diff)
downloadembtoolkit-2283008525b93422172f15fff11f4c6310b2d55a.tar.gz
embtoolkit-2283008525b93422172f15fff11f4c6310b2d55a.tar.bz2
embtoolkit-2283008525b93422172f15fff11f4c6310b2d55a.tar.xz
Toolchain: clang/llvm/arm: use clang++ compiler as it supports now exceptions
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--core/toolchain/vars.mk14
1 files changed, 4 insertions, 10 deletions
diff --git a/core/toolchain/vars.mk b/core/toolchain/vars.mk
index 8dee2c7..dd48037 100644
--- a/core/toolchain/vars.mk
+++ b/core/toolchain/vars.mk
@@ -38,15 +38,10 @@ __TARGETCC-$(embtk_toolchain_use_llvm-y) := $(TARGETCLANG)
__TARGETCXX-$(embtk_toolchain_use_llvm-y) := $(TARGETCLANGXX)
#
-# FIXME: remove this when clang++ will support exceptions in c++ for arm,
-# as exceptions seem to work for mips.
+# c++ exceptions handling on arm work only since llvm-3.5.x
#
-ifeq ($(CONFIG_EMBTK_ARCH_MIPS),y)
-__TARGETCXX-$(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN) := $(TARGETCLANGXX)
-__TARGETCXX-$(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN) := $(TARGETCLANGXX)
-else
-__TARGETCXX-$(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN) := $(TARGETGCXX)
-__TARGETCXX-$(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN) := $(TARGETGCXX)
+ifeq ($(CONFIG_EMBTK_ARCH_ARM)$(CONFIG_EMBTK_LLVM_HOST_VERSION_3_4_1),yy)
+__TARGETCXX-$(embtk_toolchain_use_llvm-y) := $(TARGETGCXX)
endif
TARGETCC := $(__TARGETCC-y)
@@ -88,8 +83,7 @@ __TARGET_CFLAGS += $(if $(CONFIG_EMBTK_TARGET_WITH_DEBUG_DATA),-g)
# cflags for clang
__clang_cflags := -Qunused-arguments
-__TARGET_CFLAGS += $(if $(CONFIG_EMBTK_LLVM_ONLY_TOOLCHAIN),$(__clang_cflags))
-__TARGET_CFLAGS += $(if $(CONFIG_EMBTK_LLVM_DEFAULT_TOOLCHAIN),$(__clang_cflags))
+__TARGET_CFLAGS += $(if $(embtk_toolchain_use_llvm-y),$(__clang_cflags))
TARGET_CFLAGS := $(strip $(__TARGET_CFLAGS))
TARGET_CXXFLAGS := $(filter-out $(__clang_cflags),$(TARGET_CFLAGS))