summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvries <vries@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-11-17 15:26:00 +0000
committervries <vries@7b3dc134-2b1b-0410-93df-9e9f96275f8d>2012-11-17 15:26:00 +0000
commitc1cadd7a47cbc4a77530e6012e44697b75db098d (patch)
tree98c03d4561a5e01f7f3bb49f7075a4995db05bce
parent5134213014448b459864d05ba6f556344c7b079f (diff)
downloadeglibc2-c1cadd7a47cbc4a77530e6012e44697b75db098d.tar.gz
2012-02-20 Paul Pluzhnikov <ppluzhnikov@google.com>
* debug/tst-backtrace5.c (handle_signal): Adjust for VDSO. git-svn-id: svn://svn.eglibc.org/trunk@21758 7b3dc134-2b1b-0410-93df-9e9f96275f8d
-rw-r--r--libc/ChangeLog.eglibc4
-rw-r--r--libc/debug/tst-backtrace5.c13
2 files changed, 13 insertions, 4 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc
index ba3bd5fc0..e1b722cec 100644
--- a/libc/ChangeLog.eglibc
+++ b/libc/ChangeLog.eglibc
@@ -1,3 +1,7 @@
+2012-02-20 Paul Pluzhnikov <ppluzhnikov@google.com>
+
+ * debug/tst-backtrace5.c (handle_signal): Adjust for VDSO.
+
2012-10-25 Joseph Myers <joseph@codesourcery.com>
* aclocal.m4, configure.in, crypt/sha512c-test.c, string/Makefile,
diff --git a/libc/debug/tst-backtrace5.c b/libc/debug/tst-backtrace5.c
index 22c67c4df..c4bb90eb0 100644
--- a/libc/debug/tst-backtrace5.c
+++ b/libc/debug/tst-backtrace5.c
@@ -82,12 +82,17 @@ handle_signal (int signum)
return;
}
/* Do not check name for signal trampoline. */
- if (strstr (symbols[2], "read") == NULL)
+ i = 2;
+ if (strstr (symbols[i++], "read") == NULL)
{
- FAIL ();
- return;
+ /* Perhaps symbols[2] is __kernel_vsyscall? */
+ if (strstr (symbols[i++], "read") == NULL)
+ {
+ FAIL ();
+ return;
+ }
}
- for (i = 3; i < n - 1; i++)
+ for (; i < n - 1; i++)
if (strstr (symbols[i], "fn") == NULL)
{
FAIL ();