diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6745e72c1a2e62e5e29335c8b11ced64743683fb..0d4e023ec6091f902703bf31a7ab5dbce290b388 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 Sun Oct 31 01:53:30 1999  Jeffrey A Law  (law@cygnus.com)
 
+	* combine.c (combine_simplify_rtx): Renamed from simplify_rtx.  All
+	references/callers changed.
+
 	* mn10200.c (mn10200_va_arg): Force the return value into a
 	register.
 
diff --git a/gcc/combine.c b/gcc/combine.c
index f3dcc96c202ca8b203cfa5671e65c663a526df87..111088ecfa636fa0a8b4467c19de5d2135221409 100644
--- a/gcc/combine.c
+++ b/gcc/combine.c
@@ -362,7 +362,7 @@ static rtx try_combine		PROTO((rtx, rtx, rtx));
 static void undo_all		PROTO((void));
 static rtx *find_split_point	PROTO((rtx *, rtx));
 static rtx subst		PROTO((rtx, rtx, rtx, int, int));
-static rtx simplify_rtx		PROTO((rtx, enum machine_mode, int, int));
+static rtx combine_simplify_rtx	PROTO((rtx, enum machine_mode, int, int));
 static rtx simplify_if_then_else  PROTO((rtx));
 static rtx simplify_set		PROTO((rtx));
 static rtx simplify_logical	PROTO((rtx, int));
@@ -3248,7 +3248,7 @@ subst (x, from, to, in_dest, unique_copy)
       /* If X is sufficiently simple, don't bother trying to do anything
 	 with it.  */
       if (code != CONST_INT && code != REG && code != CLOBBER)
-	x = simplify_rtx (x, op0_mode, i == 3, in_dest);
+	x = combine_simplify_rtx (x, op0_mode, i == 3, in_dest);
 
       if (GET_CODE (x) == code)
 	break;
@@ -3272,7 +3272,7 @@ subst (x, from, to, in_dest, unique_copy)
    X is returned; IN_DEST is nonzero if we are inside a SET_DEST.  */
 
 static rtx
-simplify_rtx (x, op0_mode, last, in_dest)
+combine_simplify_rtx (x, op0_mode, last, in_dest)
      rtx x;
      enum machine_mode op0_mode;
      int last;