diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index cc392378e5b..0221e751919 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-11  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* configure.ac (i?86-*-solaris2*): Use libgcc copy of
+	i386/t-crtstuff.
+	* configure: Regenerate.
+
 2011-07-11  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
 	* dfp-bit.c, dfp-bit.h: New files.
diff --git a/libgcc/configure b/libgcc/configure
index 45fe914ddf9..9845eadb65a 100644
--- a/libgcc/configure
+++ b/libgcc/configure
@@ -3826,9 +3826,7 @@ EOF
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; }; then
-      # configure expects config files in libgcc/config, so need a relative
-      # path here.
-      tmake_file="${tmake_file} ../../gcc/config/i386/t-crtstuff"
+      tmake_file="${tmake_file} i386/t-crtstuff"
   fi
   ;;
 esac
diff --git a/libgcc/configure.ac b/libgcc/configure.ac
index 20536c7152d..39a2e920ba7 100644
--- a/libgcc/configure.ac
+++ b/libgcc/configure.ac
@@ -215,9 +215,7 @@ i?86-*-solaris2* | x86_64-*-solaris2.1[[0-9]]*)
 	.zero	8
 EOF
   if AC_TRY_COMMAND(${CC-cc} -shared -nostartfiles -nodefaultlibs -o conftest.so conftest.s 1>&AS_MESSAGE_LOG_FD); then
-      # configure expects config files in libgcc/config, so need a relative
-      # path here.
-      tmake_file="${tmake_file} ../../gcc/config/i386/t-crtstuff"
+      tmake_file="${tmake_file} i386/t-crtstuff"
   fi
   ;;
 esac