diff --git a/gcc/fixinc/mkfixinc.sh b/gcc/fixinc/mkfixinc.sh
index 38d7d8e5b07..f7eaf5214c5 100755
--- a/gcc/fixinc/mkfixinc.sh
+++ b/gcc/fixinc/mkfixinc.sh
@@ -13,8 +13,8 @@ echo constructing ${target} for $machine
 fixincludes="${target}"
 
 case $machine in
-	*-*-gnu*)
-		fixincludes=
+	i[34567]86-*-linux-gnu*)
+		fixincludes=fixinc.x86-linux-gnu
 		;;
 
 	*-*-sysv4*)
@@ -67,7 +67,7 @@ case $machine in
 	alpha*-dec-vms* | \
 	arm-semi-aout | armel-semi-aout | \
 	arm-semi-aof | armel-semi-aof | \
-	arm-*-linux-gnuaout* | \
+	arm-*-gnu* | \
 	c*-convex-* | \
 	hppa1.1-*-osf* | \
 	hppa1.0-*-osf* | \
@@ -93,13 +93,6 @@ case $machine in
 		fixincludes=
 		;;
 
-	i[34567]86-*-linux-gnulibc1 | \
-	i[34567]86-*-linux-gnuaout* | \
-	i[34567]86-*-linux-gnuoldld* | \
-	i[34567]86-*-linux-gnu*)
-		fixincludes=fixinc.x86-linux-gnu
-		;;
-
 	*-sgi-irix*)
 		fixincludes=fixinc.irix
 		;;