New x86 platform specific symbol needed for 3.1-rc3.

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index fd7ba4f5e0acb6899947c7fd7386aeaabab025b1..bfbb8b715f718f30addc53474fd8f53befecf56a 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,22 +2,33 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS

-       default BINUTILS_VERSION_2_18 if TARGET_avr32
-       default BINUTILS_VERSION_2_19_1
+       default BINUTILS_VERSION_2_19_1 if ubicom32
+       default BINUTILS_VERSION_2_20_1

        help
          Select the version of binutils you wish to use.
 
        help
          Select the version of binutils you wish to use.
 

-       config BINUTILS_VERSION_2_18
-               bool "binutils 2.18"
-

        config BINUTILS_VERSION_2_19_1
        config BINUTILS_VERSION_2_19_1

-               depends !TARGET_avr32

                bool "binutils 2.19.1"
                bool "binutils 2.19.1"

+
+       config BINUTILS_VERSION_2_20_1
+               depends !ubicom32
+               bool "binutils 2.20.1"
+
+       config BINUTILS_VERSION_2_21
+               depends !ubicom32
+               depends !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.21"
+
+       config BINUTILS_VERSION_2_21_1
+               depends !ubicom32
+               depends !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.21.1"
+

 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
        string
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
        string

-       prompt "Additional binutils options" if TOOLCHAINOPTS
+       prompt "Additional binutils configure options" if TOOLCHAINOPTS

        default ""
        help
            Any additional binutils options you may want to include....
        default ""
        help
            Any additional binutils options you may want to include....


@@ -25,7 +36,9 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
        string
        prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
 config BINUTILS_VERSION
        string
        prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)

-       default "2.18"            if BINUTILS_VERSION_2_18

        default "2.19.1"          if BINUTILS_VERSION_2_19_1
        default "2.19.1"          if BINUTILS_VERSION_2_19_1

-       default "2.18"            if TARGET_avr32
-       default "2.19.1"
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1
+       default "2.21"            if BINUTILS_VERSION_2_21
+       default "2.21.1"          if BINUTILS_VERSION_2_21_1
+       default "2.19.1"          if ubicom32
+       default "2.20.1"