[toolchain/gcc] remove empty file (patch went upstream and file didn't get deleted...

[openwrt/svn-archive/archive.git] / toolchain / binutils / Config.in

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index a73ca39b12d6b14bf247e9b8804e6881e96146c9..fb81d13e80c12a6603da476ea238b001b77829ae 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,24 +2,28 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS

-       default BINUTILS_VERSION_2_17
+       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_16_1
-               bool "binutils 2.16.1"
+       config BINUTILS_VERSION_2_19_1
+               bool "binutils 2.19.1"

 
 

-       config BINUTILS_VERSION_2_17
-               bool "binutils 2.17"
+       config BINUTILS_VERSION_2_20_1
+               depends !ubicom32
+               bool "binutils 2.20.1"

 
 

-       config BINUTILS_VERSION_2_18
-               bool "binutils 2.18"
+       config BINUTILS_VERSION_2_21
+               depends !ubicom32
+               depends !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.21"

 
 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....


@@ -27,9 +31,8 @@ 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.16.1"          if BINUTILS_VERSION_2_16_1
-       default "2.17"            if BINUTILS_VERSION_2_17
-       default "2.18"            if BINUTILS_VERSION_2_18
-       default "2.17"
-
-
+       default "2.19.1"          if BINUTILS_VERSION_2_19_1
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1
+       default "2.21"            if BINUTILS_VERSION_2_21
+       default "2.19.1"          if ubicom32
+       default "2.20.1"