this patch fixes toolchain parallel build, which reduces build time.

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index b19427be0a0c5fa5167760683150877927fb4581..b183e3618a31fa454a3de4cf589e2d048db796b5 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -3,16 +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_4_1 if TARGET_octeon
-       default GCC_VERSION_4_3_3_CS if mips || mipsel
-       default GCC_VERSION_4_3_3_CS if arm || armeb
+       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.
@@ -39,6 +39,9 @@ if !LINUX_2_4
        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,6 +49,14 @@ 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
@@ -53,7 +64,7 @@ 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
+       depends GCC_VERSION_4_4_1 || GCC_VERSION_4_4_2 || GCC_VERSION_4_4_3
 
 config EXTRA_GCC_CONFIG_OPTIONS
        string
@@ -70,6 +81,14 @@ config SSP_SUPPORT
        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 Thread-local storage support
+
 config INSTALL_LIBSTDCPP
        bool
        prompt "Build/install c++ compiler and libstdc++?" if TOOLCHAINOPTS