diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 80d7b53fcc743288def604c89ea27e9ba369b174..b5664f37b5acb04ae4b8b7ad1944d0cdc75e96b0 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,7 +1,6 @@
 2012-09-05  Uros Bizjak  <ubizjak@gmail.com>
 
-	* config/fpu-387.h (set_fpu): Use __builtin_ia32_stmxcsr and
-	__builtin_ia32_ldmxcsr intrinsics.
+	* config/fpu-387.h (set_fpu): Prefix stmxcsr and ldmxcsr with %v.
 
 2012-07-25  Andreas Schwab  <schwab@linux-m68k.org>
 
diff --git a/libgfortran/config/fpu-387.h b/libgfortran/config/fpu-387.h
index 0e87aab8b9d07ef0c06bbf84980bd66386b16933..d2b7a05094f483139df48470b684e13da930b406 100644
--- a/libgfortran/config/fpu-387.h
+++ b/libgfortran/config/fpu-387.h
@@ -118,7 +118,7 @@ void set_fpu (void)
     {
       unsigned int cw_sse;
 
-      cw_sse = __builtin_ia32_stmxcsr ();
+      asm volatile ("%vstmxcsr %0" : "=m" (cw_sse));
 
       cw_sse &= 0xffff0000;
       cw_sse |= (_FPU_MASK_IM | _FPU_MASK_DM | _FPU_MASK_ZM | _FPU_MASK_OM
@@ -131,6 +131,6 @@ void set_fpu (void)
       if (options.fpe & GFC_FPE_UNDERFLOW) cw_sse &= ~(_FPU_MASK_UM << 7);
       if (options.fpe & GFC_FPE_INEXACT) cw_sse &= ~(_FPU_MASK_PM << 7);
 
-      __builtin_ia32_ldmxcsr (cw_sse);
+      asm volatile ("%vldmxcsr %0" : : "m" (cw_sse));
     }
 }