2005-11-07 Andrew Stubbs <andrew.stubbs@st.com>

[deliverable/binutils-gdb.git] / gdb / i386-sol2-tdep.c

diff --git a/gdb/i386-sol2-tdep.c b/gdb/i386-sol2-tdep.c
index e261d56c3bd91035935c9981a93774f9c643f00b..46a7a7c6cafae4b0fbcc2a4632d4d2828c0528c6 100644 (file)
--- a/gdb/i386-sol2-tdep.c
+++ b/gdb/i386-sol2-tdep.c
@@ -23,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[] =
@@ -46,14 +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_sigtramp_p (struct frame_info *next_frame)
 {
   CORE_ADDR pc = frame_pc_unwind (next_frame);
+  char *name;
 
-  /* Signal handler frames under Solaris 2 are recognized by a return
-     address of 0xffffffff.  */
-  return (pc == 0xffffffff);
+  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
@@ -93,6 +100,9 @@ i386_sol2_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   tdep->sigcontext_addr = i386_sol2_mcontext_addr;
   tdep->sc_reg_offset = tdep->gregset_reg_offset;
   tdep->sc_num_regs = tdep->gregset_num_regs;
+
+  set_solib_svr4_fetch_link_map_offsets
+    (gdbarch, svr4_ilp32_fetch_link_map_offsets);
 }
 \f