--- tools/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc.orig	2016-10-25 14:42:06 UTC
+++ tools/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
@@ -11,13 +11,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if SANITIZER_FREEBSD || SANITIZER_MAC
+#if SANITIZER_FREEBSD || SANITIZER_BSDSUNIX || SANITIZER_MAC
 # define SYSCALL(name) SYS_ ## name
 #else
 # define SYSCALL(name) __NR_ ## name
 #endif
 
-#if (SANITIZER_FREEBSD || SANITIZER_MAC) && defined(__x86_64__)
+#if (SANITIZER_FREEBSD || SANITIZER_BSDSUNIX || SANITIZER_MAC) && defined(__x86_64__)
 # define internal_syscall __syscall
 # else
 # define internal_syscall syscall