[source] toolchain: get rid of GCC_VERSION_5 config symbol
LEDE Commits
lede-commits at lists.infradead.org
Fri Jul 15 05:20:11 PDT 2016
nbd pushed a commit to source.git, branch master:
https://git.lede-project.org/?p=source.git;a=commitdiff;h=a4e90e2cac9d0afb41842b8a197b3acee903b9ad
commit a4e90e2cac9d0afb41842b8a197b3acee903b9ad
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Thu Jul 14 12:08:03 2016 +0200
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 at nbd.name>
---
config/Config-build.in | 4 ++--
toolchain/gcc/Config.in | 1 -
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 23cf83b..6d81bef 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 def296f..7cb6d37 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 30df723..e83553f 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
More information about the lede-commits
mailing list