mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-24 00:14:05 +02:00
Disable smash stacking support by default, but allow to enable it as an experimental feature
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12010 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
512b9e875d
commit
2c8df11418
@ -78,6 +78,7 @@ endef
|
|||||||
|
|
||||||
define Package/libssp
|
define Package/libssp
|
||||||
$(call Package/gcc/Default)
|
$(call Package/gcc/Default)
|
||||||
|
DEPENDS:=@SSP_SUPPORT
|
||||||
TITLE:=GCC support library
|
TITLE:=GCC support library
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
@ -53,6 +53,13 @@ config EXTRA_GCC_CONFIG_OPTIONS
|
|||||||
help
|
help
|
||||||
Any additional gcc options you may want to include....
|
Any additional gcc options you may want to include....
|
||||||
|
|
||||||
|
config SSP_SUPPORT
|
||||||
|
bool
|
||||||
|
prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
|
||||||
|
default n
|
||||||
|
help
|
||||||
|
Enable Smash Stacking Protection support
|
||||||
|
|
||||||
config INSTALL_LIBSTDCPP
|
config INSTALL_LIBSTDCPP
|
||||||
bool
|
bool
|
||||||
prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
|
prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS
|
||||||
|
@ -40,6 +40,12 @@ BUILD_DIR2:=$(BUILD_DIR_HOST)/gcc-$(PKG_VERSION)-final
|
|||||||
SEP:=,
|
SEP:=,
|
||||||
TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)"
|
TARGET_LANGUAGES:="c$(if $(CONFIG_INSTALL_LIBSTDCPP),$(SEP)c++)$(if $(CONFIG_INSTALL_LIBGCJ),$(SEP)java)"
|
||||||
|
|
||||||
|
ifeq ($(CONFIG_SSP_SUPPORT),y)
|
||||||
|
SSP:=--enable-ssp
|
||||||
|
else
|
||||||
|
SSP:=--disable-ssp
|
||||||
|
endif
|
||||||
|
|
||||||
EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-biarch --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc)
|
EXTRA_TARGET=$(if $(CONFIG_EXTRA_TARGET_ARCH),--enable-biarch --enable-targets=$(call qstrip,$(CONFIG_EXTRA_TARGET_ARCH_NAME))-linux-uclibc)
|
||||||
|
|
||||||
define Stage1/Configure
|
define Stage1/Configure
|
||||||
@ -62,6 +68,7 @@ define Stage1/Configure
|
|||||||
--disable-nls \
|
--disable-nls \
|
||||||
--disable-libmudflap \
|
--disable-libmudflap \
|
||||||
--disable-multilib \
|
--disable-multilib \
|
||||||
|
$(SSP) \
|
||||||
$(EXTRA_TARGET) \
|
$(EXTRA_TARGET) \
|
||||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
$(SOFT_FLOAT_CONFIG_OPTION) \
|
||||||
$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
|
$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
|
||||||
@ -96,6 +103,7 @@ define Stage2/Configure
|
|||||||
--disable-nls \
|
--disable-nls \
|
||||||
--disable-libmudflap \
|
--disable-libmudflap \
|
||||||
--disable-multilib \
|
--disable-multilib \
|
||||||
|
$(SSP) \
|
||||||
$(EXTRA_TARGET) \
|
$(EXTRA_TARGET) \
|
||||||
$(SOFT_FLOAT_CONFIG_OPTION) \
|
$(SOFT_FLOAT_CONFIG_OPTION) \
|
||||||
$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
|
$(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \
|
||||||
|
Loading…
Reference in New Issue
Block a user