From: Daniel Jacobowitz Date: Thu, 31 Oct 2002 20:51:15 +0000 (+0000) Subject: * i386-linux-tdep.c (i386_linux_pc_in_sigtramp): Check for X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ef17e74bbb466e082c83057cf51ed068cb292339;p=binutils-gdb.git * i386-linux-tdep.c (i386_linux_pc_in_sigtramp): Check for trampolines in sigaction. --- diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f6549b16147..b2c750b271a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2002-10-31 Daniel Jacobowitz + + * i386-linux-tdep.c (i386_linux_pc_in_sigtramp): Check for + trampolines in sigaction. + 2002-10-31 Andrew Cagney * h8300-tdep.c: Include "gdb_assert.h". diff --git a/gdb/i386-linux-tdep.c b/gdb/i386-linux-tdep.c index a833fb59838..0d6ab40747a 100644 --- 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