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 e8fb27543c7d3bf0178ba9fd25c0e408ce20fa80..6b0791deb318dfaa15bd8c8f4f9fb3e8792c0cab 100644 (file)
--- a/toolchain/binutils/Config.in
+++ b/toolchain/binutils/Config.in
@@ -3,7 +3,6 @@
 choice
        prompt "Binutils Version" if TOOLCHAINOPTS
        default BINUTILS_VERSION_2_18 if TARGET_avr32
 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.
        default BINUTILS_VERSION_2_19_1
        help
          Select the version of binutils you wish to use.


@@ -18,7 +17,7 @@ endchoice
 
 config EXTRA_BINUTILS_CONFIG_OPTIONS
        string
 
 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....


@@ -29,5 +28,4 @@ config BINUTILS_VERSION
        default "2.18"            if BINUTILS_VERSION_2_18
        default "2.19.1"          if BINUTILS_VERSION_2_19_1
        default "2.18"            if TARGET_avr32
        default "2.18"            if BINUTILS_VERSION_2_18
        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.19.1"
        default "2.19.1"