summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-06 14:00:33 +0100
committerAbdoulaye Walsimou Gaye <awg@embtoolkit.org>2013-01-06 14:00:33 +0100
commit33724cb173cc401d7f23e58d381681832721eb43 (patch)
tree0a8c3d0d66c6d0ae5cd7d3f2a70c6773761cb314
parent1dd7eaf1a247ba69b18e2ac6ba98067af875a0b1 (diff)
downloadembtoolkit-33724cb173cc401d7f23e58d381681832721eb43.tar.gz
embtoolkit-33724cb173cc401d7f23e58d381681832721eb43.tar.bz2
embtoolkit-33724cb173cc401d7f23e58d381681832721eb43.tar.xz
Toolchain: gcc: enable __cxa_atexit only when c++ or obj-c++ if used
Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>
-rw-r--r--mk/gcc.mk8
1 files changed, 6 insertions, 2 deletions
diff --git a/mk/gcc.mk b/mk/gcc.mk
index d460671..7a23d0a 100644
--- a/mk/gcc.mk
+++ b/mk/gcc.mk
@@ -44,6 +44,8 @@ __GCC_LANGUAGES += $(if $(CONFIG_EMBTK_GCC_LANGUAGE_FORTRAN),fortran)
__GCC_LANGUAGES += $(if $(CONFIG_EMBTK_GCC_LANGUAGE_ADA),ada)
GCC_LANGUAGES := $(subst $(embtk_space),$(embtk_comma),$(strip $(__GCC_LANGUAGES)))
+GCC_CXA_ATEXIT-$(CONFIG_EMBTK_GCC_LANGUAGE_CPP) := --enable-__cxa_atexit
+GCC_CXA_ATEXIT-$(CONFIG_EMBTK_GCC_LANGUAGE_OBJECTIVECPP) := --enable-__cxa_atexit
#
# Final GCC extra configure options
@@ -117,8 +119,10 @@ GCC2_CONFIGURE_OPTS := --with-sysroot=$(embtk_sysroot) \
--with-gmp=$(GMP_HOST_DIR) --with-mpfr=$(MPFR_HOST_DIR) \
--with-mpc=$(MPC_HOST_DIR) --with-bugurl=$(EMBTK_BUGURL) \
--with-pkgversion=embtoolkit-$(EMBTK_VERSION) \
+ --disable-libquadmath \
--disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \
- --enable-languages=c --enable-target-optspace --disable-libquadmath
+ --enable-languages=c --enable-target-optspace --enable-threads \
+ $(GCC_CXA_ATEXIT-y)
CONFIG_EMBTK_GCC2_VERSION_GIT := $(CONFIG_EMBTK_GCC_VERSION_GIT)
CONFIG_EMBTK_GCC2_REFSPEC := $(CONFIG_EMBTK_GCC_REFSPEC)
@@ -168,7 +172,7 @@ GCC3_CONFIGURE_OPTS := --with-sysroot=$(embtk_sysroot) \
--with-pkgversion=embtoolkit-$(EMBTK_VERSION) \
--disable-libssp --disable-libgomp --disable-libmudflap --disable-nls \
--disable-libquadmath \
- --enable-languages=$(GCC_LANGUAGES) --enable-__cxa_atexit \
+ --enable-languages=$(GCC_LANGUAGES) $(GCC_CXA_ATEXIT-y) \
--enable-threads --enable-shared --enable-target-optspace \
$(GCC3_CONFIGURE_EXTRA_OPTIONS)