Committed.

Richard.

Index: libsanitizer/ChangeLog
===================================================================
--- libsanitizer/ChangeLog      (revision 211449)
+++ libsanitizer/ChangeLog      (working copy)
@@ -1,3 +1,7 @@
+2014-06-11  Richard Biener  <rguent...@suse.de>
+
+       * asan/asan_linux.cc: Cherry pick upstream r210012.
+
 2014-05-30  Jakub Jelinek  <ja...@redhat.com>
 
        * sanitizer_common/sanitizer_stacktrace.cc: Cherry pick upstream
Index: libsanitizer/asan/asan_linux.cc
===================================================================
--- libsanitizer/asan/asan_linux.cc     (revision 211449)
+++ libsanitizer/asan/asan_linux.cc     (working copy)
@@ -89,6 +89,10 @@ static int FindFirstDSOCallback(struct d
   if (!info->dlpi_name || info->dlpi_name[0] == 0)
     return 0;
 
+  // Ignore vDSO
+  if (internal_strncmp(info->dlpi_name, "linux-", sizeof("linux-") - 1) == 0)
+    return 0;
+
   *(const char **)data = info->dlpi_name;
   return 1;
 }

Reply via email to