From 7d773d96dba39b73178c6ea4913cfa8f9a0ee4c5 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Fri, 6 Jun 2003 00:22:00 +0000 Subject: [PATCH] * hppa-hpux-tdep.c (hppa_hpux_init_abi): New function, setting pc_in_sigtramp multiarch method. (hppa_hpux_som_init_abi): Use it. (hppa_hpux_elf_init_abi): Likewise. * config/pa/tm-hppah.h (PC_IN_SIGTRAMP): Remove, now that this macro has been multiarched. * config/pa/tm-hppa64.h (PC_IN_SIGTRAMP): Temporarily set this macro here, as hppa64 isn't multiarched yet. --- gdb/ChangeLog | 11 +++++++++++ gdb/config/pa/tm-hppa64.h | 11 ++++++++--- gdb/config/pa/tm-hppah.h | 5 ----- gdb/hppa-hpux-tdep.c | 7 +++++++ 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 5ed3052..0601807 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,14 @@ +2003-06-05 J. Brobecker + + * hppa-hpux-tdep.c (hppa_hpux_init_abi): New function, setting + pc_in_sigtramp multiarch method. + (hppa_hpux_som_init_abi): Use it. + (hppa_hpux_elf_init_abi): Likewise. + * config/pa/tm-hppah.h (PC_IN_SIGTRAMP): Remove, now that this + macro has been multiarched. + * config/pa/tm-hppa64.h (PC_IN_SIGTRAMP): Temporarily set this + macro here, as hppa64 isn't multiarched yet. + 2003-06-05 Andrew Cagney * Makefile.in (value_h): Add $(frame_h). diff --git a/gdb/config/pa/tm-hppa64.h b/gdb/config/pa/tm-hppa64.h index 6d39ed0..a3cc4be 100644 --- a/gdb/config/pa/tm-hppa64.h +++ b/gdb/config/pa/tm-hppa64.h @@ -35,9 +35,14 @@ struct frame_info; the conversion for hppa64 hasn't been completed yet. */ #define GDB_MULTI_ARCH 0 -/* FIXME: brobecker 2003-04-21: All the definition from this point until - the include of pa/tm-hppah.h are extracted from tm-hppa.h. They have - been temporarily moved here, until hppa64 is multiarched too. */ +/* FIXME: brobecker 2003-05-22: All the definition from this point until + the include of pa/tm-hppah.h are extracted from tm-hppa.h and tm-hppah.h. + They have been temporarily moved here, until hppa64 is multiarched too. */ + +#if !GDB_MULTI_ARCH +extern int hppa_hpux_pc_in_sigtramp (CORE_ADDR pc, char *name); +#define PC_IN_SIGTRAMP(pc, name) hppa_hpux_pc_in_sigtramp (pc, name) +#endif #if !GDB_MULTI_ARCH extern int hppa_reg_struct_has_addr (int gcc_p, struct type *type); diff --git a/gdb/config/pa/tm-hppah.h b/gdb/config/pa/tm-hppah.h index 290f752..345baaf 100644 --- a/gdb/config/pa/tm-hppah.h +++ b/gdb/config/pa/tm-hppah.h @@ -35,11 +35,6 @@ struct frame_info; #include "somsolib.h" #endif -#if !GDB_MULTI_ARCH -extern int hppa_hpux_pc_in_sigtramp (CORE_ADDR pc, char *name); -#define PC_IN_SIGTRAMP(pc, name) hppa_hpux_pc_in_sigtramp (pc, name) -#endif - extern void hppa_hpux_frame_saved_pc_in_sigtramp (struct frame_info *fi, CORE_ADDR *tmp); #define FRAME_SAVED_PC_IN_SIGTRAMP(FRAME, TMP) \ diff --git a/gdb/hppa-hpux-tdep.c b/gdb/hppa-hpux-tdep.c index cc50e02..0fb7c8f 100644 --- a/gdb/hppa-hpux-tdep.c +++ b/gdb/hppa-hpux-tdep.c @@ -94,15 +94,22 @@ hppa_hpux_frame_find_saved_regs_in_sigtramp (struct frame_info *fi, } } +static void +hppa_hpux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + set_gdbarch_pc_in_sigtramp (gdbarch, hppa_hpux_pc_in_sigtramp); +} static void hppa_hpux_som_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { + hppa_hpux_init_abi (info, gdbarch); } static void hppa_hpux_elf_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) { + hppa_hpux_init_abi (info, gdbarch); } void -- 2.7.4