2004-10-31 Andrew Cagney <cagney@gnu.org>

	* mips-tdep.c (mips_ignore_helper): Delete.
	* config/mips/tm-mips.h (DEPRECATED_IGNORE_HELPER_CALL): Delete.
	* infrun.c (handle_inferior_event): Delete #ifdef
	DEPRECATED_IGNORE_HELPER_CALL code.

4 files changed, 5 insertions, 46 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0a57bbe..b06a246 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2004-10-31  Andrew Cagney  <cagney@gnu.org>
 
+	* mips-tdep.c (mips_ignore_helper): Delete.
+	* config/mips/tm-mips.h (DEPRECATED_IGNORE_HELPER_CALL): Delete.
+	* infrun.c (handle_inferior_event): Delete #ifdef
+	DEPRECATED_IGNORE_HELPER_CALL code.
+
 	* config/mips/tm-mips.h (RA_REGNUM): Delete.
 
 2004-10-31  Mark Kettenis  <kettenis@gnu.org>
diff --git a/gdb/config/mips/tm-mips.h b/gdb/config/mips/tm-mips.h
index 27af00d..0830342 100644
--- a/gdb/config/mips/tm-mips.h
+++ b/gdb/config/mips/tm-mips.h
@@ -44,8 +44,4 @@ extern int mips_step_skips_delay (CORE_ADDR);
 
 #define MDEBUG_EFI_SYMBOL_NAME "__GDB_EFI_INFO__"
 
-/* Functions for dealing with MIPS16 call and return stubs.  */
-#define DEPRECATED_IGNORE_HELPER_CALL(pc)			mips_ignore_helper (pc)
-extern int mips_ignore_helper (CORE_ADDR pc);
-
 #endif /* TM_MIPS_H */
diff --git a/gdb/infrun.c b/gdb/infrun.c
index 2624713..d35ecde 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -2303,27 +2303,6 @@ process_event_stop_test:
 	  return;
 	}
 
-#ifdef DEPRECATED_IGNORE_HELPER_CALL
-      /* On MIPS16, a function that returns a floating point value may
-         call a library helper function to copy the return value to a
-         floating point register.  The DEPRECATED_IGNORE_HELPER_CALL
-         macro returns non-zero if we should ignore (i.e. step over)
-         this function call.  */
-      /* FIXME: cagney/2004-07-21: These custom ``ignore frame when
-         stepping'' function attributes (SIGTRAMP_FRAME,
-         DEPRECATED_IGNORE_HELPER_CALL, SKIP_TRAMPOLINE_CODE,
-         skip_language_trampoline frame, et.al.) need to be replaced
-         with generic attributes bound to the frame's function.  */
-      if (DEPRECATED_IGNORE_HELPER_CALL (stop_pc))
-	{
-	  /* We're doing a "next", set a breakpoint at callee's return
-	     address (the address at which the caller will
-	     resume).  */
-	  insert_step_resume_breakpoint_at_frame (get_prev_frame (get_current_frame ()));
-	  keep_going (ecs);
-	  return;
-	}
-#endif
       if (step_over_calls == STEP_OVER_ALL)
 	{
 	  /* We're doing a "next", set a breakpoint at callee's return
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index d656060..047abe5 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -4590,27 +4590,6 @@ mips_in_solib_return_trampoline (CORE_ADDR pc, char *name)
   return 0;			/* not a stub */
 }
 
-
-/* Return non-zero if the PC is in a library helper function that
-   should be ignored.  This implements the
-   DEPRECATED_IGNORE_HELPER_CALL macro.  */
-
-int
-mips_ignore_helper (CORE_ADDR pc)
-{
-  char *name;
-
-  /* Find the starting address and name of the function containing the PC.  */
-  if (find_pc_partial_function (pc, &name, NULL, NULL) == 0)
-    return 0;
-
-  /* If the PC is in __mips16_ret_{d,s}f, this is a library helper function
-     that we want to ignore.  */
-  return (strcmp (name, "__mips16_ret_sf") == 0
-	  || strcmp (name, "__mips16_ret_df") == 0);
-}
-
-
 /* Convert a dbx stab register number (from `r' declaration) to a GDB
    [1 * NUM_REGS .. 2 * NUM_REGS) REGNUM.  */