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

	* config/arm/tm-linux.h (IN_SOLIB_RETURN_TRAMPOLINE): Delete.
	* config/mips/tm-nbsd.h, config/mips/tm-linux.h: Delete #undef
	IN_SOLIB_RETURN_TRAMPOLINE.
	* mips-tdep.c (mips_dump_tdep): Do not print
	IN_SOLIB_RETURN_TRAMPOLINE.
	(mips_in_solib_return_trampoline): Rename mips_in_return_stub.
	(mips_gdbarch_init): Update.

5 files changed, 12 insertions, 13 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6fab098fe2e..f2f97294d4d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
 2004-10-26  Andrew Cagney  <cagney@gnu.org>
 
+	* config/arm/tm-linux.h (IN_SOLIB_RETURN_TRAMPOLINE): Delete.
+	* config/mips/tm-nbsd.h, config/mips/tm-linux.h: Delete #undef
+	IN_SOLIB_RETURN_TRAMPOLINE.
+	* mips-tdep.c (mips_dump_tdep): Do not print
+	IN_SOLIB_RETURN_TRAMPOLINE.
+	(mips_in_solib_return_trampoline): Rename mips_in_return_stub.
+	(mips_gdbarch_init): Update.
+
 	* mips-tdep.h (mips_software_single_step): Move to here ...
 	* config/mips/tm-mips.h: ... from here.
 	* config/mips/tm-linux.h (SOFTWARE_SINGLE_STEP_P) 
diff --git a/gdb/config/arm/tm-linux.h b/gdb/config/arm/tm-linux.h
index 9ae6e9f8e99..3cc4692a40d 100644
--- a/gdb/config/arm/tm-linux.h
+++ b/gdb/config/arm/tm-linux.h
@@ -29,10 +29,6 @@
 /* We've multi-arched this.  */
 #undef IN_SOLIB_CALL_TRAMPOLINE
 
-/* On ARM GNU/Linux, a call to a library routine does not have to go
-   through any trampoline code.  */
-#define IN_SOLIB_RETURN_TRAMPOLINE(pc, name)	0
-
 /* We've multi-arched this.  */
 #undef SKIP_TRAMPOLINE_CODE
 
diff --git a/gdb/config/mips/tm-linux.h b/gdb/config/mips/tm-linux.h
index 2012fec824b..9ee002470e8 100644
--- a/gdb/config/mips/tm-linux.h
+++ b/gdb/config/mips/tm-linux.h
@@ -26,7 +26,6 @@
 
 /* We don't want to inherit tm-mips.h's shared library trampoline code.  */
 
-#undef IN_SOLIB_RETURN_TRAMPOLINE
 #undef SKIP_TRAMPOLINE_CODE
 #undef IGNORE_HELPER_CALL
 
diff --git a/gdb/config/mips/tm-nbsd.h b/gdb/config/mips/tm-nbsd.h
index 209e28e6116..90909dda0ee 100644
--- a/gdb/config/mips/tm-nbsd.h
+++ b/gdb/config/mips/tm-nbsd.h
@@ -27,7 +27,6 @@
 
 /* We don't want to inherit tm-mips.h's shared library trampoline code.  */
 #undef IN_SOLIB_CALL_TRAMPOLINE
-#undef IN_SOLIB_RETURN_TRAMPOLINE
 #undef SKIP_TRAMPOLINE_CODE
 #undef DEPRECATED_IGNORE_HELPER_CALL
 
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index 4f249b8e439..4deb31d46bc 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -5404,11 +5404,11 @@ mips_in_call_stub (CORE_ADDR pc, char *name)
 }
 
 
-/* Return non-zero if the PC is inside a return thunk (aka stub or trampoline).
-   This implements the IN_SOLIB_RETURN_TRAMPOLINE macro.  */
+/* Return non-zero if the PC is inside a return thunk (aka stub or
+   trampoline).  */
 
 static int
-mips_in_return_stub (CORE_ADDR pc, char *name)
+mips_in_solib_return_trampoline (CORE_ADDR pc, char *name)
 {
   CORE_ADDR start_addr;
 
@@ -5971,7 +5971,7 @@ mips_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   if (info.osabi == GDB_OSABI_UNKNOWN)
     {
       set_gdbarch_in_solib_call_trampoline (gdbarch, mips_in_call_stub);
-      set_gdbarch_in_solib_return_trampoline (gdbarch, mips_in_return_stub);
+      set_gdbarch_in_solib_return_trampoline (gdbarch, mips_in_solib_return_trampoline);
     }
 
   /* Hook in OS ABI-specific overrides, if they have been registered.  */
@@ -6120,9 +6120,6 @@ mips_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file)
 		      "mips_dump_tdep: IN_SOLIB_CALL_TRAMPOLINE # %s\n",
 		      XSTRING (IN_SOLIB_CALL_TRAMPOLINE (PC, NAME)));
   fprintf_unfiltered (file,
-		      "mips_dump_tdep: IN_SOLIB_RETURN_TRAMPOLINE # %s\n",
-		      XSTRING (IN_SOLIB_RETURN_TRAMPOLINE (PC, NAME)));
-  fprintf_unfiltered (file,
 		      "mips_dump_tdep: LAST_EMBED_REGNUM = %d\n",
 		      LAST_EMBED_REGNUM);
 #ifdef MACHINE_CPROC_FP_OFFSET