mr/openwrt
2
0
Fork 1
Code Issues 7 Pull Requests Releases Wiki Activity

toolchain: get rid of GCC_VERSION_5 config symbol

Browse Source 
Replace it with !GCC_VERSION_4_8 to be more future compatible

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-14 12:08:03 +02:00
parent e031940570
commit a4e90e2cac
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/Config-build.in
View File

@ -236,7 +236,7 @@ menu "Global build settings"
config PKG_CC_STACKPROTECTOR_STRONG config PKG_CC_STACKPROTECTOR_STRONG
bool "Strong" bool "Strong"
select SSP_SUPPORT if !USE_MUSL select SSP_SUPPORT if !USE_MUSL
depends on GCC_VERSION_5 depends on !GCC_VERSION_4_8
depends on KERNEL_CC_STACKPROTECTOR_STRONG depends on KERNEL_CC_STACKPROTECTOR_STRONG
endchoice endchoice
@ -251,7 +251,7 @@ menu "Global build settings"
config KERNEL_CC_STACKPROTECTOR_REGULAR config KERNEL_CC_STACKPROTECTOR_REGULAR
bool "Regular" bool "Regular"
config KERNEL_CC_STACKPROTECTOR_STRONG config KERNEL_CC_STACKPROTECTOR_STRONG
depends on GCC_VERSION_5 depends on !GCC_VERSION_4_8
bool "Strong" bool "Strong"
endchoice endchoice

1
toolchain/gcc/Config.in
View File

@ -13,7 +13,6 @@ choice
depends on arc depends on arc
config GCC_USE_VERSION_5 config GCC_USE_VERSION_5
select GCC_VERSION_5
bool "gcc 5.x" bool "gcc 5.x"
depends on !arc depends on !arc

4
toolchain/gcc/Config.version
View File

@ -10,7 +10,3 @@ config GCC_VERSION
config GCC_VERSION_4_8 config GCC_VERSION_4_8
bool bool
default y if GCC_VERSION_4_8_ARC default y if GCC_VERSION_4_8_ARC
config GCC_VERSION_5
default y if (!TOOLCHAINOPTS && !arc)
bool