diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 5fc628b6840fcafb0d52160006ca8daf870ac0c1..1894509429cf34b8ef5ec490a60742dcd9572caa 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2008-10-08  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* config.host: Fold `*-*-gnu*' cases into the Linux ones.
+
 2008-09-03  Hari Sandanagobalane  <hariharan@picochip.com>
 
 	Add picoChip port.
diff --git a/libgcc/config.host b/libgcc/config.host
index cf33e04de443c10e662fce10a6d6c977079d4e54..a92ffa04455d28eb5068aebf722b6395a0399f17 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -150,12 +150,9 @@ case ${host} in
   # machine-specific sections may refine and add to this
   # configuration.
   ;;
-*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu)
-  # Must come before *-*-gnu* (because of *-*-linux-gnu* systems).
+*-*-linux* | frv-*-*linux* | *-*-kfreebsd*-gnu | *-*-knetbsd*-gnu | *-*-gnu*)
   extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o"
   ;;
-*-*-gnu*)
-  ;;
 *-*-netbsd*)
   ;;
 *-*-openbsd*)
@@ -176,12 +173,10 @@ case ${host} in
 	then tmake_file=${cpu_type}/t-$rest
 	fi
 	;;
-alpha*-*-linux*)
+alpha*-*-linux* | alpha*-*-gnu*)
 	tmake_file="${tmake_file} alpha/t-crtfm"
 	extra_parts="$extra_parts crtfastmath.o"
 	;;
-alpha*-*-gnu*)
-	;;
 alpha*-*-freebsd*)
 	;;
 alpha*-*-netbsd*)
@@ -299,7 +294,7 @@ i[34567]86-*-openbsd*)
 	;;
 i[34567]86-*-coff*)
 	;;
-i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
+i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu*)
 	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
 	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
 	;;
@@ -307,8 +302,6 @@ x86_64-*-linux* | x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
 	extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
 	tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm"
 	;;
-i[34567]86-*-gnu*)
-	;;
 i[34567]86-pc-msdosdjgpp*)
 	;;
 i[34567]86-*-lynxos*)
@@ -576,7 +569,9 @@ m32c-*-elf*)
 esac
 
 case ${host} in
-i[34567]86-*-linux* | x86_64-*-linux*)
+i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu)
+	;;
+i[34567]86-*-linux* | x86_64-*-linux* | i[34567]86-*-gnu*)
 	tmake_file="${tmake_file} t-tls"
 	;;
 esac