package/apex: fix a compile issue

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index cba0862..08c69de 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,15 +3,12 @@
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
        default GCC_VERSION_4_2_4 if avr32
-       default GCC_VERSION_4_3_3 if powerpc64
-       default GCC_VERSION_4_3_3 if TARGET_coldfire
-       default GCC_VERSION_4_3_3 if TARGET_etrax
-       default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini
+       default GCC_VERSION_4_3_5 if 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_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
-       default GCC_VERSION_4_3_4 if TARGET_gemini
-       default GCC_VERSION_4_4_1 if ubicom32
-       default GCC_VERSION_4_4_3 if powerpc
-       default GCC_VERSION_4_4_4 if (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_1_2
        help
          Select the version of gcc you wish to use.
@@ -22,29 +19,17 @@ choice
        config GCC_VERSION_4_2_4
                bool "gcc 4.2.4"
 
-       config GCC_VERSION_4_3_3
-               bool "gcc 4.3.3"
-
-       config GCC_VERSION_4_3_4
-               bool "gcc 4.3.4"
-
        config GCC_VERSION_4_3_5
                bool "gcc 4.3.5"
 
-       config GCC_VERSION_4_4_1
-               bool "gcc 4.4.1"
-
-       config GCC_VERSION_4_4_2
-               bool "gcc 4.4.2"
-
-       config GCC_VERSION_4_4_3
-               bool "gcc 4.4.3"
+       config GCC_VERSION_4_4_5
+               bool "gcc 4.4.5"
 
-       config GCC_VERSION_4_4_4
-               bool "gcc 4.4.4"
+       config GCC_VERSION_4_5_1
+               bool "gcc 4.5.1"
 
-       config GCC_VERSION_4_5_0
-               bool "gcc 4.5.0"
+       config GCC_VERSION_4_5_1_LINARO
+               bool "gcc 4.5.1 with Linaro enhancements"
 
        config GCC_VERSION_LLVM
                bool "llvm-gcc 4.2"
@@ -55,11 +40,6 @@ choice
 
        config GCC_VERSION_4_4_1_CS
                bool "gcc 4.4.1 with CodeSourcery enhancements"
-               depends BROKEN
-
-       config GCC_VERSION_4_4_3_CS
-               bool "gcc 4.4.3 with CodeSourcery enhancements"
-               depends BROKEN
 
 endchoice
 
@@ -83,7 +63,6 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
        bool
-       depends !GCC_VERSION_3_4_6
        prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
        default n
        help
@@ -91,7 +70,7 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
        bool
-       depends !GCC_VERSION_3_4_6 && UCLIBC_VERSION_NPTL
+       depends UCLIBC_VERSION_NPTL
        prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
        default n
        help
@@ -106,6 +85,7 @@ config INSTALL_LIBSTDCPP
 
 config INSTALL_LIBGCJ
        bool
+       depends on !(GCC_VERSION_4_1||GCC_VERSION_4_2)
        prompt "Build/install java compiler and GNU classpath ?" if TOOLCHAINOPTS
        default n
        help