[src/trunk]: src/external/gpl3/gcc/dist/libsanitizer/sanitizer_common fix com...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/49e2c79df9cf
branches:  trunk
changeset: 816005:49e2c79df9cf
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jun 11 20:45:07 2016 +0000

description:
fix compilation and getdents.

diffstat:

 external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (23 lines):

diff -r b7e2f2ecac12 -r 49e2c79df9cf external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc
--- a/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc   Sat Jun 11 19:11:20 2016 +0000
+++ b/external/gpl3/gcc/dist/libsanitizer/sanitizer_common/sanitizer_linux.cc   Sat Jun 11 20:45:07 2016 +0000
@@ -538,7 +538,7 @@
 }
 
 uptr internal_waitpid(int pid, int *status, int options) {
-+#if SANITIZER_NETBSD
+#if SANITIZER_NETBSD
   return internal_syscall(SYSCALL(wait4), pid, status, options,
                           NULL /* rusage */);
 #else
@@ -556,7 +556,9 @@
 }
 
 uptr internal_getdents(fd_t fd, struct linux_dirent *dirp, unsigned int count) {
-#if SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
+#if SANITIZER_NETBSD
+  return internal_syscall(SYSCALL(getdents), fd, dirp, (uptr)count);
+#elif SANITIZER_USES_CANONICAL_LINUX_SYSCALLS
   return internal_syscall(SYSCALL(getdents64), fd, (uptr)dirp, count);
 #else
   return internal_syscall(SYSCALL(getdents), fd, (uptr)dirp, count);