diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b1865d5be9a071a541efa4804dc277e2d3bff543..5b8b01927b34e521b6e0a7668176a1c836d64812 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-15  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* config.gcc <i[34567]86-*-gnu*>: Handle softfp as for Linux.
+
 2010-04-15  Richard Guenther  <rguenther@suse.de>
 
 	* tree-ssa-structalias.c (struct variable_info): Add
diff --git a/gcc/config.gcc b/gcc/config.gcc
index f1b32fa2f2d0f3a486630eb9e489ea17d1561cd2..88631ff66e6ee6a576cdcf8b4baa800f8ec31802 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -3396,7 +3396,9 @@ case ${target} in
 	i[34567]86-*-darwin* | x86_64-*-darwin*)
 		tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp"
 		;;
-	i[34567]86-*-linux* | x86_64-*-linux* | i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu)
+	i[34567]86-*-linux* | x86_64-*-linux* | \
+	  i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu | \
+	  i[34567]86-*-gnu*)
 		tmake_file="${tmake_file} i386/t-fprules-softfp soft-fp/t-softfp i386/t-linux"
 		;;
 	i[34567]86-*-solaris2*)
diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 9aa32c093526507546d1e50efd17d282f53a52c5..3a3844d7f38c5870a38d4939a498cc831f6431e5 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-15  Thomas Schwinge  <tschwinge@gnu.org>
+
+	* config.host <i[34567]86-*-gnu*>: Handle softfp as for Linux.
+
 2010-04-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* config.host (alpha*-dec-osf[45]*): Removed alpha*-dec-osf4*,
diff --git a/libgcc/config.host b/libgcc/config.host
index 0e2046686d8ab2e879153d0391e8f0416358c554..56d900cf3fb99fdad4052ce650a2dfac0d72bdb0 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -600,6 +600,7 @@ case ${host} in
 i[34567]86-*-darwin* | x86_64-*-darwin* | \
   i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu | \
   i[34567]86-*-linux* | x86_64-*-linux* | \
+  i[34567]86-*-gnu* | \
   i[34567]86-*-solaris2* | \
   i[34567]86-*-cygwin* | i[34567]86-*-mingw* | x86_64-*-mingw*)
 	if test "${host_address}" = 32; then