toolchain: make the default eglibc selection work even if TOOLCHAINOPTS is not enabled

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 7d2f5d199b1b19cb6fb169593acb03b98ff74c9c..9ebf52ddde5d25373f9d05a113f7a402aba43a1a 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -2,21 +2,32 @@
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
 
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS

-       default BINUTILS_VERSION_2_17
+       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.
 
        help
          Select the version of binutils you wish to use.
 

-       config BINUTILS_VERSION_2_17
-               bool "binutils 2.17"
+       config BINUTILS_VERSION_2_20_1
+               depends on avr32
+               bool "binutils 2.20.1"

 
 

-       config BINUTILS_VERSION_2_18
-               bool "binutils 2.18"
+       config BINUTILS_VERSION_2_22
+               depends on !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.22"
+
+       config BINUTILS_VERSION_2_23_1
+               depends on !avr32 || (avr32 && BROKEN)
+               bool "binutils 2.23.1"
+
+       config BINUTILS_VERSION_LINARO
+               depends on !avr32 || (avr32 && BROKEN)
+               bool "Linaro binutils 2.24"

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


@@ -24,6 +35,9 @@ 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.17"            if BINUTILS_VERSION_2_17
-       default "2.18"            if BINUTILS_VERSION_2_18
-       default "2.17"
+       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 "linaro"          if BINUTILS_VERSION_LINARO
+       default "2.20.1"          if avr32
+       default "2.22"