diff options
| -rw-r--r-- | toolchain/toolchain-buildroot/Config.in.2 | 9 | ||||
| -rw-r--r-- | toolchain/toolchain-common.in | 9 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2 index cf426ee32..f1b0a7c58 100644 --- a/toolchain/toolchain-buildroot/Config.in.2 +++ b/toolchain/toolchain-buildroot/Config.in.2 @@ -67,6 +67,15 @@ comment "C++ support broken in uClibc 0.9.31 with locale enabled with gcc 4.2" BR2_TOOLCHAIN_BUILDROOT_LOCALE && \ BR2_UCLIBC_VERSION_0_9_31 +config BR2_TOOLCHAIN_BUILDROOT_USE_SSP + bool "Enable stack protection support" + help + Enable stack smashing protection support using GCCs + -fstack-protector[-all] option. + + See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt + for details. + source "toolchain/elf2flt/Config.in" source "toolchain/mklibs/Config.in" source "toolchain/sstrip/Config.in" diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 2c54acdae..5502ab4ff 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -76,15 +76,6 @@ config BR2_SOFT_FLOAT functions, then everything will need to be compiled with soft floating point support (-msoft-float). -config BR2_USE_SSP - bool "Enable stack protection support" - help - Enable stack smashing protection support using GCCs - -fstack-protector[-all] option. - - See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt - for details. - choice prompt "Thread library implementation" default BR2_PTHREADS_OLD diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 1ed40cc67..e05e16c43 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -271,7 +271,7 @@ else -e 's,.*UCLIBC_HAS_FPU.*,UCLIBC_HAS_FPU=y\nHAS_FPU=y\nUCLIBC_HAS_FLOATS=y\n,g' \ $(UCLIBC_DIR)/.oldconfig endif -ifeq ($(BR2_USE_SSP),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y) $(SED) 's,^.*UCLIBC_HAS_SSP[^_].*,UCLIBC_HAS_SSP=y,g' $(UCLIBC_DIR)/.oldconfig else $(SED) 's,^.*UCLIBC_HAS_SSP[^_].*,UCLIBC_HAS_SSP=n,g' $(UCLIBC_DIR)/.oldconfig |