From 4b218c187454d94e6a935f048a3aefd94d646f20 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Fri, 6 Sep 2002 20:44:23 +0000 Subject: [PATCH] * i386bsd-tdep.c (i386bsd_init_abi): Set sigtramp_start and sigtramp_end to i386bsd_sigtramp_start and i386bsd_sigtramp_end. * i386nbsd-tdep.c (i386nbsd_init_abi): Set sigtramp_start and sigtramp_end to NULL. * config/i386/tm-fbsd.h (SIGTRAMP_START, SIGTRAMP_END): Remove defines. (i386bsd_sigtramp_start, i386_sigtramp_end): Remove prototypes. --- gdb/ChangeLog | 8 ++++++++ gdb/config/i386/tm-fbsd.h | 12 ------------ gdb/i386bsd-tdep.c | 4 ++++ gdb/i386nbsd-tdep.c | 5 +++++ 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 94ddd61cad2..9ea4f1fdd77 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2002-09-06 Mark Kettenis + * i386bsd-tdep.c (i386bsd_init_abi): Set sigtramp_start and + sigtramp_end to i386bsd_sigtramp_start and i386bsd_sigtramp_end. + * i386nbsd-tdep.c (i386nbsd_init_abi): Set sigtramp_start and + sigtramp_end to NULL. + * config/i386/tm-fbsd.h (SIGTRAMP_START, SIGTRAMP_END): Remove + defines. + (i386bsd_sigtramp_start, i386_sigtramp_end): Remove prototypes. + * i386nbsd-tdep.c (i386nbsd_pc_in_sigtramp): Remove spurious whitespace. diff --git a/gdb/config/i386/tm-fbsd.h b/gdb/config/i386/tm-fbsd.h index 1975a9b458b..433ef849383 100644 --- a/gdb/config/i386/tm-fbsd.h +++ b/gdb/config/i386/tm-fbsd.h @@ -27,16 +27,4 @@ #include #endif -/* These defines allow the recognition of sigtramps as a function name - . - - FIXME: kettenis/2002-05-12: Of course these defines will have to go - if we go truly "multi-arch", but I don't know yet how to get rid of - them. */ - -#define SIGTRAMP_START(pc) i386bsd_sigtramp_start (pc) -#define SIGTRAMP_END(pc) i386bsd_sigtramp_end (pc) -extern CORE_ADDR i386bsd_sigtramp_start (CORE_ADDR pc); -extern CORE_ADDR i386bsd_sigtramp_end (CORE_ADDR pc); - #endif /* TM_FBSD_H */ diff --git a/gdb/i386bsd-tdep.c b/gdb/i386bsd-tdep.c index 368fa5631ae..a76012368ce 100644 --- a/gdb/i386bsd-tdep.c +++ b/gdb/i386bsd-tdep.c @@ -100,6 +100,10 @@ i386bsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_pc_in_sigtramp (gdbarch, i386bsd_pc_in_sigtramp); + /* Allow the recognition of sigtramps as a function named . */ + set_gdbarch_sigtramp_start (gdbarch, i386bsd_sigtramp_start); + set_gdbarch_sigtramp_end (gdbarch, i386bsd_sigtramp_end); + /* Assume SunOS-style shared libraries. */ set_gdbarch_in_solib_call_trampoline (gdbarch, i386bsd_aout_in_solib_call_trampoline); diff --git a/gdb/i386nbsd-tdep.c b/gdb/i386nbsd-tdep.c index c8e0d64ea22..4558a35d2c8 100644 --- a/gdb/i386nbsd-tdep.c +++ b/gdb/i386nbsd-tdep.c @@ -251,6 +251,11 @@ i386nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* NetBSD has different signal trampoline conventions. */ set_gdbarch_pc_in_sigtramp (gdbarch, i386nbsd_pc_in_sigtramp); + /* FIXME: kettenis/20020906: We should probably provide + NetBSD-specific versions of these functions if we want to + recognize signal trampolines that live on the stack. */ + set_gdbarch_sigtramp_start (gdbarch, NULL); + set_gdbarch_sigtramp_end (gdbarch, NULL); /* NetBSD uses -freg-struct-return by default. */ tdep->struct_return = reg_struct_return; -- 2.30.2