the only reasons for having 4.4 around are avr32 and ubicom32, so make it depend...

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 6b45da55bd20cb26de1e92c3e0badc6633ca81f2..24885d49861805a940d7c04ad7bb7a47dae3c1f1 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,21 +2,17 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
-       default GCC_VERSION_4_3_3_CS if GCC_DEFAULT_VERSION_4_3_3_CS
-       default GCC_VERSION_4_3_5 if GCC_DEFAULT_VERSION_4_3_5
-       default GCC_VERSION_4_4_5 if GCC_DEFAULT_VERSION_4_4_5
+       default GCC_VERSION_4_4_6 if GCC_DEFAULT_VERSION_4_4_6
        default GCC_VERSION_LINARO
        help
          Select the version of gcc you wish to use.
 
-       config GCC_VERSION_4_3_5
-               bool "gcc 4.3.5"
+       config GCC_VERSION_4_4_6
+               bool "gcc 4.4.6"
+               depends (avr32 || ubicom32)
 
-       config GCC_VERSION_4_4_5
-               bool "gcc 4.4.5"
-
-       config GCC_VERSION_4_5_2
-               bool "gcc 4.5.2"
+       config GCC_VERSION_4_6_1
+               bool "gcc 4.6.1"
 
        config GCC_VERSION_LINARO
                bool "gcc 4.5.x with Linaro enhancements"
@@ -25,18 +21,12 @@ choice
                bool "llvm-gcc 4.2"
                depends BROKEN
 
-       config GCC_VERSION_4_3_3_CS
-               bool "gcc 4.3.3 with CodeSourcery enhancements"
-
-       config GCC_VERSION_4_4_1_CS
-               bool "gcc 4.4.1 with CodeSourcery enhancements"
-
 endchoice
 
 config GCC_USE_GRAPHITE
        bool
        prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
-       depends GCC_VERSION_4_4 || GCC_VERSION_4_5
+       depends !GCC_VERSION_LLVM
 
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
@@ -60,7 +50,6 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
        bool
-       depends UCLIBC_VERSION_NPTL
        prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
        default n
        help