summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@anciens.enib.fr>2011-05-22 00:05:42 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2011-05-22 10:19:13 +0200
commit40a203f2548f7445f01e7fb84676c87c313d7884 (patch)
tree96369a679914c788ded19e54dda182b63b7302cf
parent4943afcc912bcdd0f5ba869fa5fc57ffae8e96f1 (diff)
toolchain/crosstool-NG: fix up ct-ng config file to saner defaults
Peter on IRC reported some build failures for different targets. They were of two kinds: - missing/unknown stack unwinding support - missing *_chk functions The first is about configure not being able to automagically determine if stack unwinding support is available for the target. The second is about fortified build forgetting to build the fortified functions. This applies to both glibc and eglibc. After some discussions on IRC with Jacmet, it appears that we can safely assume both of the following: - virtually all targets of buildroot will have stack unwinding support - we do not care about fortified builds (so far) So, update the bundled crosstool-NG .config file to saner defaults: - force unwind support - disable fortified builds [Peter: fix 'force non-fortified build' sed invocation] Reported-by: Peter Korsgaard <jacmet@sunsite.dk> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--toolchain/toolchain-crosstool-ng/crosstool-ng.mk12
1 files changed, 12 insertions, 0 deletions
diff --git a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
index b5066517b..2d1b51c68 100644
--- a/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
+++ b/toolchain/toolchain-crosstool-ng/crosstool-ng.mk
@@ -328,6 +328,18 @@ $(CTNG_DIR)/libc.config: $(CTNG_UCLIBC_CONFIG_FILE) $(CONFIG_DIR)/.config
endif # LIBC is uClibc
#--------------
+# glibc/eglibc specific options
+ifeq ($(BR2_TOOLCHAIN_CTNG_glibc)$(BR2_TOOLCHAIN_CTNG_eglibc),y)
+
+# Force unwind support
+CTNG_FIX_DOT_CONFIG_SED += s:^\# (CT_LIBC_GLIBC_FORCE_UNWIND) is not set:\1=y:;
+
+# Force non-fortified build
+CTNG_FIX_DOT_CONFIG_SED += s:^(CT_LIBC_ENABLE_FORTIFIED_BUILD)=y:\# \1 is not set:;
+
+endif # LIBC is glibc or eglibc
+
+#--------------
# Small functions to shoe-horn the above into crosstool-NG's .config
# Function to update the .config