[kirkwood] Fix patch

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 308054c..942bd3c 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
 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_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.


@@ -43,6 +40,9 @@ choice
        config GCC_VERSION_4_4_4
                bool "gcc 4.4.4"
 
        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_5_0
                bool "gcc 4.5.0"
 
        config GCC_VERSION_4_5_0
                bool "gcc 4.5.0"
 


@@ -58,7 +58,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"

-               depends BROKEN

 
        config GCC_VERSION_4_4_3_CS
                bool "gcc 4.4.3 with CodeSourcery enhancements"
 
        config GCC_VERSION_4_4_3_CS
                bool "gcc 4.4.3 with CodeSourcery enhancements"