diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0f5c3ae35abcf825a7fc2bbf42d3d1c9995634be..2c7b0dfc9977f0c0a117805e471d2aa0e216e4ea 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-07-13  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR bootstrap/49739
+	* config.gcc (extra_parts): Add crtprec32.o crtprec64.o crtp
+	rec80.o crtfastmath.o for Linux/x86.
+
 2011-07-14  Bernd Schmidt  <bernds@codesourcery.com>
 
 	* haifa-sched.c: Include "hashtab.h"
diff --git a/gcc/config.gcc b/gcc/config.gcc
index 03fa7d274ca157f81e2419afed621327124ad623..2b9502ba9e7d0c3567e92fa2281f3317bd9c9b59 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1304,6 +1304,9 @@ i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i
 			esac
 		else
 			tm_file="${tm_file} i386/gnu-user.h i386/linux.h"
+			# This is a hack to avoid a configuration mismatch
+			# until the toplevel libgcc move is complete.
+			extra_parts="${extra_parts} crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
 		fi
 		;;
 	i[34567]86-*-knetbsd*-gnu) tm_file="${tm_file} i386/gnu-user.h knetbsd-gnu.h i386/knetbsd-gnu.h" ;;