compiler-rt-netbsd: Include interceptors.h patch

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Include interceptors.h patch
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Mon, 26 Jun 2017 17:36:47 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Jun 26 19:36:47 2017 +0200
Changeset:	ec5796eb5b878435223fb804ccbf8916ac3a7a58

Added Files:
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h

Log Message:
compiler-rt-netbsd: Include interceptors.h patch

Sponsored by <The NetBSD Foundation>

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ec5796eb5b878435223fb804ccbf8916ac3a7a58

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ...zer__common_sanitizer__platform__interceptors.h | 241 +++++++++++++++++++++
 1 file changed, 241 insertions(+)

diffs:
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
new file mode 100644
index 0000000000..d47e671fde
--- /dev/null
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
@@ -0,0 +1,241 @@
+$NetBSD$
+
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2017-06-12 15:01:29.000000000 +0000
++++ lib/sanitizer_common/sanitizer_platform_interceptors.h
+@@ -49,6 +49,12 @@
+ # define SI_FREEBSD 0
+ #endif
+ 
++#if SANITIZER_NETBSD
++# define SI_NETBSD 1
++#else
++# define SI_NETBSD 0
++#endif
++
+ #if SANITIZER_LINUX
+ # define SI_LINUX 1
+ #else
+@@ -111,7 +117,7 @@
+ #define SANITIZER_INTERCEPT_MEMMEM \
+   SI_NOT_WINDOWS && !SI_MAC_DEPLOYMENT_BELOW_10_7
+ #define SANITIZER_INTERCEPT_MEMCHR 1
+-#define SANITIZER_INTERCEPT_MEMRCHR SI_FREEBSD || SI_LINUX
++#define SANITIZER_INTERCEPT_MEMRCHR SI_FREEBSD || SI_LINUX || SI_NETBSD
+ 
+ #define SANITIZER_INTERCEPT_READ   SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_PREAD  SI_NOT_WINDOWS
+@@ -127,7 +133,7 @@
+ #define SANITIZER_INTERCEPT_READV SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_WRITEV SI_NOT_WINDOWS
+ 
+-#define SANITIZER_INTERCEPT_PREADV SI_FREEBSD || SI_LINUX_NOT_ANDROID
++#define SANITIZER_INTERCEPT_PREADV SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PWRITEV SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PREADV64 SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PWRITEV64 SI_LINUX_NOT_ANDROID
+@@ -142,7 +148,7 @@
+ 
+ #ifndef SANITIZER_INTERCEPT_PRINTF
+ # define SANITIZER_INTERCEPT_PRINTF SI_NOT_WINDOWS
+-# define SANITIZER_INTERCEPT_PRINTF_L SI_FREEBSD
++# define SANITIZER_INTERCEPT_PRINTF_L SI_FREEBSD || SI_NETBSD
+ # define SANITIZER_INTERCEPT_ISOC99_PRINTF SI_LINUX_NOT_ANDROID
+ #endif
+ 
+@@ -151,13 +157,13 @@
+ 
+ #define SANITIZER_INTERCEPT_GETPWNAM_AND_FRIENDS SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_GETPWNAM_R_AND_FRIENDS \
+-  SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_GETPWENT \
+-  SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_FGETPWENT SI_LINUX_NOT_ANDROID
+-#define SANITIZER_INTERCEPT_GETPWENT_R SI_FREEBSD || SI_LINUX_NOT_ANDROID
++#define SANITIZER_INTERCEPT_GETPWENT_R SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SETPWENT SI_MAC || SI_LINUX_NOT_ANDROID
+-#define SANITIZER_INTERCEPT_CLOCK_GETTIME SI_FREEBSD || SI_LINUX
++#define SANITIZER_INTERCEPT_CLOCK_GETTIME SI_FREEBSD || SI_NETBSD || SI_LINUX
+ #define SANITIZER_INTERCEPT_GETITIMER SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_TIME SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_GLOB SI_LINUX_NOT_ANDROID
+@@ -200,41 +206,41 @@
+ #define SANITIZER_INTERCEPT_MBSNRTOWCS SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_WCSTOMBS SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_WCSNRTOMBS \
+-  SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_WCRTOMB \
+-  SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_TCGETATTR SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_REALPATH SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_CANONICALIZE_FILE_NAME SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_CONFSTR \
+-  SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SCHED_GETAFFINITY SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SCHED_GETPARAM SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_STRERROR SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_STRERROR_R SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_XPG_STRERROR_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SCANDIR \
+-  SI_FREEBSD || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SCANDIR64 SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_GETGROUPS SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_POLL SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_PPOLL SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_WORDEXP \
+-  SI_FREEBSD || (SI_MAC && !SI_IOS) || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || (SI_MAC && !SI_IOS) || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SIGWAIT SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_SIGWAITINFO SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SIGTIMEDWAIT SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SIGSETOPS \
+-  SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SIGPENDING SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_SIGPROCMASK SI_NOT_WINDOWS
+-#define SANITIZER_INTERCEPT_BACKTRACE SI_FREEBSD || SI_LINUX_NOT_ANDROID
++#define SANITIZER_INTERCEPT_BACKTRACE SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_GETMNTENT SI_LINUX
+ #define SANITIZER_INTERCEPT_GETMNTENT_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_STATFS SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_STATFS64 \
+   (SI_MAC && !SI_IOS) || SI_LINUX_NOT_ANDROID
+-#define SANITIZER_INTERCEPT_STATVFS SI_FREEBSD || SI_LINUX_NOT_ANDROID
++#define SANITIZER_INTERCEPT_STATVFS SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_STATVFS64 SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_INITGROUPS SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_ETHER_NTOA_ATON SI_NOT_WINDOWS
+@@ -242,18 +248,18 @@
+   SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_ETHER_R SI_FREEBSD || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_SHMCTL \
+-  ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && SANITIZER_WORDSIZE == 64)
++  SI_NETBSD || ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && SANITIZER_WORDSIZE == 64)
+ #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GETINHERITSCHED \
+-  SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GETAFFINITY_NP SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETPSHARED SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETTYPE SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETPROTOCOL \
+-  SI_MAC || SI_LINUX_NOT_ANDROID
++  SI_MAC || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETPRIOCEILING \
+-  SI_MAC || SI_LINUX_NOT_ANDROID
++  SI_MAC || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETROBUST SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_MUTEXATTR_GETROBUST_NP SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_PTHREAD_RWLOCKATTR_GETPSHARED SI_NOT_WINDOWS
+@@ -272,29 +278,29 @@
+ #define SANITIZER_INTERCEPT_LGAMMAL_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_DRAND48_R SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_RAND_R \
+-  SI_FREEBSD || SI_MAC || SI_LINUX_NOT_ANDROID
+-#define SANITIZER_INTERCEPT_ICONV SI_FREEBSD || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_MAC || SI_LINUX_NOT_ANDROID
++#define SANITIZER_INTERCEPT_ICONV SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_TIMES SI_NOT_WINDOWS
+ 
+ // FIXME: getline seems to be available on OSX 10.7
+-#define SANITIZER_INTERCEPT_GETLINE SI_FREEBSD || SI_LINUX_NOT_ANDROID
++#define SANITIZER_INTERCEPT_GETLINE SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ 
+-#define SANITIZER_INTERCEPT__EXIT SI_LINUX || SI_FREEBSD || SI_MAC
++#define SANITIZER_INTERCEPT__EXIT SI_LINUX || SI_FREEBSD || SI_NETBSD || SI_MAC
+ 
+ #define SANITIZER_INTERCEPT_PHTREAD_MUTEX SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_PTHREAD_SETNAME_NP \
+-  SI_FREEBSD || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ 
+ #define SANITIZER_INTERCEPT_TLS_GET_ADDR \
+-  SI_FREEBSD || SI_LINUX_NOT_ANDROID
++  SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID
+ 
+ #define SANITIZER_INTERCEPT_LISTXATTR SI_LINUX
+ #define SANITIZER_INTERCEPT_GETXATTR SI_LINUX
+ #define SANITIZER_INTERCEPT_GETRESID SI_LINUX
+ #define SANITIZER_INTERCEPT_GETIFADDRS \
+-  SI_FREEBSD || SI_LINUX_NOT_ANDROID || SI_MAC
++  SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID || SI_MAC
+ #define SANITIZER_INTERCEPT_IF_INDEXTONAME \
+-  SI_FREEBSD || SI_LINUX_NOT_ANDROID || SI_MAC
++  SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID || SI_MAC
+ #define SANITIZER_INTERCEPT_CAPGET SI_LINUX_NOT_ANDROID
+ #if SI_LINUX && defined(__arm__)
+ #define SANITIZER_INTERCEPT_AEABI_MEM 1
+@@ -302,32 +308,32 @@
+ #define SANITIZER_INTERCEPT_AEABI_MEM 0
+ #endif
+ #define SANITIZER_INTERCEPT___BZERO SI_MAC
+-#define SANITIZER_INTERCEPT_FTIME !SI_FREEBSD && SI_NOT_WINDOWS
++#define SANITIZER_INTERCEPT_FTIME !SI_FREEBSD && !SI_NETBSD && SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_XDR SI_LINUX_NOT_ANDROID
+-#define SANITIZER_INTERCEPT_TSEARCH SI_LINUX_NOT_ANDROID || SI_MAC
++#define SANITIZER_INTERCEPT_TSEARCH SI_LINUX_NOT_ANDROID || SI_MAC || SI_NETBSD
+ #define SANITIZER_INTERCEPT_LIBIO_INTERNALS SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_FOPEN SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_FOPEN64 SI_LINUX_NOT_ANDROID
+-#define SANITIZER_INTERCEPT_OPEN_MEMSTREAM SI_LINUX_NOT_ANDROID
++#define SANITIZER_INTERCEPT_OPEN_MEMSTREAM SI_LINUX_NOT_ANDROID || SI_NETBSD
+ #define SANITIZER_INTERCEPT_OBSTACK SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT_FFLUSH SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_FCLOSE SI_NOT_WINDOWS
+ 
+ #ifndef SANITIZER_INTERCEPT_DLOPEN_DLCLOSE
+ #define SANITIZER_INTERCEPT_DLOPEN_DLCLOSE \
+-    SI_FREEBSD || SI_LINUX_NOT_ANDROID || SI_MAC
++    SI_FREEBSD || SI_NETBSD || SI_LINUX_NOT_ANDROID || SI_MAC
+ #endif
+ 
+-#define SANITIZER_INTERCEPT_GETPASS SI_LINUX_NOT_ANDROID || SI_MAC
++#define SANITIZER_INTERCEPT_GETPASS SI_LINUX_NOT_ANDROID || SI_MAC || SI_NETBSD
+ #define SANITIZER_INTERCEPT_TIMERFD SI_LINUX_NOT_ANDROID
+ 
+ #define SANITIZER_INTERCEPT_MLOCKX SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_FOPENCOOKIE SI_LINUX_NOT_ANDROID
+-#define SANITIZER_INTERCEPT_SEM SI_LINUX || SI_FREEBSD
++#define SANITIZER_INTERCEPT_SEM SI_LINUX || SI_FREEBSD || SI_NETBSD
+ #define SANITIZER_INTERCEPT_PTHREAD_SETCANCEL SI_NOT_WINDOWS
+-#define SANITIZER_INTERCEPT_MINCORE SI_LINUX
++#define SANITIZER_INTERCEPT_MINCORE SI_LINUX || SI_NETBSD
+ #define SANITIZER_INTERCEPT_PROCESS_VM_READV SI_LINUX
+-#define SANITIZER_INTERCEPT_CTERMID SI_LINUX || SI_MAC || SI_FREEBSD
++#define SANITIZER_INTERCEPT_CTERMID SI_LINUX || SI_MAC || SI_FREEBSD || SI_NETBSD
+ #define SANITIZER_INTERCEPT_CTERMID_R SI_MAC || SI_FREEBSD
+ 
+ #define SANITIZER_INTERCEPTOR_HOOKS SI_LINUX || SI_MAC || SI_WINDOWS
+@@ -335,7 +341,7 @@
+ #define SANITIZER_INTERCEPT_SEND_SENDTO SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT_EVENTFD_READ_WRITE SI_LINUX
+ 
+-#define SANITIZER_INTERCEPT_STAT (SI_FREEBSD || SI_MAC || SI_ANDROID)
++#define SANITIZER_INTERCEPT_STAT (SI_FREEBSD || SI_MAC || SI_ANDROID || SI_NETBSD)
+ #define SANITIZER_INTERCEPT___XSTAT !SANITIZER_INTERCEPT_STAT && SI_NOT_WINDOWS
+ #define SANITIZER_INTERCEPT___XSTAT64 SI_LINUX_NOT_ANDROID
+ #define SANITIZER_INTERCEPT___LXSTAT SANITIZER_INTERCEPT___XSTAT
+@@ -345,12 +351,12 @@
+ #define SANITIZER_INTERCEPT_UTMPX SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD
+ 
+ #define SANITIZER_INTERCEPT_GETLOADAVG \
+-  SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD
++  SI_LINUX_NOT_ANDROID || SI_MAC || SI_FREEBSD || SI_NETBSD
+ 
+-#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO (!SI_FREEBSD && !SI_MAC)
+-#define SANITIZER_INTERCEPT_MEMALIGN (!SI_FREEBSD && !SI_MAC)
+-#define SANITIZER_INTERCEPT_PVALLOC (!SI_FREEBSD && !SI_MAC)
+-#define SANITIZER_INTERCEPT_CFREE (!SI_FREEBSD && !SI_MAC)
++#define SANITIZER_INTERCEPT_MALLOPT_AND_MALLINFO (!SI_FREEBSD && !SI_MAC && !SI_NETBSD)
++#define SANITIZER_INTERCEPT_MEMALIGN (!SI_FREEBSD && !SI_MAC && !SI_NETBSD)
++#define SANITIZER_INTERCEPT_PVALLOC (!SI_FREEBSD && !SI_MAC && !SI_NETBSD)
++#define SANITIZER_INTERCEPT_CFREE (!SI_FREEBSD && !SI_MAC && !SI_NETBSD)
+ #define SANITIZER_INTERCEPT_ALIGNED_ALLOC (!SI_MAC)
+ #define SANITIZER_INTERCEPT_MALLOC_USABLE_SIZE (!SI_MAC)
+ #define SANITIZER_INTERCEPT_MCHECK_MPROBE SI_LINUX_NOT_ANDROID
Prev by Date: compiler-rt-netbsd: Add NetBSD support in interceptors.h
Next by Date: compiler-rt-netbsd: Add NetBSD support in sanitizer_unwind_linux_libcdep.cc
Previous by Thread: compiler-rt-netbsd: Add NetBSD support in interceptors.h
Next by Thread: compiler-rt-netbsd: Add NetBSD support in sanitizer_unwind_linux_libcdep.cc
Indexes:
Home | Main Index | Thread Index | Old Index