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>

diff --git a/config/Config-build.in b/config/Config-build.in
index 23cf83bc4045f9163bda12210e65c72fe50e764e..6d81bef62df6f96b40f570c07a2ed9fc1ab0b9dc 100644 (file)
--- 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 def296f01e72e8f2410047854aebd4b9ed2db861..7cb6d379be794676b0164541cdf76a1ffc432d38 100644 (file)
--- 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 30df7235a412bb82a20a92467d0c57280dbbebfb..e83553f36098934526ffa8d969ce2ad86db49cd0 100644 (file)
--- 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