generic: merge mips multi machine update to generic patches for 2.6.33

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index abbfe73..abc5834 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -5,12 +5,12 @@ choice
        default GCC_VERSION_3_4_6 if LINUX_2_4
        default GCC_VERSION_4_2_4 if avr32
        default GCC_VERSION_4_3_3 if powerpc64
-       default GCC_VERSION_4_3_3 if TARGET_etrax
        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_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_3_3_CS if (mips || mipsel) && !(TARGET_octeon || TARGET_sibyte)
-       default GCC_VERSION_4_3_3_CS if (arm || armeb) && !TARGET_gemini
        default GCC_VERSION_4_4_3 if powerpc
        default GCC_VERSION_4_4_3 if (TARGET_octeon || TARGET_sibyte)
        default GCC_VERSION_4_1_2
@@ -33,6 +33,9 @@ if !LINUX_2_4
        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"
 
@@ -42,6 +45,9 @@ if !LINUX_2_4
        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_5_0
                bool "gcc 4.5.0"
 
@@ -71,7 +77,7 @@ config GCC_USE_GRAPHITE
 
 config GCC_USE_SYSTEM_PPL_CLOOG
        bool
-       prompt "Use the system versions of PPL and CLooG
+       prompt "Use the system versions of PPL and CLooG"
        depends GCC_USE_GRAPHITE
        default n