toolchain: get rid of gcc kconfig symbol overloading
authorFelix Fietkau <nbd@openwrt.org>
Thu, 18 Apr 2013 12:04:40 +0000 (12:04 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Thu, 18 Apr 2013 12:04:40 +0000 (12:04 +0000)
SVN-Revision: 36355

toolchain/gcc/Config.in
toolchain/gcc/Config.version

index 7becaa8..e8ca941 100644 (file)
@@ -2,28 +2,34 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
-       default GCC_VERSION_4_6_LINARO
+       default GCC_USE_VERSION_4_4_7 if GCC_DEFAULT_VERSION_4_4_7
+       default GCC_USE_VERSION_4_6_LINARO
        help
          Select the version of gcc you wish to use.
 
-       config GCC_VERSION_4_4_7
+       config GCC_USE_VERSION_4_4_7
+               select GCC_VERSION_4_4_7
                bool "gcc 4.4.7"
                depends on avr32
 
-       config GCC_VERSION_4_6_3
+       config GCC_USE_VERSION_4_6_3
+               select GCC_VERSION_4_6_3
                bool "gcc 4.6.3"
 
-       config GCC_VERSION_4_7_2
+       config GCC_USE_VERSION_4_7_2
+               select GCC_VERSION_4_7_2
                bool "gcc 4.7.2"
 
-       config GCC_VERSION_4_6_LINARO
+       config GCC_USE_VERSION_4_6_LINARO
+               select GCC_VERSION_4_6_LINARO
                bool "gcc 4.6.x with Linaro enhancements"
 
-       config GCC_VERSION_4_7_LINARO
+       config GCC_USE_VERSION_4_7_LINARO
+               select GCC_VERSION_4_7_LINARO
                bool "gcc 4.7.x with Linaro enhancements"
 
-       config GCC_VERSION_4_8_0
+       config GCC_USE_VERSION_4_8_0
+               select GCC_VERSION_4_8_0
                bool "gcc 4.8.0"
 
 endchoice
index c4e646e..bf8b3e4 100644 (file)
@@ -1,15 +1,22 @@
-config GCC_DEFAULT_VERSION
+config GCC_VERSION_4_4_7
+       default y if (!TOOLCHAINOPTS && avr32)
        bool
 
-config GCC_DEFAULT_VERSION_4_4_7
-       select GCC_DEFAULT_VERSION
-       default y if avr32
+config GCC_VERSION_4_6_3
        bool
 
-config GCC_DEFAULT_VERSION_4_6_LINARO
-       default y if !(GCC_DEFAULT_VERSION)
+config GCC_VERSION_4_7_2
        bool
 
+config GCC_VERSION_4_6_LINARO
+       default y if (!TOOLCHAINOPTS && !avr32)
+       bool
+
+config GCC_VERSION_4_7_LINARO
+       bool
+
+config GCC_VERSION_4_8_0
+       bool
 
 config GCC_VERSION
        string
@@ -37,14 +44,3 @@ config GCC_VERSION_4_8
        bool
        default y       if GCC_VERSION_4_8_0
 
-if !TOOLCHAINOPTS
-
-       config GCC_VERSION_4_4_7
-               default y if GCC_DEFAULT_VERSION_4_4_7
-               bool
-
-       config GCC_VERSION_4_6_LINARO
-               default y if GCC_DEFAULT_VERSION_4_6_LINARO
-               bool
-
-endif