diff -r 9139319423fd -r 5059b7b993fc config/binutils/binutils.in
--- a/config/binutils/binutils.in	Tue Feb 22 23:27:42 2011 +0100
+++ b/config/binutils/binutils.in	Fri Apr 08 00:59:32 2011 +0200
@@ -67,10 +67,20 @@
 config BINUTILS_HAS_GOLD
     bool
 
+config BINUTILS_GOLD_SUPPORTS_ARCH
+    bool
+
 config BINUTILS_HAS_PLUGINS
     bool
 
-if BINUTILS_HAS_GOLD
+# Only these architectures have support in gold
+config ARCH_arm
+    select BINUTILS_GOLD_SUPPORTS_ARCH
+
+config ARCH_x86
+    select BINUTILS_GOLD_SUPPORTS_ARCH
+
+if BINUTILS_HAS_GOLD && BINUTILS_GOLD_SUPPORTS_ARCH
 
 choice
     bool