gcc: fix up broken chunks of the 4.4.3+cs patch and clean it up a bit more

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 4d87f19..1f58ed8 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,15 +3,15 @@
 choice
        prompt "GCC compiler Version" if TOOLCHAINOPTS
        default GCC_VERSION_3_4_6 if LINUX_2_4
-       default GCC_VERSION_4_2_4 if TARGET_avr32
+       default GCC_VERSION_4_2_4 if avr32
        default GCC_VERSION_4_2_4 if TARGET_ppc40x
        default GCC_VERSION_4_2_4 if TARGET_ppc44x
        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_4_0 if ubicom32
+       default GCC_VERSION_4_4_1 if ubicom32
        default GCC_VERSION_4_4_1 if TARGET_octeon
-       default GCC_VERSION_4_3_3_CS if mips || mipsel
+       default GCC_VERSION_4_3_3_CS if (mips || mipsel) && !TARGET_octeon
        default GCC_VERSION_4_3_3_CS if arm || armeb
        default GCC_VERSION_4_1_2
        help
@@ -33,12 +33,15 @@ if !LINUX_2_4
        config GCC_VERSION_4_3_4
                bool "gcc 4.3.4"
 
-       config GCC_VERSION_4_4_0
-               bool "gcc 4.4.0"
-
        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_LLVM
                bool "llvm-gcc 4.2"
                depends BROKEN
@@ -46,10 +49,23 @@ if !LINUX_2_4
        config GCC_VERSION_4_3_3_CS
                bool "gcc 4.3.3 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"
+               depends BROKEN
+
 endif
 
 endchoice
 
+config GCC_USE_GRAPHITE
+       bool
+       prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
+       depends GCC_VERSION_4_4_1 || GCC_VERSION_4_4_2 || GCC_VERSION_4_4_3
+
 config EXTRA_GCC_CONFIG_OPTIONS
        string
        prompt "Additional gcc configure options" if TOOLCHAINOPTS