toolchain: refresh uClibc patches

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 65bc9c980665856647f4fe2d591a7805a76792dd..03e9b811f5fb65c68df050c0e8ade5ed13373e35 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,28 +2,22 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if avr32
-       default BINUTILS_VERSION_2_19_1
+       default BINUTILS_VERSION_2_20_1 if avr32
+       default BINUTILS_VERSION_2_22 if !avr32
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_18
-               bool "binutils 2.18"
+       config BINUTILS_VERSION_2_20_1
+               depends on avr32
+               bool "binutils 2.20.1"
 
-       config BINUTILS_VERSION_2_19_1
-               depends !avr32
-               bool "binutils 2.19.1"
+       config BINUTILS_VERSION_2_22
+               depends on !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.22"
 
-       config BINUTILS_VERSION_2_20
-               depends !avr32
-               depends !ubicom32
-               bool "binutils 2.20"
-
-       config BINUTILS_VERSION_CS
-               depends !avr32
-               depends !ubicom32
-               depends BROKEN
-               bool "binutils 2.19.1+20090205 with CodeSourcery enhancements"
+       config BINUTILS_VERSION_2_23_1
+               depends on !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.23.1"
 
 endchoice
 
@@ -37,9 +31,8 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 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.20"            if BINUTILS_VERSION_2_20
-       default "2.19.1+cs"       if BINUTILS_VERSION_CS
-       default "2.18"            if avr32
-       default "2.19.1"
+       default "2.20.1"          if BINUTILS_VERSION_2_20_1
+       default "2.22"            if BINUTILS_VERSION_2_22
+       default "2.23.1"          if BINUTILS_VERSION_2_23_1
+       default "2.20.1"          if avr32
+       default "2.22"