Module Name: src
Committed By: christos
Date: Wed Jun 1 00:53:35 UTC 2016
Modified Files:
src/external/gpl3/gcc/dist/libsanitizer/asan: asan_linux.cc
Log Message:
Ignore the first dlpi entry which is ourselves on NetBSD instead of having
a NULL name as on linux.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc
diff -u src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.8 src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.9
--- src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc:1.8 Tue May 31 16:47:25 2016
+++ src/external/gpl3/gcc/dist/libsanitizer/asan/asan_linux.cc Tue May 31 20:53:35 2016
@@ -95,6 +95,15 @@ static int FindFirstDSOCallback(struct d
if (internal_strncmp(info->dlpi_name, "linux-", sizeof("linux-") - 1) == 0)
return 0;
+#if SANITIZER_NETBSD
+ // Ignore first entry (the main program)
+ char **p = (char **)data;
+ if (*p == NULL) {
+ *p = (char *)-1;
+ return 0;
+ }
+#endif
+
*(const char **)data = info->dlpi_name;
return 1;
}
