[patchteam] fix issues with pptpd server and firewall, closes #2342

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 9921466..b183e36 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -4,15 +4,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 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_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) && !TARGET_octeon
+       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.
@@ -81,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