diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a9ef3fab670..1dd2bc90daa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-05  Bernd Schmidt  <bernd.schmidt@analog.com>
+
+	* config.host (i[34567]86-*-*, x86-64-*-*): Use driver-i386.o only if
+	target is also an x86 variant.
+
 2006-12-05  Richard Guenther  <rguenther@suse.de>
 
 	* config/i386/i386.c (ix86_builtin_vectorized_function): Declare.
diff --git a/gcc/config.host b/gcc/config.host
index ade31a2a4cc..be6e3bf5143 100644
--- a/gcc/config.host
+++ b/gcc/config.host
@@ -97,8 +97,14 @@ esac
 case ${host} in
   i[34567]86-*-* \
   | x86_64-*-* )
-    host_extra_gcc_objs="driver-i386.o"
-    host_xmake_file="${host_xmake_file} i386/x-i386"
+    case ${target} in
+      i[34567]86-*-* \
+      | x86_64-*-* )
+
+        host_extra_gcc_objs="driver-i386.o"
+        host_xmake_file="${host_xmake_file} i386/x-i386"
+	;;
+    esac
     ;;
 esac