diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2c5e099183c..f0839601f1a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2003-06-09  Andrew Cagney  <cagney@redhat.com>
+
+	* frame.h (deprecated_unwind_get_saved_register): Rename
+	generic_unwind_get_saved_register, update comments.
+	* mips-tdep.c (mips_get_saved_register): Update.
+	* frame.c (deprecated_unwind_get_saved_register): Update.
+
 2003-06-09  Andrew Cagney  <cagney@redhat.com>
 
 	* vax-tdep.c (vax_frame_locals_address): Delete function.
diff --git a/gdb/frame.c b/gdb/frame.c
index a87e522db41..b1107efa8e5 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -674,12 +674,12 @@ frame_read_signed_register (struct frame_info *frame, int regnum,
 }
 
 void
-generic_unwind_get_saved_register (char *raw_buffer,
-				   int *optimizedp,
-				   CORE_ADDR *addrp,
-				   struct frame_info *frame,
-				   int regnum,
-				   enum lval_type *lvalp)
+deprecated_unwind_get_saved_register (char *raw_buffer,
+				      int *optimizedp,
+				      CORE_ADDR *addrp,
+				      struct frame_info *frame,
+				      int regnum,
+				      enum lval_type *lvalp)
 {
   int optimizedx;
   CORE_ADDR addrx;
diff --git a/gdb/frame.h b/gdb/frame.h
index f3640b458c0..4dc75607888 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -492,19 +492,16 @@ extern int generic_pc_in_call_dummy (CORE_ADDR pc,
 
 extern char *deprecated_generic_find_dummy_frame (CORE_ADDR pc, CORE_ADDR fp);
 
-void generic_unwind_get_saved_register (char *raw_buffer,
-				        int *optimizedp,
-				        CORE_ADDR *addrp,
-				        struct frame_info *frame,
-				        int regnum,
-				        enum lval_type *lvalp);
 
-/* The function generic_get_saved_register() has been made obsolete.
-   DEPRECATED_GET_SAVED_REGISTER now defaults to the recursive
-   equivalent - generic_unwind_get_saved_register() - so there is no
-   need to even set DEPRECATED_GET_SAVED_REGISTER.  Architectures that
-   need to override the register unwind mechanism should modify
-   frame->unwind().  */
+/* The DEPRECATED_GET_SAVED_REGISTER architecture interface is
+   entirely redundant.  New architectures should implement per-frame
+   unwinders (ref "frame-unwind.h").  */
+extern void deprecated_unwind_get_saved_register (char *raw_buffer,
+						  int *optimizedp,
+						  CORE_ADDR *addrp,
+						  struct frame_info *frame,
+						  int regnum,
+						  enum lval_type *lvalp);
 extern void deprecated_generic_get_saved_register (char *, int *, CORE_ADDR *,
 						   struct frame_info *, int,
 						   enum lval_type *);
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index b7c756a142b..49c6cb62e05 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -5453,8 +5453,8 @@ mips_get_saved_register (char *raw_buffer,
     lvalp = &lvalx;
   if (optimizedp == NULL)
     optimizedp = &optimizedx;
-  generic_unwind_get_saved_register (raw_buffer, optimizedp, addrp, frame,
-                                     regnum, lvalp);
+  deprecated_unwind_get_saved_register (raw_buffer, optimizedp, addrp, frame,
+					regnum, lvalp);
   /* FIXME: cagney/2002-09-13: This is just so bad.  The MIPS should
      have a pseudo register range that correspons to the ABI's, rather
      than the ISA's, view of registers.  These registers would then