toolchain/gcc: remove remaining references to gcc-3.4.6

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 8a602c3b375ab82ea3c8f4602be619661f7a4bb0..fe34613e9689f3a727271dc4d2edbffe068f5fc7 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -2,7 +2,6 @@
 
 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_3_3 if powerpc64
        default GCC_VERSION_4_3_3 if TARGET_coldfire
@@ -12,15 +11,11 @@ choice
        default GCC_VERSION_4_3_4 if TARGET_gemini
        default GCC_VERSION_4_4_1 if ubicom32
        default GCC_VERSION_4_4_3 if powerpc
-       default GCC_VERSION_4_4_3 if (TARGET_octeon || TARGET_sibyte)
+       default GCC_VERSION_4_4_4 if (TARGET_octeon || TARGET_sibyte)
        default GCC_VERSION_4_1_2
        help
          Select the version of gcc you wish to use.
 
-       config GCC_VERSION_3_4_6
-               bool "gcc 3.4.6"
-
-if !LINUX_2_4
        config GCC_VERSION_4_1_2
                bool "gcc 4.1.2"
 
@@ -45,9 +40,15 @@ 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"
 
+       config GCC_VERSION_4_5_1
+               bool "gcc 4.5.1"
+
        config GCC_VERSION_LLVM
                bool "llvm-gcc 4.2"
                depends BROKEN
@@ -63,8 +64,6 @@ if !LINUX_2_4
                bool "gcc 4.4.3 with CodeSourcery enhancements"
                depends BROKEN
 
-endif
-
 endchoice
 
 config GCC_USE_GRAPHITE
@@ -87,7 +86,6 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
        bool
-       depends !GCC_VERSION_3_4_6
        prompt "Enable Stack-Smashing Protection support" if TOOLCHAINOPTS
        default n
        help
@@ -95,7 +93,7 @@ config SSP_SUPPORT
 
 config TLS_SUPPORT
        bool
-       depends !GCC_VERSION_3_4_6 && UCLIBC_VERSION_NPTL
+       depends UCLIBC_VERSION_NPTL
        prompt "Enable Thread-local storage (TLS) support" if TOOLCHAINOPTS
        default n
        help