linux/brcm47xx: Broadcom BCM4710 does not belong in the BMIPS4KC family.

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 8cd2894..56416bd 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,16 +2,12 @@
 
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
 
 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 (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_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
        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.
        default GCC_VERSION_4_1_2
        help
          Select the version of gcc you wish to use.


@@ -22,36 +18,18 @@ choice
        config GCC_VERSION_4_2_4
                bool "gcc 4.2.4"
 
        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_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_4
-               bool "gcc 4.4.4"
-

        config GCC_VERSION_4_4_5
                bool "gcc 4.4.5"
 
        config GCC_VERSION_4_4_5
                bool "gcc 4.4.5"
 

-       config GCC_VERSION_4_5_0
-               bool "gcc 4.5.0"
-

        config GCC_VERSION_4_5_1
                bool "gcc 4.5.1"
 
        config GCC_VERSION_4_5_1
                bool "gcc 4.5.1"
 

+       config GCC_VERSION_4_5_1_LINARO
+               bool "gcc 4.5.1 with Linaro enhancements"
+

        config GCC_VERSION_LLVM
                bool "llvm-gcc 4.2"
                depends BROKEN
        config GCC_VERSION_LLVM
                bool "llvm-gcc 4.2"
                depends BROKEN


@@ -62,10 +40,6 @@ choice
        config GCC_VERSION_4_4_1_CS
                bool "gcc 4.4.1 with CodeSourcery enhancements"
 
        config GCC_VERSION_4_4_1_CS
                bool "gcc 4.4.1 with CodeSourcery enhancements"
 

-       config GCC_VERSION_4_4_3_CS
-               bool "gcc 4.4.3 with CodeSourcery enhancements"
-               depends BROKEN
-

 endchoice
 
 config GCC_USE_GRAPHITE
 endchoice
 
 config GCC_USE_GRAPHITE