[Commits] r21758 - in /trunk/libc: ChangeLog.eglibc debug/tst-backtrace5.c

[vries@xxxxxxxxxx]

Author: vries
Date: Sat Nov 17 15:26:00 2012
New Revision: 21758

Log:
2012-02-20  Paul Pluzhnikov  <ppluzhnikov@xxxxxxxxxx>

	* debug/tst-backtrace5.c (handle_signal): Adjust for VDSO.

Modified:
    trunk/libc/ChangeLog.eglibc
    trunk/libc/debug/tst-backtrace5.c

Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Sat Nov 17 15:26:00 2012
@@ -1,3 +1,7 @@
+2012-02-20  Paul Pluzhnikov  <ppluzhnikov@xxxxxxxxxx>
+
+	* debug/tst-backtrace5.c (handle_signal): Adjust for VDSO.
+
 2012-10-25  Joseph Myers  <joseph@xxxxxxxxxxxxxxxx>
 
 	* aclocal.m4, configure.in, crypt/sha512c-test.c, string/Makefile,

Modified: trunk/libc/debug/tst-backtrace5.c
==============================================================================
--- trunk/libc/debug/tst-backtrace5.c (original)
+++ trunk/libc/debug/tst-backtrace5.c Sat Nov 17 15:26:00 2012
@@ -82,12 +82,17 @@
       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 ();

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits