1.1 --- a/config/binutils/binutils.in	Tue Apr 05 01:17:58 2011 +0200
     1.2 +++ b/config/binutils/binutils.in	Sun Apr 03 23:44:57 2011 +0200
     1.3 @@ -80,8 +80,6 @@
     1.4  config ARCH_x86
     1.5      select BINUTILS_GOLD_SUPPORTS_ARCH
     1.6  
     1.7 -if BINUTILS_HAS_GOLD && BINUTILS_GOLD_SUPPORTS_ARCH
     1.8 -
     1.9  choice
    1.10      bool
    1.11      prompt "Linkers to enable"
    1.12 @@ -96,6 +94,7 @@
    1.13      bool
    1.14      prompt "gold"
    1.15      depends on BINUTILS_HAS_GOLD
    1.16 +    depends on BINUTILS_GOLD_SUPPORTS_ARCH
    1.17      depends on EXPERIMENTAL
    1.18      select BINUTILS_GOLD_INSTALLED
    1.19      help
    1.20 @@ -108,6 +107,7 @@
    1.21      bool
    1.22      prompt "ld, gold"
    1.23      depends on BINUTILS_HAS_GOLD
    1.24 +    depends on BINUTILS_GOLD_SUPPORTS_ARCH
    1.25      depends on EXPERIMENTAL
    1.26      select BINUTILS_GOLD_INSTALLED
    1.27      select BINUTILS_LINKER_BOTH
    1.28 @@ -121,6 +121,7 @@
    1.29      bool
    1.30      prompt "gold, ld"
    1.31      depends on BINUTILS_HAS_GOLD
    1.32 +    depends on BINUTILS_GOLD_SUPPORTS_ARCH
    1.33      depends on EXPERIMENTAL
    1.34      select BINUTILS_GOLD_INSTALLED
    1.35      select BINUTILS_LINKER_BOTH
    1.36 @@ -168,11 +169,8 @@
    1.37  
    1.38  config BINUTILS_LINKER_DEFAULT
    1.39      string
    1.40 -    depends on BINUTILS_LD_WRAPPER
    1.41 -    default "bfd"   if BINUTILS_LINKER_LD_GOLD
    1.42 -    default "gold"  if BINUTILS_LINKER_GOLD_LD
    1.43 -
    1.44 -endif # BINUTILS_HAS_GOLD
    1.45 +    default "bfd"   if BINUTILS_LINKER_LD || BINUTILS_LINKER_LD_GOLD
    1.46 +    default "gold"  if BINUTILS_LINKER_GOLD || BINUTILS_LINKER_GOLD_LD
    1.47  
    1.48  config BINUTILS_PLUGINS
    1.49      bool