diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d7455123d435883811aa4ed651239c9989110a36..a39ecba33d726401322ea6b5d1ab3ed869e8e366 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-05  Richard Henderson  <rth@redhat.com>
+
+	* config/i386/ia32intrin.h: Protect CRC32 builtins with __SSE4_2__.
+
 2009-11-05  Paul Brook  <paul@codesourcery.com>
 
 	* config/arm/arm.c (arm_fp_model, arm_fpu_arch, arm_fpu_tune): Remove.
diff --git a/gcc/config/i386/ia32intrin.h b/gcc/config/i386/ia32intrin.h
index e701b19e2a86d0dbb11e99146abd3326459c58ad..540bc3f09ee90e9a29fe135bca054a8fa964daa6 100644
--- a/gcc/config/i386/ia32intrin.h
+++ b/gcc/config/i386/ia32intrin.h
@@ -49,6 +49,7 @@ __bswapd (int __X)
   return __builtin_bswap32 (__X);
 }
 
+#ifdef __SSE4_2__
 /* 32bit accumulate CRC32 (polynomial 0x11EDC6F41) value.  */
 extern __inline unsigned int
 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
@@ -70,6 +71,7 @@ __crc32d (unsigned int __C, unsigned int __V)
 {
   return __builtin_ia32_crc32si (__C, __V);
 }
+#endif /* SSE4.2 */
 
 /* 32bit popcnt */
 extern __inline int
diff --git a/gcc/testsuite/g++.dg/other/i386-7.C b/gcc/testsuite/g++.dg/other/i386-7.C
new file mode 100644
index 0000000000000000000000000000000000000000..e2ad51e528dde4c63ac9072635950304dc8833e4
--- /dev/null
+++ b/gcc/testsuite/g++.dg/other/i386-7.C
@@ -0,0 +1,8 @@
+/* Test that x86intrin.h is usable with -O -pedantic-errors.  */
+/* We were using SSE4.2 builtins without the extension available.  */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
+/* { dg-options "-O -pedantic-errors" } */
+
+#include <x86intrin.h>
+
+int dummy;