diff --git a/config/ChangeLog b/config/ChangeLog
index 3c43dcde1..ffa8a92cd 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,13 @@
+2007-07-06  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* tls.m4 (GCC_CHECK_CC_TLS): New.
+
+2007-07-05  Sebastian Pop  <sebpop@gmail.com>
+
+	PR bootstrap/32622
+	* mh-x86omitfp (BOOT_CFLAGS): Add -fomit-frame-pointer,
+	don't reset its value.
+
 2007-06-27  Mike Stump  <mrs@apple.com>
 
 	* acx.m4 (ACX_CHECK_INSTALLED_TARGET_TOOL): Fixup logic for cross
diff --git a/config/mh-x86omitfp b/config/mh-x86omitfp
index 563f02ba0..7f536c8ba 100644
--- a/config/mh-x86omitfp
+++ b/config/mh-x86omitfp
@@ -1,2 +1,2 @@
 # Add -fomit-frame-pointer to the usual BOOT_CFLAGS to speed up the compiler.
-BOOT_CFLAGS = -O2 -g -fomit-frame-pointer
+BOOT_CFLAGS += -fomit-frame-pointer
diff --git a/config/tls.m4 b/config/tls.m4
index c8f3ff0a3..69cf6d4f9 100644
--- a/config/tls.m4
+++ b/config/tls.m4
@@ -73,3 +73,16 @@ AC_DEFUN([GCC_CHECK_TLS], [
     AC_DEFINE(HAVE_TLS, 1,
 	      [Define to 1 if the target supports thread-local storage.])
   fi])
+
+dnl Check whether the target assembler supports TLS.
+AC_DEFUN([GCC_CHECK_CC_TLS], [
+  GCC_ENABLE(tls, yes, [], [Use thread-local storage])
+  AC_CACHE_CHECK([whether the target asssembler upports thread-local storage],
+		 have_cc_tls, [
+    AC_COMPILE_IFELSE([__thread int a; int b; int main() { return a = b; }],
+      [have_cc_tls=yes], [have_cc_tls=no])]
+    )])
+  if test "$enable_tls $have_cc_tls" = "yes yes"; then
+    AC_DEFINE(HAVE_CC_TLS, 1,
+	      [Define to 1 if the target assembler supports thread-local storage.])
+  fi])