* i386-linux-tdep.c (i386_linux_pc_in_sigtramp): Check for

	trampolines in sigaction.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f6549b1614764fce4cd62913db318316ce993c71..b2c750b271a321f22215e286e21bf5de3ad6aef0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-31  Daniel Jacobowitz  <drow@mvista.com>
+
+       * i386-linux-tdep.c (i386_linux_pc_in_sigtramp): Check for
+       trampolines in sigaction.
+
 2002-10-31  Andrew Cagney  <cagney@redhat.com>
 
        * h8300-tdep.c: Include "gdb_assert.h".

diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c
index a833fb598380bede3953419113aa16cc1027a513..0d6ab40747a15c0827a5b8ea8f26b7dd3ae22010 100644 (file)
--- a/gdb/i386-linux-tdep.c
+++ b/gdb/i386-linux-tdep.c
@@ -209,11 +209,17 @@ i386_linux_rt_sigtramp_start (CORE_ADDR pc)
 static int
 i386_linux_pc_in_sigtramp (CORE_ADDR pc, char *name)
 {
-  if (name)
-    return STREQ ("__restore", name) || STREQ ("__restore_rt", name);
-  
-  return (i386_linux_sigtramp_start (pc) != 0
-         || i386_linux_rt_sigtramp_start (pc) != 0);
+  /* If we have NAME, we can optimize the search.  The trampolines are
+     named __restore and __restore_rt.  However, they aren't dynamically
+     exported from the shared C library, so the trampoline may appear to
+     be part of the preceding function.  This should always be sigaction,
+     __sigaction, or __libc_sigaction (all aliases to the same function).  */
+  if (name == NULL || strstr (name, "sigaction") != NULL)
+    return (i386_linux_sigtramp_start (pc) != 0
+           || i386_linux_rt_sigtramp_start (pc) != 0);
+
+  return (strcmp ("__restore", name) == 0
+         || strcmp ("__restore_rt", name) == 0);
 }
 
 /* Assuming FRAME is for a GNU/Linux sigtramp routine, return the