toolchain/gcc: don't enable libssp support

It's broken anyway as we don't install libssp* into TARGET_DIR, and we
should use the SSP support in uClibc if we want stack protection.

diff --git a/toolchain/gcc/Makefile.in b/toolchain/gcc/Makefile.in
index aaf45135a97d6370fda92618a0be7e86d0b263b7..a1c55645681bbd9a08f3ac61795ff12455971a2b 100644 (file)
--- a/toolchain/gcc/Makefile.in
+++ b/toolchain/gcc/Makefile.in
@@ -74,7 +74,6 @@ endif
 ifeq ($(BR2_avr32),y)
 EXTRA_GCC_CONFIG_OPTIONS+=--disable-libmudflap
 SOFT_FLOAT_CONFIG_OPTION:=
-EXTRA_GCC_CONFIG_OPTIONS+=--disable-libssp
 EXTRA_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin \
 #EXTRA_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as
 endif
@@ -90,7 +89,6 @@ EXTRA_TARGET_GCC_CONFIG_OPTIONS:=
 # AVR32 target GCC configuration
 ifeq ($(BR2_avr32),y)
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--disable-libmudflap
-EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--disable-libssp
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--with-build-time-tools=$(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/bin \
 EXTRA_TARGET_GCC_CONFIG_OPTIONS+=--with-as=$(TARGET_CROSS)as
 endif

diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk
index a734eeffbc58438572264574b451d67e72b14c32..131c9bd5a155dab2a9a19ac8cac26d181e4e2178 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-3.x.mk
+++ b/toolchain/gcc/gcc-uclibc-3.x.mk
@@ -181,6 +181,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
                --enable-target-optspace \
                --with-gnu-ld \
                --disable-shared \
+               --disable-libssp \
                $(GCC_WITH_HOST_GMP) \
                $(GCC_WITH_HOST_MPFR) \
                $(DISABLE_NLS) \
@@ -246,6 +247,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(GCC_STAGING_PREREQ)
                --disable-__cxa_atexit \
                --enable-target-optspace \
                --with-gnu-ld \
+               --disable-libssp \
                $(GCC_WITH_HOST_GMP) \
                $(GCC_WITH_HOST_MPFR) \
                $(GCC_SHARED_LIBGCC) \
@@ -396,6 +398,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
                --disable-__cxa_atexit \
                --with-gnu-ld \
                --with-gnu-as \
+               --disable-libssp \
                $(GCC_SHARED_LIBGCC) \
                $(GCC_WITH_TARGET_GMP) \
                $(GCC_WITH_TARGET_MPFR) \

diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk
index c8ca75e289b26c353c994876f2f145eb67cf6756..749331fc0e925955a37b0126e77e005177b2884c 100644 (file)
--- a/toolchain/gcc/gcc-uclibc-4.x.mk
+++ b/toolchain/gcc/gcc-uclibc-4.x.mk
@@ -205,6 +205,7 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
                --enable-target-optspace \
                --with-gnu-ld \
                --disable-shared \
+               --disable-libssp \
                $(GCC_WITH_HOST_GMP) \
                $(GCC_WITH_HOST_MPFR) \
                $(DISABLE_NLS) \
@@ -279,6 +280,7 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_SRC_DIR)/.patched $(GCC_STAGING_PREREQ)
                --disable-__cxa_atexit \
                --enable-target-optspace \
                --with-gnu-ld \
+               --disable-libssp \
                $(GCC_SHARED_LIBGCC) \
                $(GCC_WITH_HOST_GMP) \
                $(GCC_WITH_HOST_MPFR) \
@@ -407,6 +409,7 @@ $(GCC_BUILD_DIR3)/.configured: $(GCC_BUILD_DIR3)/.prepared
                --with-gxx-include-dir=/usr/include/c++ \
                --disable-__cxa_atexit \
                --with-gnu-ld \
+               --disable-libssp \
                $(GCC_SHARED_LIBGCC) \
                $(GCC_WITH_TARGET_GMP) \
                $(GCC_WITH_TARGET_MPFR) \