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 a3d0ba720e41bf9a29c69eb32ca30f788444cbc4..27b2ffab8bba3ae4dfca93907344eadaf8ba833d 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,29 +2,21 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
-       default BINUTILS_VERSION_2_18 if TARGET_avr32
-       default BINUTILS_VERSION_2_18 if TARGET_ppc44x || TARGET_ppc40x
-       default BINUTILS_VERSION_2_17
+       default BINUTILS_VERSION_LINARO
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_17
-               bool "binutils 2.17"
+       config BINUTILS_VERSION_LINARO
+               bool "Linaro binutils 2.24"
 
-       config BINUTILS_VERSION_2_18
-               bool "binutils 2.18"
+       config BINUTILS_VERSION_2_25_1
+               bool "Binutils 2.25.1"
 
-       config BINUTILS_VERSION_2_19
-               depends !TARGET_avr32
-               bool "binutils 2.19"
-
-       config BINUTILS_VERSION_2_19_1
-               bool "binutils 2.19.1"
 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....
@@ -32,10 +24,6 @@ config EXTRA_BINUTILS_CONFIG_OPTIONS
 config BINUTILS_VERSION
        string
        prompt "Binutils Version" if (TOOLCHAINOPTS && NULL)
-       default "2.17"            if BINUTILS_VERSION_2_17
-       default "2.18"            if BINUTILS_VERSION_2_18
-       default "2.19"            if BINUTILS_VERSION_2_19
-       default "2.19.1"          if BINUTILS_VERSION_2_19_1
-       default "2.18"            if TARGET_avr32
-       default "2.18"            if TARGET_ppc44x || TARGET_ppc40x
-       default "2.17"
+       default "linaro"          if BINUTILS_VERSION_LINARO
+       default "2.25.1"          if BINUTILS_VERSION_2_25_1
+       default "linaro"