gcc: fix accidentally dropped chunk of the musl gcc 5.2.0 powerpc patch (fixes #20501)

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 50ee615a04a75b376d227dc693311d8743020d65..27b2ffab8bba3ae4dfca93907344eadaf8ba833d 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,32 +2,15 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_19_1 if ubicom32
-       default BINUTILS_VERSION_2_20_1
+       default BINUTILS_VERSION_LINARO
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_19_1
-               bool "binutils 2.19.1"
+       config BINUTILS_VERSION_LINARO
+               bool "Linaro binutils 2.24"
 
-       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"
-
-       config BINUTILS_VERSION_2_22
-               depends !ubicom32
-               depends !avr32
-               bool "binutils 2.22"
+       config BINUTILS_VERSION_2_25_1
+               bool "Binutils 2.25.1"
 
 endchoice
 
@@ -41,10 +24,6 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 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.21"            if BINUTILS_VERSION_2_21
-       default "2.21.1"          if BINUTILS_VERSION_2_21_1
-       default "2.22"            if BINUTILS_VERSION_2_22
-       default "2.19.1"          if ubicom32
-       default "2.20.1"
+       default "linaro"          if BINUTILS_VERSION_LINARO
+       default "2.25.1"          if BINUTILS_VERSION_2_25_1
+       default "linaro"