diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 045ee27b669..031d37e2969 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -98,6 +98,8 @@ Sun Jul  1 11:53:52 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 Fri Jun 29 12:27:24 2001  Jeffrey A Law  (law@cygnus.com)
 
+	* simplify-rtx.c (simplify_rtx): Use swap_commutative_operands_p.
+
 	* doc/gcc.texi (Passes): Update due to recent -fdce -> -fssa-dce
 	changes.  Fix documentation for SSA DCE pass.
 
diff --git a/gcc/simplify-rtx.c b/gcc/simplify-rtx.c
index 20471cc5d5e..28bfad844c6 100644
--- a/gcc/simplify-rtx.c
+++ b/gcc/simplify-rtx.c
@@ -2526,14 +2526,7 @@ simplify_rtx (x)
       return simplify_unary_operation (code, mode,
 				       XEXP (x, 0), GET_MODE (XEXP (x, 0)));
     case 'c':
-      /* Put complex operands first and constants second if commutative.  */
-      if (GET_RTX_CLASS (code) == 'c'
-	  && ((CONSTANT_P (XEXP (x, 0)) && GET_CODE (XEXP (x, 1)) != CONST_INT)
-	      || (GET_RTX_CLASS (GET_CODE (XEXP (x, 0))) == 'o'
-		  && GET_RTX_CLASS (GET_CODE (XEXP (x, 1))) != 'o')
-	      || (GET_CODE (XEXP (x, 0)) == SUBREG
-		  && GET_RTX_CLASS (GET_CODE (SUBREG_REG (XEXP (x, 0)))) == 'o'
-		  && GET_RTX_CLASS (GET_CODE (XEXP (x, 1))) != 'o')))
+      if (swap_commutative_operands_p (XEXP (x, 0), XEXP (x, 1)))
 	{
 	  rtx tem;