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

	* xstormy16-tdep.c (xstormy16_in_solib_call_trampoline)
	(xstormy16_gdbarch_init): Do not set in_solib_call_trampoline,
	delete corresponding unused function.
	* armnbsd-tdep.c (arm_netbsd_aout_init_abi): Really do not set
	in_solib_call_trampoline.
	* config/arm/tm-embed.h (IN_SOLIB_CALL_TRAMPOLINE): Delete.
	* config/powerpc/tm-linux.h: Delete #undef IN_SOLIB_CALL_TRAMPOLINE.
	* config/mips/tm-nbsd.h: Ditto.
	* config/arm/tm-linux.h: Ditto.
	* config/mips/tm-linux.h: Ditto.

8 files changed, 11 insertions, 23 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8e88343ed94..8aa4d4f6b2e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,16 @@
 2004-10-31  Andrew Cagney  <cagney@gnu.org>
 
+	* xstormy16-tdep.c (xstormy16_in_solib_call_trampoline)
+	(xstormy16_gdbarch_init): Do not set in_solib_call_trampoline,
+	delete corresponding unused function.
+	* armnbsd-tdep.c (arm_netbsd_aout_init_abi): Really do not set
+	in_solib_call_trampoline.
+	* config/arm/tm-embed.h (IN_SOLIB_CALL_TRAMPOLINE): Delete.
+	* config/powerpc/tm-linux.h: Delete #undef IN_SOLIB_CALL_TRAMPOLINE.
+	* config/mips/tm-nbsd.h: Ditto.
+	* config/arm/tm-linux.h: Ditto.
+	* config/mips/tm-linux.h: Ditto.
+
 	* armnbsd-tdep.c (arm_netbsd_aout_init_abi)
 	(arm_netbsd_aout_in_solib_call_trampoline): Do not set
 	in_solib_call_trampoline, delete corresponding unused function.
diff --git a/gdb/armnbsd-tdep.c b/gdb/armnbsd-tdep.c
index 4767888be71..99fb25d8e3c 100644
--- a/gdb/armnbsd-tdep.c
+++ b/gdb/armnbsd-tdep.c
@@ -78,9 +78,6 @@ arm_netbsd_aout_init_abi (struct gdbarch_info info,
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
   arm_netbsd_init_abi_common (info, gdbarch);
-
-  set_gdbarch_in_solib_call_trampoline
-    (gdbarch, arm_netbsd_aout_in_solib_call_trampoline);
   tdep->fp_model = ARM_FLOAT_SOFT_FPA;
 }
 
diff --git a/gdb/config/arm/tm-embed.h b/gdb/config/arm/tm-embed.h
index 6a8c87abc4c..f72b30a53ca 100644
--- a/gdb/config/arm/tm-embed.h
+++ b/gdb/config/arm/tm-embed.h
@@ -41,7 +41,6 @@
 #define THUMB_BE_BREAKPOINT {0xbe,0xbe}       
 
 /* Functions for dealing with Thumb call thunks.  */
-#define IN_SOLIB_CALL_TRAMPOLINE(pc, name)	arm_in_call_stub (pc, name)
 #define SKIP_TRAMPOLINE_CODE(pc)		arm_skip_stub (pc)
 extern int arm_in_call_stub (CORE_ADDR pc, char *name);
 extern CORE_ADDR arm_skip_stub (CORE_ADDR pc);
diff --git a/gdb/config/arm/tm-linux.h b/gdb/config/arm/tm-linux.h
index 3cc4692a40d..108a72091d0 100644
--- a/gdb/config/arm/tm-linux.h
+++ b/gdb/config/arm/tm-linux.h
@@ -27,9 +27,6 @@
 #include "config/tm-linux.h"
 
 /* We've multi-arched this.  */
-#undef IN_SOLIB_CALL_TRAMPOLINE
-
-/* We've multi-arched this.  */
 #undef SKIP_TRAMPOLINE_CODE
 
 /* When we call a function in a shared library, and the PLT sends us
diff --git a/gdb/config/mips/tm-linux.h b/gdb/config/mips/tm-linux.h
index 8dc6c76ba64..86820107ee3 100644
--- a/gdb/config/mips/tm-linux.h
+++ b/gdb/config/mips/tm-linux.h
@@ -35,10 +35,4 @@
 #define IN_SOLIB_DYNSYM_RESOLVE_CODE(PC) mips_linux_in_dynsym_resolve_code (PC)
 int mips_linux_in_dynsym_resolve_code (CORE_ADDR pc);
 
-/* We don't want all of tm-sysv4.h's shared library trampoline code either.
-   Note that by undefining IN_SOLIB_CALL_TRAMPOLINE here we will use the
-   gdbarch vector's version instead.  */
-
-#undef IN_SOLIB_CALL_TRAMPOLINE
-
 #endif /* TM_MIPSLINUX_H */
diff --git a/gdb/config/mips/tm-nbsd.h b/gdb/config/mips/tm-nbsd.h
index f79c01f79b4..c5da546d03c 100644
--- a/gdb/config/mips/tm-nbsd.h
+++ b/gdb/config/mips/tm-nbsd.h
@@ -24,7 +24,6 @@
 
 #include "solib.h"
 
-#undef IN_SOLIB_CALL_TRAMPOLINE
 #undef SKIP_TRAMPOLINE_CODE
 #undef DEPRECATED_IGNORE_HELPER_CALL
 
diff --git a/gdb/config/powerpc/tm-linux.h b/gdb/config/powerpc/tm-linux.h
index e34363194ff..312f05996ca 100644
--- a/gdb/config/powerpc/tm-linux.h
+++ b/gdb/config/powerpc/tm-linux.h
@@ -28,7 +28,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* We've multi-arched these.  (Note that this completely undoes the
    effect of config/tm-linux.h #including config/tm-sysv4.h.)  */
-#undef IN_SOLIB_CALL_TRAMPOLINE
 #undef SKIP_TRAMPOLINE_CODE
 
 /* Make sure nexti gets the help it needs for debugging assembly code
diff --git a/gdb/xstormy16-tdep.c b/gdb/xstormy16-tdep.c
index 086566fd5a2..3cd64d7be54 100644
--- a/gdb/xstormy16-tdep.c
+++ b/gdb/xstormy16-tdep.c
@@ -577,12 +577,6 @@ xstormy16_skip_trampoline_code (CORE_ADDR pc)
   return 0;
 }
 
-static int
-xstormy16_in_solib_call_trampoline (CORE_ADDR pc, char *name)
-{
-  return xstormy16_skip_trampoline_code (pc) != 0;
-}
-
 /* Function pointers are 16 bit.  The address space is 24 bit, using
    32 bit addresses.  Pointers to functions on the XStormy16 are implemented
    by using 16 bit pointers, which are either direct pointers in case the
@@ -849,8 +843,6 @@ xstormy16_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_return_value (gdbarch, xstormy16_return_value);
 
   set_gdbarch_skip_trampoline_code (gdbarch, xstormy16_skip_trampoline_code);
-  set_gdbarch_in_solib_call_trampoline (gdbarch,
-					xstormy16_in_solib_call_trampoline);
 
   set_gdbarch_print_insn (gdbarch, print_insn_xstormy16);