diff --git a/ChangeLog b/ChangeLog
index f9755ac9d07..be92afccaf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-19  Roger Sayle  <roger@eyesopen.com>
+
+	* config/mh-x86omitfp: New host makefile fragment.  Add
+	-fomit-frame-pointer to the default BOOT_CFLAGS.
+	* configure.in: Use it to speed up bootstrap on some IA-32 hosts.
+	* configure: Regenerate.
+
 2004-09-15  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR target/11572
diff --git a/config/mh-x86omitfp b/config/mh-x86omitfp
new file mode 100644
index 00000000000..563f02ba0a9
--- /dev/null
+++ b/config/mh-x86omitfp
@@ -0,0 +1,2 @@
+# Add -fomit-frame-pointer to the usual BOOT_CFLAGS to speed up the compiler.
+BOOT_CFLAGS = -O2 -g -fomit-frame-pointer
diff --git a/configure b/configure
index 592bf912795..100f407428a 100755
--- a/configure
+++ b/configure
@@ -1715,6 +1715,11 @@ case "${host}" in
   *-*-sysv4*)
     host_makefile_frag="config/mh-sysv4"
     ;;
+  # This is placed last to prevent interfering with the cases above.
+  i[3456789]86-*-*)
+    # Build the stage2 and stage3 compilers with -fomit-frame-pointer.
+    host_makefile_frag="config/mh-x86omitfp"
+    ;;
 esac
 fi
 
diff --git a/configure.in b/configure.in
index 609a23fad12..b7e29761e7f 100644
--- a/configure.in
+++ b/configure.in
@@ -937,6 +937,11 @@ case "${host}" in
   *-*-sysv4*)
     host_makefile_frag="config/mh-sysv4"
     ;;
+  # This is placed last to prevent interfering with the cases above.
+  i[[3456789]]86-*-*)
+    # Build the stage2 and stage3 compilers with -fomit-frame-pointer.
+    host_makefile_frag="config/mh-x86omitfp"
+    ;;
 esac
 fi