Commit ab64b95e authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

toolchain: move Stack Protection Support option 



The BR2_USE_SSP option is only used inside the uClibc build, so only
meaningful for Buildroot internal toolchains. Therefore, the option is
moved to the right location so that it isn't visible when working with
external toolchains.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 6b578c8d

toolchain/toolchain-buildroot/Config.in.2

+9 −0
Original line number Diff line number Diff line
@@ -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"

toolchain/toolchain-common.in

+0 −9
Original line number Diff line number Diff line
@@ -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

toolchain/uClibc/uclibc.mk

+1 −1
Original line number Diff line number Diff line
@@ -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