diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 16dfcbe9e7e..d1cef5c2a21 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jul 26 19:07:11 1999  Geoff Keating  <geoffk@cygnus.com>
+
+	* config/rs6000/rs6000.c (rs6000_expand_builtin_saveregs):
+	Rename from expand_builtin_saveregs.
+	* config/rs6000/rs6000.c (EXPAND_BUILTIN_SAVEREGS): Change caller.
+
 Mon Jul 26 22:52:47 1999  Richard Henderson  <rth@cygnus.com>
 
 	* i960.c (i960_setup_incoming_varargs): Use get_varargs_alias_set
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 527fd04194c..e30d0d6c16f 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -1768,7 +1768,7 @@ setup_incoming_varargs (cum, mode, type, pretend_size, no_rtl)
    to a block copy.  This is similar to the way we do things on Alpha.  */
 
 struct rtx_def *
-expand_builtin_saveregs ()
+rs6000_expand_builtin_saveregs ()
 {
   rtx block, mem_gpr_fpr, mem_reg_save_area, mem_overflow, tmp;
   tree fntype;
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index 04d00c7458c..3a3a88041f6 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -1569,7 +1569,7 @@ typedef struct rs6000_args
    contains the value to use as the return of `__builtin_saveregs'.  */
 
 #define EXPAND_BUILTIN_SAVEREGS() \
-  expand_builtin_saveregs ()
+  rs6000_expand_builtin_saveregs ()
 
 /* This macro generates the assembly code for function entry.
    FILE is a stdio stream to output the code to.
@@ -3273,7 +3273,7 @@ extern struct rtx_def *function_arg ();
 extern int function_arg_partial_nregs ();
 extern int function_arg_pass_by_reference ();
 extern void setup_incoming_varargs ();
-extern struct rtx_def *expand_builtin_saveregs ();
+extern struct rtx_def *rs6000_expand_builtin_saveregs ();
 extern struct rtx_def *rs6000_stack_temp ();
 extern int expand_block_move ();
 extern int load_multiple_operation ();