compiler-rt-netbsd: Update to SVN r. 326163

[Kamil Rytarowski <n54%gmx.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Feb 27 03:51:47 2018 +0100
Changeset:	68dcdf4f8bac6ba84dc64db453554d2f5b32f907

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
	compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc
	compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc

Log Message:
compiler-rt-netbsd: Update to SVN r. 326163

Patches merged upstream:
r326084 - Skip two more ioctl interceptors for NetBSD
r326161 - Add new interceptors: getttyent(3) family
r326162 - Add new interceptors: getprotoent(3) family
r326163 - Add new interceptors: getnetent(3) family

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=68dcdf4f8bac6ba84dc64db453554d2f5b32f907

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

diffstat:
 compiler-rt-netbsd/Makefile                        |   2 +-
 compiler-rt-netbsd/distinfo                        |  16 +-
 ...zer__common_sanitizer__common__interceptors.inc | 231 +--------------------
 ...b_sanitizer__common_sanitizer__internal__defs.h |   2 +-
 ...patch-lib_sanitizer__common_sanitizer__linux.cc |   2 +-
 ...zer__common_sanitizer__platform__interceptors.h |  11 +-
 ...__common_sanitizer__platform__limits__netbsd.cc |  10 +-
 ...r__common_sanitizer__platform__limits__netbsd.h |  16 +-
 ...sanitizer__common_TestCases_NetBSD_kvm__open.cc |   2 +-
 ...izer__common_TestCases_NetBSD_kvm__openfiles.cc |   2 +-
 10 files changed, 37 insertions(+), 257 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index f794b851d7..70c8d3ce0d 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=		compiler-rt
 SVN_REPO.compiler-rt=		http://llvm.org/svn/llvm-project/compiler-rt/trunk
-SVN_REVISION.compiler-rt=	326050
+SVN_REVISION.compiler-rt=	326163
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://compiler-rt.llvm.org/
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 846d2760cd..192c74e8a8 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -4,16 +4,16 @@ SHA1 (patch-cmake_config-ix.cmake) = 720ede87150ae1ac59d8415c77644d917da9cd16
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 766b817c2ede73ca90d6e25a4b8330ed3d38b84b
 SHA1 (patch-lib_msan_msan__interceptors.cc) = 0aa08e580841d2ff99e01de03ca903e13d5ea497
 SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 478b2b1eefc6fe917fe2de101b994eceb4fbef9b
-SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = c3b35c0a08bd11e440d472848a7a719c975f1259
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = a857a61e665b59d607f1d6e889625df417abc808
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 785aaf50784742ab9a86f0a40cb63fcc6f7cf74d
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 9336ec4a7e075155fe61c9005539f82af8ec46a8
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 12593295cb2fa217b73b571855d6ceb32c39943d
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 3fb4836fb665a272094bbb0a9026b21b293f9a0a
+SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = bd972f5a18ffd76662b161515b31fe4940abbb5a
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = a3213b029fc52e59591dce75dce4bc30da6a4de0
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = c11001b5e4f99d340fea4c661c51a14d4e5c61d6
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 1eac155001d0055c0409676daa716c93da496ab0
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 545d4d335b883db3e5b0e351236f0df95dc59ac3
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc) = c6459f21789a5ef13e37714487c09110062c9c5d
 SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = e520ec1e0fefb3cf9fb1d872ebf81952599a6c49
 SHA1 (patch-lib_scudo_scudo__platform.h) = 119d7ad8f8ca9d3e846dbdd7f805ca771e30e410
 SHA1 (patch-test_lsan_lit.common.cfg) = b09b4ab3a97dc881b701a3583b0b126b8206cfe2
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc) = ac638c721551db152f9c2ca338c43eceea49a16a
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc) = d36b3e07c8af8f4f19e692a6fb0f50d74d81d589
+SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc) = ab092ca89d13e8d65c590c96bde7fd63979eee83
+SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc) = 620a4fadd4447d390db2bff81b1d5758409bbdb5
 SHA1 (patch-test_scudo_lit.cfg) = 35e4f0524a8fd26e90e5d968b73d75f277da3779
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
index 2585c99e37..c2e767257f 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-02-25 10:48:27.591396903 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-02-27 02:50:00.133153771 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -76,6 +76,11 @@
  #define ctime __ctime50
@@ -14,8 +14,8 @@ $NetBSD$
  #define getitimer __getitimer50
  #define getpwent __getpwent50
  #define getpwnam __getpwnam50
-@@ -6851,6 +6856,839 @@ INTERCEPTOR(void, strmode, u32 mode, cha
- #define INIT_STRMODE
+@@ -7025,6 +7030,625 @@ INTERCEPTOR(struct __sanitizer_netent *,
+ #define INIT_NETENT
  #endif
  
 +#if SANITIZER_INTERCEPT_KVM
@@ -473,220 +473,6 @@ $NetBSD$
 +#define INIT_ATOF
 +#endif
 +
-+#if SANITIZER_INTERCEPT_GETTTYENT
-+INTERCEPTOR(struct __sanitizer_ttyent *, getttyent, void) {
-+  void *ctx;
-+  struct __sanitizer_ttyent *ttyent;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getttyent);
-+  ttyent = REAL(getttyent)();
-+  if (ttyent) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ttyent, struct_ttyent_sz);
-+  }
-+  return ttyent;
-+}
-+INTERCEPTOR(struct __sanitizer_ttyent *, getttynam, char *name) {
-+  void *ctx;
-+  struct __sanitizer_ttyent *ttyent;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getttynam, name);
-+  if (name)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, name, REAL(strlen)(name) + 1);
-+  ttyent = REAL(getttynam)(name);
-+  if (ttyent) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ttyent, struct_ttyent_sz);
-+  }
-+  return ttyent;
-+}
-+INTERCEPTOR(int, setttyent) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, setttyent);
-+  return REAL(setttyent)();
-+}
-+INTERCEPTOR(int, setttyentpath, char *path) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, setttyentpath, path);
-+  if (path)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1);
-+  return REAL(setttyentpath)(path);
-+}
-+INTERCEPTOR(int, endttyent) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, endttyent);
-+  return REAL(endttyent)();
-+}
-+#define INIT_GETTTYENT \
-+  COMMON_INTERCEPT_FUNCTION(getttyent); \
-+  COMMON_INTERCEPT_FUNCTION(getttynam); \
-+  COMMON_INTERCEPT_FUNCTION(setttyent); \
-+  COMMON_INTERCEPT_FUNCTION(setttyentpath); \
-+  COMMON_INTERCEPT_FUNCTION(endttyent)
-+#else
-+#define INIT_GETTTYENT
-+#endif
-+
-+#if SANITIZER_INTERCEPT_GETPROTOENT
-+INTERCEPTOR(struct __sanitizer_protoent *, getprotoent) {
-+  void *ctx;
-+  struct __sanitizer_protoent *p;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getprotoent);
-+  p = REAL(getprotoent)();
-+  if (p) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, p, sizeof(*p));
-+
-+    char **pp = p->p_aliases;
-+
-+    while (*pp) {
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, pp, sizeof(char **));
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *pp, REAL(strlen)(*pp) + 1);
-+       pp++;
-+    }
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, pp, sizeof(char **));
-+  }
-+  return p;
-+}
-+
-+INTERCEPTOR(struct __sanitizer_protoent *, getprotobyname, const char *name) {
-+  void *ctx;
-+  struct __sanitizer_protoent *p;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getprotobyname, name);
-+  p = REAL(getprotobyname)(name);
-+  if (p) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, p, sizeof(*p));
-+
-+    char **pp = p->p_aliases;
-+
-+    while (*pp) {
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, pp, sizeof(char **));
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *pp, REAL(strlen)(*pp) + 1);
-+       pp++;
-+    }
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, pp, sizeof(char **));
-+  }
-+  return p;
-+}
-+
-+INTERCEPTOR(struct __sanitizer_protoent *, getprotobynumber, int proto) {
-+  void *ctx;
-+  struct __sanitizer_protoent *p;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getprotobynumber, proto);
-+  p = REAL(getprotobynumber)(proto);
-+  if (p) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, p, sizeof(*p));
-+
-+    char **pp = p->p_aliases;
-+
-+    while (*pp) {
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, pp, sizeof(char **));
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *pp, REAL(strlen)(*pp) + 1);
-+       pp++;
-+    }
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, pp, sizeof(char **));
-+  }
-+  return p;
-+}
-+
-+INTERCEPTOR(void, setprotoent, int stayopen) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, setprotoent, stayopen);
-+  return REAL(setprotoent)(stayopen);
-+}
-+
-+INTERCEPTOR(void, endprotoent) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, endprotoent);
-+  return REAL(endprotoent)();
-+}
-+#define INIT_GETPROTOENT \
-+  COMMON_INTERCEPT_FUNCTION(getprotoent); \
-+  COMMON_INTERCEPT_FUNCTION(getprotobyname); \
-+  COMMON_INTERCEPT_FUNCTION(getprotobynumber); \
-+  COMMON_INTERCEPT_FUNCTION(setprotoent); \
-+  COMMON_INTERCEPT_FUNCTION(endprotoent);
-+#else
-+#define INIT_GETPROTOENT
-+#endif
-+
-+#if SANITIZER_INTERCEPT_GETNETENT
-+INTERCEPTOR(struct __sanitizer_netent *, getnetent) {
-+  void *ctx;
-+  struct __sanitizer_netent *n;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getnetent);
-+  n = REAL(getnetent)();
-+  if (n) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, n, sizeof(*n));
-+
-+    char **nn = n->n_aliases;
-+
-+    while (*nn) {
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, nn, sizeof(char **));
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *nn, REAL(strlen)(*nn) + 1);
-+       nn++;
-+    }
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, nn, sizeof(char **));
-+  }
-+  return n;
-+}
-+
-+INTERCEPTOR(struct __sanitizer_netent *, getnetbyname, const char *name) {
-+  void *ctx;
-+  struct __sanitizer_netent *n;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getnetbyname, name);
-+  n = REAL(getnetbyname)(name);
-+  if (n) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, n, sizeof(*n));
-+
-+    char **nn = n->n_aliases;
-+
-+    while (*nn) {
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, nn, sizeof(char **));
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *nn, REAL(strlen)(*nn) + 1);
-+       nn++;
-+    }
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, nn, sizeof(char **));
-+  }
-+  return n;
-+}
-+
-+INTERCEPTOR(struct __sanitizer_netent *, getnetbyaddr, u32 net, int type) {
-+  void *ctx;
-+  struct __sanitizer_netent *n;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getnetbyaddr, net, type);
-+  n = REAL(getnetbyaddr)(net, type);
-+  if (n) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, n, sizeof(*n));
-+
-+    char **nn = n->n_aliases;
-+
-+    while (*nn) {
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, nn, sizeof(char **));
-+       COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *nn, REAL(strlen)(*nn) + 1);
-+       nn++;
-+    }
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, nn, sizeof(char **));
-+  }
-+  return n;
-+}
-+
-+INTERCEPTOR(void, setnetent, int stayopen) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, setnetent, stayopen);
-+  return REAL(setnetent)(stayopen);
-+}
-+
-+INTERCEPTOR(void, endnetent) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, endnetent);
-+  return REAL(endnetent)();
-+}
-+#define INIT_GETNETENT \
-+  COMMON_INTERCEPT_FUNCTION(getnetent); \
-+  COMMON_INTERCEPT_FUNCTION(getnetbyname); \
-+  COMMON_INTERCEPT_FUNCTION(getnetbyaddr); \
-+  COMMON_INTERCEPT_FUNCTION(setnetent); \
-+  COMMON_INTERCEPT_FUNCTION(endnetent);
-+#else
-+#define INIT_GETNETENT
-+#endif
-+
 +#if SANITIZER_INTERCEPT_FTS
 +INTERCEPTOR(void *, fts_open, char * const *path_argv, int options,
 +            int (*compar)(void **, void **)) {
@@ -854,16 +640,13 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7081,6 +7919,14 @@ static void InitializeCommonInterceptors
-   INIT_DEVNAME_R;
-   INIT_FGETLN;
-   INIT_STRMODE;
+@@ -7258,6 +7882,11 @@ static void InitializeCommonInterceptors
+   INIT_TTYENT;
+   INIT_PROTOENT;
+   INIT_NETENT;
 +  INIT_KVM;
 +  INIT_SYSCTL;
 +  INIT_ATOF;
-+  INIT_GETTTYENT;
-+  INIT_GETPROTOENT;
-+  INIT_GETNETENT;
 +  INIT_FTS;
 +  INIT_REGEX;
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h
index 98c6d4ab97..0246e6f7ed 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_internal_defs.h.orig	2018-02-25 10:48:27.594915438 +0000
+--- lib/sanitizer_common/sanitizer_internal_defs.h.orig	2018-02-25 10:48:27.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_internal_defs.h
 @@ -189,7 +189,9 @@ typedef uptr tid_t;
  // This header should NOT include any other headers to avoid portability issues.
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
index 11937607c0..557e65c337 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_linux.cc.orig	2018-02-25 10:48:27.592535426 +0000
+--- lib/sanitizer_common/sanitizer_linux.cc.orig	2018-02-27 02:50:00.132306283 +0000
 +++ lib/sanitizer_common/sanitizer_linux.cc
 @@ -89,6 +89,7 @@ extern char **environ;  // provided by c
  
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
index 42cd7914fa..ed1c3b549d 100644
--- 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
@@ -1,17 +1,14 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-02-20 18:23:53.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-02-27 02:50:00.133595047 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -462,4 +462,13 @@
- #define SANITIZER_INTERCEPT_FGETLN SI_NETBSD
- #define SANITIZER_INTERCEPT_STRMODE SI_NETBSD
+@@ -465,4 +465,10 @@
+ #define SANITIZER_INTERCEPT_PROTOENT SI_NETBSD
+ #define SANITIZER_INTERCEPT_NETENT SI_NETBSD
  
 +#define SANITIZER_INTERCEPT_KVM SI_NETBSD
 +#define SANITIZER_INTERCEPT_SYSCTL SI_NETBSD
 +#define SANITIZER_INTERCEPT_ATOF SI_NETBSD
-+#define SANITIZER_INTERCEPT_GETTTYENT SI_NETBSD
-+#define SANITIZER_INTERCEPT_GETPROTOENT SI_NETBSD
-+#define SANITIZER_INTERCEPT_GETNETENT SI_NETBSD
 +#define SANITIZER_INTERCEPT_FTS SI_NETBSD
 +#define SANITIZER_INTERCEPT_REGEX SI_NETBSD
 +
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
index 77ff2a8f98..b11a174cb7 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-02-15 04:24:49.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-02-27 02:50:00.131312840 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
 @@ -15,9 +15,15 @@
  #include "sanitizer_platform.h"
@@ -26,7 +26,7 @@ $NetBSD$
  #include <dev/biovar.h>
  #include <dev/bluetooth/btdev.h>
  #include <dev/bluetooth/btsco.h>
-@@ -203,6 +208,10 @@
+@@ -204,6 +209,10 @@
  #include <utmpx.h>
  #include <wchar.h>
  #include <wordexp.h>
@@ -37,7 +37,7 @@ $NetBSD$
  
  // Include these after system headers to avoid name clashes and ambiguities.
  #include "sanitizer_internal_defs.h"
-@@ -237,6 +246,10 @@ unsigned struct_rlimit_sz = sizeof(struc
+@@ -238,6 +247,10 @@ unsigned struct_rlimit_sz = sizeof(struc
  unsigned struct_timespec_sz = sizeof(struct timespec);
  unsigned struct_sembuf_sz = sizeof(struct sembuf);
  unsigned struct_kevent_sz = sizeof(struct kevent);
@@ -48,9 +48,9 @@ $NetBSD$
  unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
  unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
  unsigned struct_timex_sz = sizeof(struct timex);
-@@ -338,6 +351,11 @@ int glob_altdirfunc = GLOB_ALTDIRFUNC;
+@@ -341,6 +354,11 @@ unsigned path_max = PATH_MAX;
  
- unsigned path_max = PATH_MAX;
+ int struct_ttyent_sz = sizeof(struct ttyent);
  
 +int struct_kinfo_proc_sz = sizeof(struct kinfo_proc);
 +int struct_kinfo_proc2_sz = sizeof(struct kinfo_proc2);
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
index 684592ee0c..610517ca93 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-02-15 04:24:49.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-02-27 02:50:00.133905896 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
 @@ -60,6 +60,15 @@ extern unsigned struct_timespec_sz;
  extern unsigned struct_sembuf_sz;
@@ -18,8 +18,8 @@ $NetBSD$
  
  union __sanitizer_sigval {
    int sival_int;
-@@ -113,6 +122,19 @@ struct __sanitizer_shmid_ds {
-   void *_shm_internal;
+@@ -126,6 +135,19 @@ struct __sanitizer_netent {
+   u32 n_net;
  };
  
 +struct __sanitizer_protoent {
@@ -38,9 +38,9 @@ $NetBSD$
  extern unsigned struct_msqid_ds_sz;
  extern unsigned struct_mq_attr_sz;
  extern unsigned struct_timex_sz;
-@@ -362,6 +384,11 @@ extern int glob_altdirfunc;
+@@ -377,6 +399,11 @@ extern unsigned path_max;
  
- extern unsigned path_max;
+ extern int struct_ttyent_sz;
  
 +extern int struct_kinfo_proc_sz;
 +extern int struct_kinfo_proc2_sz;
@@ -50,7 +50,7 @@ $NetBSD$
  extern int ptrace_pt_io;
  extern int ptrace_pt_lwpinfo;
  extern int ptrace_pt_set_event_mask;
-@@ -383,6 +410,7 @@ extern int ptrace_pt_getfpregs;
+@@ -398,6 +425,7 @@ extern int ptrace_pt_getfpregs;
  extern int ptrace_pt_setdbregs;
  extern int ptrace_pt_getdbregs;
  
@@ -58,8 +58,8 @@ $NetBSD$
  struct __sanitizer_ptrace_io_desc {
    int piod_op;
    void *piod_offs;
-@@ -437,6 +465,53 @@ struct __sanitizer_ifconf {
-   } ifc_ifcu;
+@@ -462,6 +490,53 @@ struct __sanitizer_ttyent {
+   char *ty_class;
  };
  
 +
diff --git a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc
index a606cbfca6..b3b37c9b61 100644
--- a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc
+++ b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/sanitizer_common/TestCases/NetBSD/kvm_open.cc.orig	2018-02-25 10:48:36.913002888 +0000
+--- test/sanitizer_common/TestCases/NetBSD/kvm_open.cc.orig	2018-02-27 02:50:26.786042835 +0000
 +++ test/sanitizer_common/TestCases/NetBSD/kvm_open.cc
 @@ -0,0 +1,13 @@
 +// RUN: %clangxx -O0 -g %s -o %t && %run %t
diff --git a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc
index 36f7fda732..32aa7d92ba 100644
--- a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc
+++ b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/sanitizer_common/TestCases/NetBSD/kvm_openfiles.cc.orig	2018-02-25 10:48:36.913081032 +0000
+--- test/sanitizer_common/TestCases/NetBSD/kvm_openfiles.cc.orig	2018-02-27 02:50:26.786123098 +0000
 +++ test/sanitizer_common/TestCases/NetBSD/kvm_openfiles.cc
 @@ -0,0 +1,13 @@
 +// RUN: %clangxx -O0 -g %s -o %t && %run %t