[kernel] generic-2.6: remove remaining ipp2p patches

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 17f2f5c..40042ee 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -6,6 +6,7 @@ choice
        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 TARGET_ps3
        default GCC_VERSION_4_1_2
        help
          Select the version of gcc you wish to use.
@@ -17,25 +18,21 @@ choice
                depends !LINUX_2_4
                bool "gcc 4.1.2"
 
-       config GCC_VERSION_4_2_0
-               depends !LINUX_2_4
-               bool "gcc 4.2.0"
-
-       config GCC_VERSION_4_2_1
+       config GCC_VERSION_4_2_4
                depends !LINUX_2_4
-               bool "gcc 4.2.1"
+               bool "gcc 4.2.4"
 
-       config GCC_VERSION_4_2_2
+       config GCC_VERSION_4_3_1
                depends !LINUX_2_4
-               bool "gcc 4.2.2"
+               bool "gcc 4.3.1"
 
-       config GCC_VERSION_4_2_3
+       config GCC_VERSION_4_3_2
                depends !LINUX_2_4
-               bool "gcc 4.2.3"
+               bool "gcc 4.3.2"
 
-       config GCC_VERSION_4_2_4
+       config GCC_VERSION_4_3_3
                depends !LINUX_2_4
-               bool "gcc 4.2.4"
+               bool "gcc 4.3.3"
 
 endchoice
 
@@ -56,6 +53,7 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
        bool
+       depends !GCC_VERSION_3_4_6
        prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
        default n
        help