target/uml: rename patch 003 to match what we have in 2.6.30

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 172838f..3483e00 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,9 +3,16 @@
 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 TARGET_ppc40x
-       default GCC_VERSION_4_2_4 if TARGET_ppc44x
+       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_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
        help
          Select the version of gcc you wish to use.
@@ -13,37 +20,83 @@ choice
        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 
+if !LINUX_2_4
        config GCC_VERSION_4_1_2
-               depends !LINUX_2_4
                bool "gcc 4.1.2"
 
        config GCC_VERSION_4_2_4
-               depends !LINUX_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_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_5_0
+               bool "gcc 4.5.0"
+
+       config GCC_VERSION_LLVM
+               bool "llvm-gcc 4.2"
+               depends BROKEN
+
+       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 EABI_SUPPORT
+config GCC_USE_GRAPHITE
        bool
-       depends arm||armeb
-       prompt "Enable EABI support" if TOOLCHAINOPTS
+       prompt "Compile in support for the new Graphite framework in GCC 4.4+" if TOOLCHAINOPTS
+       depends GCC_VERSION_4_4 || GCC_VERSION_4_5
+
+config GCC_USE_SYSTEM_PPL_CLOOG
+       bool
+       prompt "Use the system versions of PPL and CLooG"
+       depends GCC_USE_GRAPHITE
        default n
-       help
-         Enable ARM EABI support
 
 config EXTRA_GCC_CONFIG_OPTIONS
        string
-       prompt "Additional gcc options" if TOOLCHAINOPTS
+       prompt "Additional gcc configure options" if TOOLCHAINOPTS
        default ""
        help
            Any additional gcc options you may want to include....
 
 config SSP_SUPPORT
        bool
-       prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
+       depends !GCC_VERSION_3_4_6
+       prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
+       default n
+       help
+           Enable Stack-Smashing Protection support
+
+config TLS_SUPPORT
+       bool
+       depends !GCC_VERSION_3_4_6 && UCLIBC_VERSION_NPTL
+       prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
        default n
        help
-           Enable Smash Stacking Protection support
+           Enable Thread-local storage support
 
 config INSTALL_LIBSTDCPP
        bool