diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 0e31d98d5e30c1e31318ae41ea39692cb2062cc5..6a198aa7a5e42eb8f88a9186d22d45d79d9fb34c 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-10  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure.ac: Use i386/t-crtstuff on i?86-*-solaris2* if
+	appropriate.
+	* configure: Regenerate.
+
 2010-11-24  Nathan Froyd  <froydnj@codesourcery.com>
 
 	* config/libbid/bid_conf.h (BID_BIG_ENDIAN): Define in terms of
diff --git a/libgcc/configure b/libgcc/configure
index dad6c49746a75ba232ddeeb837e9581699dfb889..0344380b92959d0a574fbb2e37c8032556e2f5e1 100644
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -3754,7 +3754,7 @@ esac
 # Link with -nostartfiles -nodefaultlibs since neither are present while
 # building libgcc.
 case ${host} in
-i?86-*-solaris2.1[0-9]*)
+i?86-*-solaris2*)
   cat > conftest.s <<EOF
 	.section	.eh_frame,"a",@unwind
 	.zero	4
diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index caade3317b3177452e37c61a82b6f66af5c6e414..fc157d30a794206a7c6f7e2c6e101fe7e6d447f3 100644
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -169,7 +169,7 @@ esac
 # Link with -nostartfiles -nodefaultlibs since neither are present while
 # building libgcc.
 case ${host} in
-i?86-*-solaris2.1[[0-9]]*)
+i?86-*-solaris2*)
   cat > conftest.s <<EOF
 	.section	.eh_frame,"a",@unwind
 	.zero	4