gcc: fix a linker error in 4.3.3 and 4.3.4 that is triggered by including an object...

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

diff --git a/toolchain/binutils/Config.in b/toolchain/binutils/Config.in
index 00aff7118584fa3e075710fbc0f934b46bcd17b5..6b0791deb318dfaa15bd8c8f4f9fb3e8792c0cab 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -3,21 +3,13 @@
 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_19_1
        help
          Select the version of binutils you wish to use.
 
-       config BINUTILS_VERSION_2_17
-               bool "binutils 2.17"
-
        config BINUTILS_VERSION_2_18
                bool "binutils 2.18"
 
-       config BINUTILS_VERSION_2_19
-               depends !TARGET_avr32
-               bool "binutils 2.19"
-
        config BINUTILS_VERSION_2_19_1
                depends !TARGET_avr32
                bool "binutils 2.19.1"
@@ -25,7 +17,7 @@ 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....
@@ -33,10 +25,7 @@ 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 "2.19.1"