summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-11-17 13:36:36 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2012-11-17 13:36:36 +0100
commitbad61a027dd4fcbd179b14ab20bc2de24b2f8128 (patch)
treec798550bef63efc6bf08263fc1d32b7edb8af53a /mk
parent4ef04e3aff1e5b5ec7b9a31e3ffa406f5a50bf7f (diff)
downloadembtoolkit-bad61a027dd4fcbd179b14ab20bc2de24b2f8128.tar.gz
embtoolkit-bad61a027dd4fcbd179b14ab20bc2de24b2f8128.tar.bz2
embtoolkit-bad61a027dd4fcbd179b14ab20bc2de24b2f8128.tar.xz
Toolchain: do not break c++ applications needing unwind tables
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
Diffstat (limited to 'mk')
-rw-r--r--mk/toolchain.mk11
1 files changed, 7 insertions, 4 deletions
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index 8c40497..b33d68e 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -22,8 +22,11 @@
# \date May 2009
################################################################################
-TARGETCC := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-gcc
-TARGETCXX := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-g++
+TARGETGCC := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-gcc
+TARGETGCXX := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-g++
+
+TARGETCC := $(TARGETGCC)
+TARGETCXX := $(TARGETGCXX)
TARGETAR := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-ar
TARGETRANLIB := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-ranlib
TARGETLD := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-ld
@@ -31,11 +34,11 @@ TARGETNM := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-nm
TARGETSTRIP := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-strip
TARGETOBJDUMP := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-objdump
TARGETOBJCOPY := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-objcopy
-__TARGET_CFLAGS := $(subst ",,$(strip $(CONFIG_EMBTK_TARGET_COMPILER_CFLAGS)))
+__kconfig-cflags := $(strip $(CONFIG_EMBTK_TARGET_COMPILER_CFLAGS))
+__TARGET_CFLAGS := $(subst ",,$(__kconfig-cflags))
__TARGET_CFLAGS += $(if $(CONFIG_EMBTK_TARGET_SIZE_OPTIMIZED),-Os)
__TARGET_CFLAGS += $(if $(CONFIG_EMBTK_TARGET_SPEED_OPTIMIZED),-O3)
__TARGET_CFLAGS += $(if $(CONFIG_EMBTK_TARGET_WITH_DEBUG_DATA),-g)
-__TARGET_CFLAGS += -fno-unwind-tables -fno-asynchronous-unwind-tables
TARGET_CFLAGS := $(strip $(__TARGET_CFLAGS))
CROSS_COMPILE := $(embtk_tools)/bin/$(STRICT_GNU_TARGET)-