add generic patchset levelled up to 2.6.31-rc6

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

diff --git a/toolchain/gcc/Config.in b/toolchain/gcc/Config.in
index 17f2f5c..e034c38 100644 (file)
--- a/toolchain/gcc/Config.in
+++ b/toolchain/gcc/Config.in
@@ -6,6 +6,10 @@ 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_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_4_0 if ubicom32

        default GCC_VERSION_4_1_2
        help
          Select the version of gcc you wish to use.
        default GCC_VERSION_4_1_2
        help
          Select the version of gcc you wish to use.


@@ -13,29 +17,25 @@ choice
        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 
        config GCC_VERSION_3_4_6
                bool "gcc 3.4.6"
 

+if !LINUX_2_4

        config GCC_VERSION_4_1_2
        config GCC_VERSION_4_1_2

-               depends !LINUX_2_4

                bool "gcc 4.1.2"
 
                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_4
+               bool "gcc 4.2.4"

 
 

-       config GCC_VERSION_4_2_1
-               depends !LINUX_2_4
-               bool "gcc 4.2.1"
+       config GCC_VERSION_4_3_3
+               bool "gcc 4.3.3"

 
 

-       config GCC_VERSION_4_2_2
-               depends !LINUX_2_4
-               bool "gcc 4.2.2"
+       config GCC_VERSION_4_3_4
+               bool "gcc 4.3.4"

 
 

-       config GCC_VERSION_4_2_3
-               depends !LINUX_2_4
-               bool "gcc 4.2.3"
+       config GCC_VERSION_4_4_0
+               bool "gcc 4.4.0"

 
 

-       config GCC_VERSION_4_2_4
-               depends !LINUX_2_4
-               bool "gcc 4.2.4"
+       config GCC_VERSION_4_4_1
+               bool "gcc 4.4.1"
+endif

 
 endchoice
 
 
 endchoice
 


@@ -43,7 +43,8 @@ config EABI_SUPPORT
        bool
        depends arm||armeb
        prompt "Enable EABI support" if TOOLCHAINOPTS
        bool
        depends arm||armeb
        prompt "Enable EABI support" if TOOLCHAINOPTS

-       default n
+       default n if TARGET_gemini
+       default y

        help
          Enable ARM EABI support
 
        help
          Enable ARM EABI support
 


@@ -56,6 +57,7 @@ config EXTRA_GCC_CONFIG_OPTIONS
 
 config SSP_SUPPORT
        bool
 
 config SSP_SUPPORT
        bool

+       depends !GCC_VERSION_3_4_6

        prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
        default n
        help
        prompt "Enable Smash Stacking Protection support" if TOOLCHAINOPTS
        default n
        help