toolchain: get rid of GCC_VERSION_5 config symbol

[openwrt/openwrt.git] / toolchain / gcc / Config.in

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index f14356b1798586253a22dd31e3cab366649c2a4c..7cb6d379be794676b0164541cdf76a1ffc432d38 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,29 +2,17 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_USE_VERSION_4_6_LINARO if TARGET_octeon
        default GCC_USE_VERSION_4_8_ARC if arc
-       default GCC_USE_VERSION_4_8_LINARO
+       default GCC_USE_VERSION_5
        help
          Select the version of gcc you wish to use.
 
-       config GCC_USE_VERSION_4_6_LINARO
-               select GCC_VERSION_4_6_LINARO
-               bool "gcc 4.6.x with Linaro enhancements"
-               depends on !arc
-
-       config GCC_USE_VERSION_4_8_LINARO
-               select GCC_VERSION_4_8_LINARO
-               bool "gcc 4.8.x with Linaro enhancements"
-               depends on !arc
-
        config GCC_USE_VERSION_4_8_ARC
                select GCC_VERSION_4_8_ARC
                bool "gcc 4.8.x with support of ARC cores"
                depends on arc
 
        config GCC_USE_VERSION_5
-               select GCC_VERSION_5
                bool "gcc 5.x"
                depends on !arc
 
@@ -37,7 +25,7 @@ config GCC_USE_GRAPHITE
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
        prompt "Use the system versions of PPL and CLooG"
-       depends on GCC_USE_GRAPHITE
+       depends on GCC_USE_GRAPHITE && GCC_VERSION_4_8
        default n
 
 config EXTRA_GCC_CONFIG_OPTIONS