2003-09-22 Andrew Cagney <cagney@redhat.com>

	* arch-utils.h (init_frame_pc_noop): Delete declaration.
	* arch-utils.c (init_frame_pc_noop): Delete function.
	* mn10300-tdep.c (mn10300_gdbarch_init): Do not set
	"init_frame_pc".
	* mips-tdep.c (mips_gdbarch_init): Ditto.
	* i386-interix-tdep.c (i386_interix_init_abi): Ditto.
	* config/sparc/tm-sparc.h (init_frame_pc_noop): Delete
	declaration.
	(DEPRECATED_INIT_FRAME_PC): Delete macro.
	* config/rs6000/tm-rs6000.h (init_frame_pc_noop): Delete
	declaration.
	(DEPRECATED_INIT_FRAME_PC): Delete macro.

8 files changed, 15 insertions, 23 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f780b8..4a080e9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,18 @@
+2003-09-22  Andrew Cagney  <cagney@redhat.com>
+
+	* arch-utils.h (init_frame_pc_noop): Delete declaration.
+	* arch-utils.c (init_frame_pc_noop): Delete function.
+	* mn10300-tdep.c (mn10300_gdbarch_init): Do not set
+	"init_frame_pc".
+	* mips-tdep.c (mips_gdbarch_init): Ditto.
+	* i386-interix-tdep.c (i386_interix_init_abi): Ditto.
+	* config/sparc/tm-sparc.h (init_frame_pc_noop): Delete
+	declaration.
+	(DEPRECATED_INIT_FRAME_PC): Delete macro.
+	* config/rs6000/tm-rs6000.h (init_frame_pc_noop): Delete
+	declaration.
+	(DEPRECATED_INIT_FRAME_PC): Delete macro.
+
 2003-09-22  Anthony Green  <green@redhat.com>
 
 	* monitor.c (monitor_expect): Delete unused conflicting targ_ops
diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index 9289e7a..db3bae1 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -228,13 +228,6 @@ no_op_reg_to_regnum (int reg)
 }
 
 CORE_ADDR
-init_frame_pc_noop (int fromleaf, struct frame_info *prev)
-{
-  /* Do nothing, implies return the same PC value.  */
-  return get_frame_pc (prev);
-}
-
-CORE_ADDR
 init_frame_pc_default (int fromleaf, struct frame_info *prev)
 {
   if (fromleaf && DEPRECATED_SAVED_PC_AFTER_CALL_P ())
diff --git a/gdb/arch-utils.h b/gdb/arch-utils.h
index 06f7bf3..68de221 100644
--- a/gdb/arch-utils.h
+++ b/gdb/arch-utils.h
@@ -85,8 +85,6 @@ extern int no_op_reg_to_regnum (int reg);
 
 /* Versions of init_frame_pc().  Do nothing; do the default. */
 
-extern CORE_ADDR init_frame_pc_noop (int fromleaf, struct frame_info *prev);
-
 extern CORE_ADDR init_frame_pc_default (int fromleaf, struct frame_info *prev);
 
 /* Do nothing version of elf_make_msymbol_special. */
diff --git a/gdb/config/rs6000/tm-rs6000.h b/gdb/config/rs6000/tm-rs6000.h
index 66b2f28..003b5b9 100644
--- a/gdb/config/rs6000/tm-rs6000.h
+++ b/gdb/config/rs6000/tm-rs6000.h
@@ -83,12 +83,6 @@ extern void aix_process_linenos (void);
 #define DEPRECATED_INIT_FRAME_PC_FIRST(fromleaf, prev) \
   (fromleaf ? DEPRECATED_SAVED_PC_AFTER_CALL (prev->next) : \
 	      prev->next ? DEPRECATED_FRAME_SAVED_PC (prev->next) : read_pc ())
-/* NOTE: cagney/2002-12-08: Add local declaration of
-   init_frame_pc_noop() because it isn't possible to include
-   "arch-utils.h" here.  Not too bad as this entire file is going away
-   anyway.  */
-extern CORE_ADDR init_frame_pc_noop (int fromleaf, struct frame_info *prev);
-#define DEPRECATED_INIT_FRAME_PC(fromleaf, prev) (init_frame_pc_noop (fromleaf, prev))
 
 /* RS6000/AIX does not support PT_STEP.  Has to be simulated.  */
 
diff --git a/gdb/config/sparc/tm-sparc.h b/gdb/config/sparc/tm-sparc.h
index a18e203..1567d0d 100644
--- a/gdb/config/sparc/tm-sparc.h
+++ b/gdb/config/sparc/tm-sparc.h
@@ -211,11 +211,6 @@ extern void sparc_print_extra_frame_info (struct frame_info *);
 /* DEPRECATED_INIT_EXTRA_FRAME_INFO needs the PC to detect flat
    frames.  */
 
-/* NOTE: cagney/2002-12-08: Add local declaration of
-   init_frame_pc_noop() because it isn't possible to include
-   "arch-utils.h" here.  */
-extern CORE_ADDR init_frame_pc_noop (int fromleaf, struct frame_info *prev);
-#define	DEPRECATED_INIT_FRAME_PC(FROMLEAF, PREV)	(init_frame_pc_noop (FROMLEAF, PREV))
 #define DEPRECATED_INIT_FRAME_PC_FIRST(FROMLEAF, PREV) \
   ((FROMLEAF) ? DEPRECATED_SAVED_PC_AFTER_CALL ((PREV)->next) : \
 	      (PREV)->next ? DEPRECATED_FRAME_SAVED_PC ((PREV)->next) : read_pc ())
diff --git a/gdb/i386-interix-tdep.c b/gdb/i386-interix-tdep.c
index 6902404..ea9f8c4 100644
--- a/gdb/i386-interix-tdep.c
+++ b/gdb/i386-interix-tdep.c
@@ -332,7 +332,6 @@ i386_interix_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   set_gdbarch_skip_trampoline_code (gdbarch,
                                     i386_interix_skip_trampoline_code);
   set_gdbarch_deprecated_init_extra_frame_info (gdbarch, i386_interix_back_one_frame);
-  set_gdbarch_deprecated_init_frame_pc (gdbarch, init_frame_pc_noop);
   set_gdbarch_deprecated_frame_chain_valid (gdbarch, i386_interix_frame_chain_valid);
   set_gdbarch_deprecated_frame_saved_pc (gdbarch, i386_interix_frame_saved_pc);
   set_gdbarch_name_of_malloc (gdbarch, "_malloc");
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 0ead243..027cf44 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -6056,7 +6056,6 @@ mips_gdbarch_init (struct gdbarch_info info,
   /* There's a mess in stack frame creation.  See comments in
      blockframe.c near reference to DEPRECATED_INIT_FRAME_PC_FIRST.  */
   set_gdbarch_deprecated_init_frame_pc_first (gdbarch, mips_init_frame_pc_first);
-  set_gdbarch_deprecated_init_frame_pc (gdbarch, init_frame_pc_noop);
 
   /* Map debug register numbers onto internal register numbers.  */
   set_gdbarch_stab_reg_to_regnum (gdbarch, mips_stab_reg_to_regnum);
diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c
index 2385d37..d6011c2 100644
--- a/gdb/mn10300-tdep.c
+++ b/gdb/mn10300-tdep.c
@@ -1189,7 +1189,6 @@ mn10300_gdbarch_init (struct gdbarch_info info,
   set_gdbarch_inner_than (gdbarch, core_addr_lessthan);
   set_gdbarch_deprecated_saved_pc_after_call (gdbarch, mn10300_saved_pc_after_call);
   set_gdbarch_deprecated_init_extra_frame_info (gdbarch, mn10300_init_extra_frame_info);
-  set_gdbarch_deprecated_init_frame_pc (gdbarch, init_frame_pc_noop);
   set_gdbarch_deprecated_frame_init_saved_regs (gdbarch, mn10300_frame_init_saved_regs);
   set_gdbarch_deprecated_frame_chain (gdbarch, mn10300_frame_chain);
   set_gdbarch_deprecated_frame_saved_pc (gdbarch, mn10300_frame_saved_pc);