cleanup toolchain version handling

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index ed8002ced3b9c1a5b2f9ce77f1d02b3f475551b0..019cd164b766f68ebdd0c842d6c2de0eb1493601 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,30 +3,23 @@
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
        default GCC_VERSION_4_3_5 if (avr32 || powerpc64)
-       default GCC_VERSION_4_3_5 if (TARGET_coldfire || TARGET_etrax || TARGET_gemini)
-       default GCC_VERSION_4_3_3_CS if (arm || armeb) && !(TARGET_gemini || TARGET_omap35xx)
+       default GCC_VERSION_4_3_5 if (TARGET_coldfire || TARGET_etrax || TARGET_gemini || TARGET_cns21xx)
+       default GCC_VERSION_4_3_3_CS if (arm || armeb) && !(TARGET_gemini || TARGET_cns21xx || TARGET_omap35xx)
        default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
        default GCC_VERSION_4_4_5 if (powerpc || ubicom32)
        default GCC_VERSION_4_4_5 if (TARGET_omap35xx || TARGET_octeon || TARGET_sibyte)
-       default GCC_VERSION_4_5_1_LINARO if sparc
-       default GCC_VERSION_4_1_2
+       default GCC_VERSION_4_5_1_LINARO
        help
          Select the version of gcc you wish to use.
 
-       config GCC_VERSION_4_1_2
-               bool "gcc 4.1.2"
-
-       config GCC_VERSION_4_2_4
-               bool "gcc 4.2.4"
-
        config GCC_VERSION_4_3_5
                bool "gcc 4.3.5"
 
        config GCC_VERSION_4_4_5
                bool "gcc 4.4.5"
 
-       config GCC_VERSION_4_5_1
-               bool "gcc 4.5.1"
+       config GCC_VERSION_4_5_2
+               bool "gcc 4.5.2"
 
        config GCC_VERSION_4_5_1_LINARO
                bool "gcc 4.5.1 with Linaro enhancements"
@@ -85,7 +78,7 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
        bool
-       depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2)
+       depends on !GCC_VERSION_LLVM
        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
        default n
        help