diff options
Diffstat (limited to 'gdb/i386-sol2-tdep.c')
| -rw-r--r-- | gdb/i386-sol2-tdep.c | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/gdb/i386-sol2-tdep.c b/gdb/i386-sol2-tdep.c index 96cd10d4ce2..46a7a7c6caf 100644 --- a/gdb/i386-sol2-tdep.c +++ b/gdb/i386-sol2-tdep.c @@ -1,5 +1,6 @@ /* Target-dependent code for Solaris x86. - Copyright 2002, 2003 Free Software Foundation, Inc. + + Copyright 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of GDB. @@ -22,7 +23,10 @@ #include "value.h" #include "osabi.h" +#include "gdb_string.h" + #include "i386-tdep.h" +#include "solib-svr4.h" /* From <ia32/sys/reg.h>. */ static int i386_sol2_gregset_reg_offset[] = @@ -45,12 +49,18 @@ static int i386_sol2_gregset_reg_offset[] = 0 * 4 /* %gs */ }; +/* Return whether the frame preceding NEXT_FRAME corresponds to a + Solaris sigtramp routine. */ + static int -i386_sol2_pc_in_sigtramp (CORE_ADDR pc, char *name) +i386_sol2_sigtramp_p (struct frame_info *next_frame) { - /* Signal handler frames under Solaris 2 are recognized by a return - address of 0xffffffff. */ - return (pc == 0xffffffff); + CORE_ADDR pc = frame_pc_unwind (next_frame); + char *name; + + find_pc_partial_function (pc, &name, NULL, NULL); + return (name && (strcmp ("sigacthandler", name) == 0 + || strcmp (name, "ucbsigvechandler") == 0)); } /* Solaris doesn't have a `struct sigcontext', but it does have a @@ -85,12 +95,14 @@ i386_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) tdep->sizeof_gregset = 19 * 4; tdep->sizeof_fpregset = 380; + /* Signal trampolines are slightly different from SVR4. */ + tdep->sigtramp_p = i386_sol2_sigtramp_p; tdep->sigcontext_addr = i386_sol2_mcontext_addr; tdep->sc_reg_offset = tdep->gregset_reg_offset; tdep->sc_num_regs = tdep->gregset_num_regs; - /* Signal trampolines are slightly different from SVR4. */ - set_gdbarch_deprecated_pc_in_sigtramp (gdbarch, i386_sol2_pc_in_sigtramp); + set_solib_svr4_fetch_link_map_offsets + (gdbarch, svr4_ilp32_fetch_link_map_offsets); } |