diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e98904cbf224..6e4e7337948c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-15  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.md (floating point move splitters): Fix
+	usage of standard_80387_constant_p.
+	(ix86_preferred_reload_class): Ditto.
+
 2011-05-15  Uros Bizjak  <ubizjak@gmail.com>
 
 	* config/i386/i386.md (*movdf_internal): Simplify insn condition.
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 84678061d5e0..6a5044d15643 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -28489,7 +28489,7 @@ ix86_preferred_reload_class (rtx x, reg_class_t regclass)
 	 zero above.  We only want to wind up preferring 80387 registers if
 	 we plan on doing computation with them.  */
       if (TARGET_80387
-	  && standard_80387_constant_p (x))
+	  && standard_80387_constant_p (x) > 0)
 	{
 	  /* Limit class to non-sse.  */
 	  if (regclass == FLOAT_SSE_REGS)
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 1289fc0fbc5b..335ff9c146c4 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -3315,7 +3315,7 @@
     }
   else if (FP_REG_P (r))
     {
-      if (!standard_80387_constant_p (c))
+      if (standard_80387_constant_p (c) < 1)
 	FAIL;
     }
   else if (MMX_REG_P (r))
@@ -3347,7 +3347,7 @@
     }
   else if (FP_REG_P (r))
     {
-      if (!standard_80387_constant_p (c))
+      if (standard_80387_constant_p (c) < 1)
 	FAIL;
     }
   else if (MMX_REG_P (r))