diff -r c69f8ef4bc7c -r 49fa28e62b07 config/binutils/binutils.in
--- a/config/binutils/binutils.in	Sun Jan 02 13:52:16 2011 +0100
+++ b/config/binutils/binutils.in	Wed Dec 29 18:19:40 2010 +0100
@@ -100,6 +100,7 @@
     depends on BINUTILS_HAS_GOLD
     depends on EXPERIMENTAL
     select BINUTILS_GOLD_INSTALLED
+    select BINUTILS_LINKER_BOTH
     help
       Both the historical ld and the new gold linkers will be
       installed, with ld being the default linker used.
@@ -112,6 +113,7 @@
     depends on BINUTILS_HAS_GOLD
     depends on EXPERIMENTAL
     select BINUTILS_GOLD_INSTALLED
+    select BINUTILS_LINKER_BOTH
     help
       Both the historical ld and the new gold linkers will be
       installed, with gold being the default linker used.
@@ -131,6 +133,9 @@
       When configured with threads, gold can link in parallel,
       possibly cooperating with a make jobserver.
 
+config BINUTILS_LINKER_BOTH
+    bool
+
 config BINUTILS_LINKERS_LIST
     string
     default "ld"        if BINUTILS_LINKER_LD
@@ -138,6 +143,25 @@
     default "ld,gold"   if BINUTILS_LINKER_LD_GOLD
     default "gold,ld"   if BINUTILS_LINKER_GOLD_LD
 
+config BINUTILS_LD_WRAPPER
+    bool
+    prompt "|  Add ld wrapper"
+    depends on BINUTILS_LINKER_BOTH
+    help
+      Add an ld wrapper that calls to either gold or ld.
+      
+      By default, the wrapper will call to the default wrapper,
+      but if you set the environment variable CTNG_LD_IS, you
+      can change which linker will get called:
+        CTNG_LD_IS=gold     will unconditionally call the gold linker
+        CTNG_LD_IS=bfd      will unconditionally call the old bfd ld linker
+
+config BINUTILS_LINKER_DEFAULT
+    string
+    depends on BINUTILS_LD_WRAPPER
+    default "bfd"   if BINUTILS_LINKER_LD_GOLD
+    default "gold"  if BINUTILS_LINKER_GOLD_LD
+
 endif # BINUTILS_HAS_GOLD
 
 config BINUTILS_PLUGINS