diff options
| author | Felix Fietkau <nbd@nbd.name> | 2016-07-14 12:08:03 +0200 |
|---|---|---|
| committer | Felix Fietkau <nbd@nbd.name> | 2016-07-15 14:17:40 +0200 |
| commit | a4e90e2cac9d0afb41842b8a197b3acee903b9ad (patch) | |
| tree | 0bb8ce60a02abf4b8cd79b2bfec48aef7334c851 | |
| parent | e031940570e9f0cf0eadd8a17232e3bb487e97db (diff) | |
| download | upstream-a4e90e2cac9d0afb41842b8a197b3acee903b9ad.tar.gz upstream-a4e90e2cac9d0afb41842b8a197b3acee903b9ad.tar.bz2 upstream-a4e90e2cac9d0afb41842b8a197b3acee903b9ad.zip | |
toolchain: get rid of GCC_VERSION_5 config symbol
Replace it with !GCC_VERSION_4_8 to be more future compatible
Signed-off-by: Felix Fietkau <nbd@nbd.name>
| -rw-r--r-- | config/Config-build.in | 4 | ||||
| -rw-r--r-- | toolchain/gcc/Config.in | 1 | ||||
| -rw-r--r-- | toolchain/gcc/Config.version | 4 |
3 files changed, 2 insertions, 7 deletions
diff --git a/config/Config-build.in b/config/Config-build.in index 23cf83bc40..6d81bef62d 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -236,7 +236,7 @@ menu "Global build settings" config PKG_CC_STACKPROTECTOR_STRONG bool "Strong" select SSP_SUPPORT if !USE_MUSL - depends on GCC_VERSION_5 + depends on !GCC_VERSION_4_8 depends on KERNEL_CC_STACKPROTECTOR_STRONG endchoice @@ -251,7 +251,7 @@ menu "Global build settings" config KERNEL_CC_STACKPROTECTOR_REGULAR bool "Regular" config KERNEL_CC_STACKPROTECTOR_STRONG - depends on GCC_VERSION_5 + depends on !GCC_VERSION_4_8 bool "Strong" endchoice diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in index def296f01e..7cb6d379be 100644 --- a/toolchain/gcc/Config.in +++ b/toolchain/gcc/Config.in @@ -13,7 +13,6 @@ choice depends on arc config GCC_USE_VERSION_5 - select GCC_VERSION_5 bool "gcc 5.x" depends on !arc diff --git a/toolchain/gcc/Config.version b/toolchain/gcc/Config.version index 30df7235a4..e83553f360 100644 --- a/toolchain/gcc/Config.version +++ b/toolchain/gcc/Config.version @@ -10,7 +10,3 @@ config GCC_VERSION config GCC_VERSION_4_8 bool default y if GCC_VERSION_4_8_ARC - -config GCC_VERSION_5 - default y if (!TOOLCHAINOPTS && !arc) - bool |