diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 582f100d8f3..dc32386fdd4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-20  Richard Henderson  <rth@redhat.com>
+
+	* optabs.c (emit_cmp_and_jump_insns): Don't swap commutative
+	operands unless the operation is commutative.
+
 2001-05-20  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* fold-const.c (tree_expr_nonnegative_p): Detect more non-negative
diff --git a/gcc/optabs.c b/gcc/optabs.c
index a2a42c636b1..1bc8aaf1f0e 100644
--- a/gcc/optabs.c
+++ b/gcc/optabs.c
@@ -3289,13 +3289,16 @@ emit_cmp_and_jump_insns (x, y, comparison, size, mode, unsignedp, align, label)
 {
   rtx op0;
   rtx op1;
-	  
-  if (swap_commutative_operands_p (x, y))
+
+  /* We may not swap in the general case, since this is called from 
+     compare_from_rtx, and we have no way of reporting the changed
+     comparison code.  */
+  if (comparison == swap_condition (comparison)
+      && swap_commutative_operands_p (x, y))
     {
       /* Swap operands and condition to ensure canonical RTL.  */
       op0 = y;
       op1 = x;
-      comparison = swap_condition (comparison);
     }
   else
     {