diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 898f87b16b3..9388421627b 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-12  Paolo Bonzini  <bonzini@gnu.org>
+
+	* optabs.c (prepare_cmp_insn): Temporarily disable test that
+	causes spurious differences between trunk and cond-optab branch.
+
 2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
 
 	PR target/37137
diff --git a/gcc/optabs.c b/gcc/optabs.c
index 7eab811f066..c59d7ecf717 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -4042,18 +4042,6 @@ prepare_cmp_insn (rtx *px, rtx *py, enum rtx_code *pcomparison, rtx size,
   int unsignedp = *punsignedp;
   rtx libfunc;
 
-  /* If we are inside an appropriately-short loop and we are optimizing,
-     force expensive constants into a register.  */
-  if (CONSTANT_P (x) && optimize
-      && (rtx_cost (x, COMPARE, optimize_insn_for_speed_p ())
-          > COSTS_N_INSNS (1)))
-    x = force_reg (mode, x);
-
-  if (CONSTANT_P (y) && optimize
-      && (rtx_cost (y, COMPARE, optimize_insn_for_speed_p ())
-          > COSTS_N_INSNS (1)))
-    y = force_reg (mode, y);
-
 #ifdef HAVE_cc0
   /* Make sure if we have a canonical comparison.  The RTL
      documentation states that canonical comparisons are required only