toolchain/binutils: backport stable patches

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 27a583d8a39fdd5c407a4fd0887e14cab3f3757e..0bc8bbd0a3f47fc340769cb2581cf4ada0140a61 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,25 +2,21 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_19_1 if (avr32 || ubicom32)
-       default BINUTILS_VERSION_2_20_1
+       default BINUTILS_USE_VERSION_2_37
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_19_1
-               bool "binutils 2.19.1"
+       config BINUTILS_USE_VERSION_2_37
+               bool "Binutils 2.37"
+               select BINUTILS_VERSION_2_37
 
-        config BINUTILS_VERSION_2_20_1
-                depends !avr32
-                depends !ubicom32
-                bool "binutils 2.20.1"
-
-       config BINUTILS_VERSION_CS
-               depends !avr32
-               depends !ubicom32
-               depends BROKEN
-               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+       config BINUTILS_USE_VERSION_2_38
+               bool "Binutils 2.38"
+               select BINUTILS_VERSION_2_38
 
+       config BINUTILS_USE_VERSION_2_39
+               bool "Binutils 2.39"
+               select BINUTILS_VERSION_2_39
 endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
@@ -29,12 +25,3 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
        default ""
        help
            Any additional binutils options you may want to include....
-
-config BINUTILS_VERSION
-       string
-       prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-       default "2.19.1"          if BINUTILS_VERSION_2_19_1
-       default "2.20.1"          if BINUTILS_VERSION_2_20_1
-       default "2.19.1+cs"       if BINUTILS_VERSION_CS
-       default "2.19.1"          if (avr32 || ubicom32)
-       default "2.20.1"