From 41d39a95af476969be023d4b7e129042c8daf5c8 Mon Sep 17 00:00:00 2001 From: Richard Earnshaw Date: Tue, 19 Feb 2002 11:46:21 +0000 Subject: [PATCH] * armnbsd-tdep.c (arm_netbsd_aout_in_solib_call_trampoline): New function. (arm_netbsd_aout_init_abi): Initialize IN_SOLIB_CALL_TRAMPOLINE. * config/arm/tm-nbsd.h: Don't include config/tm-nbsd.h, it only defines one thing and that is incorrect for this port. (IN_SOLIB_CALL_TRAMPOLINE): Delete. --- gdb/ChangeLog | 9 +++++++++ gdb/armnbsd-tdep.c | 12 ++++++++++++ gdb/config/arm/tm-nbsd.h | 6 ------ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 01bea4b62c7..d4443bfaba0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2002-02-19 Richard Earnshaw + + * armnbsd-tdep.c (arm_netbsd_aout_in_solib_call_trampoline): New + function. + (arm_netbsd_aout_init_abi): Initialize IN_SOLIB_CALL_TRAMPOLINE. + * config/arm/tm-nbsd.h: Don't include config/tm-nbsd.h, it only + defines one thing and that is incorrect for this port. + (IN_SOLIB_CALL_TRAMPOLINE): Delete. + 2002-02-18 Pierre Muller * go32-nat.c: add i386-tdep.h include to import FP_REGNUM_P macro. diff --git a/gdb/armnbsd-tdep.c b/gdb/armnbsd-tdep.c index 291273b1fb8..4a3aeb882f3 100644 --- a/gdb/armnbsd-tdep.c +++ b/gdb/armnbsd-tdep.c @@ -30,6 +30,15 @@ override the default little-endian breakpoint. */ static const char arm_nbsd_arm_le_breakpoint[] = {0x11, 0x00, 0x00, 0xe6}; +static int +arm_netbsd_aout_in_solib_call_trampoline (CORE_ADDR pc, char *name) +{ + if (strcmp (name, "_PROCEDURE_LINKAGE_TABLE_") == 0) + return 1; + + return 0; +} + static void arm_netbsd_init_abi_common (struct gdbarch_info info, struct gdbarch *gdbarch) @@ -49,6 +58,9 @@ arm_netbsd_aout_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { arm_netbsd_init_abi_common (info, gdbarch); + + set_gdbarch_in_solib_call_trampoline + (gdbarch, arm_netbsd_aout_in_solib_call_trampoline); } static void diff --git a/gdb/config/arm/tm-nbsd.h b/gdb/config/arm/tm-nbsd.h index 5119879fe47..03f48786319 100644 --- a/gdb/config/arm/tm-nbsd.h +++ b/gdb/config/arm/tm-nbsd.h @@ -22,12 +22,6 @@ #define TM_NBSD_H #include "arm/tm-arm.h" -#include "tm-nbsd.h" - -/* Return non-zero if inside a shared-library entry stub. */ -#undef IN_SOLIB_CALL_TRAMPOLINE -#define IN_SOLIB_CALL_TRAMPOLINE(pc, name) \ - STREQ ((name), "_PROCEDURE_LINKAGE_TABLE_") /* By convention, NetBSD uses the "other" register names. */ #define DEFAULT_REGISTER_NAMES additional_register_names -- 2.30.2