Add amd64 detection when build host is a x86_64 machine, closes #390

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

diff --git a/openwrt/toolchain/binutils/Config.in b/openwrt/toolchain/binutils/Config.in
index 96ea4b5..7874638 100644 (file)
--- a/openwrt/toolchain/binutils/Config.in
+++ b/openwrt/toolchain/binutils/Config.in
@@ -6,25 +6,13 @@ endif
 
 choice
        prompt "Binutils Version" if CONFIG_DEVEL
-       default BR2_BINUTILS_VERSION_2_15_94_0_2
+       default BR2_BINUTILS_VERSION_2_16_1
        help
          Select the version of binutils you wish to use.
 
-       config BR2_BINUTILS_VERSION_2_15
-               bool "binutils 2.15"
-
        config BR2_BINUTILS_VERSION_2_15_94_0_2
                bool "binutils 2.15.94.0.2"
 
-       config BR2_BINUTILS_VERSION_2_15_94_0_2_2
-               bool "binutils 2.15.94.0.2.2"
-
-       config BR2_BINUTILS_VERSION_2_15_97
-               bool "binutils 2.15.97"
-
-       config BR2_BINUTILS_VERSION_2_16
-               bool "binutils 2.16"
-
        config BR2_BINUTILS_VERSION_2_16_1
                bool "binutils 2.16.1"
 
@@ -37,17 +25,16 @@ choice
        config BR2_BINUTILS_VERSION_2_16_91_0_2
                bool "binutils 2.16.91.0.2"
 
+       config BR2_BINUTILS_VERSION_2_16_91_0_6
+               bool "binutils 2.16.91.0.6"
 
 endchoice
 
 config BR2_BINUTILS_VERSION
        string
-       default "2.15"            if BR2_BINUTILS_VERSION_2_15
-       default "2.15.94.0.2"     if BR2_BINUTILS_VERSION_2_15_94_0_2 || !CONFIG_DEVEL
-       default "2.15.94.0.2.2"   if BR2_BINUTILS_VERSION_2_15_94_0_2_2
-       default "2.15.97"         if BR2_BINUTILS_VERSION_2_15_97
-       default "2.16"            if BR2_BINUTILS_VERSION_2_16
-       default "2.16.1"          if BR2_BINUTILS_VERSION_2_16_1
+       default "2.15.94.0.2"     if BR2_BINUTILS_VERSION_2_15_94_0_2
+       default "2.16.1"          if BR2_BINUTILS_VERSION_2_16_1 || !CONFIG_DEVEL
        default "2.16.90.0.3"     if BR2_BINUTILS_VERSION_2_16_90_0_3
        default "2.16.91.0.1"     if BR2_BINUTILS_VERSION_2_16_91_0_1
        default "2.16.91.0.2"     if BR2_BINUTILS_VERSION_2_16_91_0_2
+       default "2.16.91.0.6"     if BR2_BINUTILS_VERSION_2_16_91_0_6