compiler-rt-netbsd: Sync with local patches

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Sync with local patches
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Wed, 24 Jan 2018 15:03:08 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Jan 24 16:03:08 2018 +0100
Changeset:	6855980acb04af63d58e3241c74cf946c1e746f4

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-include_sanitizer_netbsd__syscall__hooks.h
	compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__interceptors__ioctl.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__syscalls.inc
	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
	compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_paccept.cc
	compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcat.cc
	compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcpy.cc
	compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk
	compiler-rt-netbsd/patches/patch-utils_generate__netbsd__syscalls.awk

Log Message:
compiler-rt-netbsd: Sync with local patches

Support regex(3) functions from libc.

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=6855980acb04af63d58e3241c74cf946c1e746f4

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

diffstat:
 compiler-rt-netbsd/distinfo                        |  30 +++---
 ...atch-include_sanitizer_netbsd__syscall__hooks.h |   2 +-
 .../patches/patch-lib_fuzzer_tests_CMakeLists.txt  |   2 +-
 ...zer__common_sanitizer__common__interceptors.inc | 102 ++++++++++++++++++++-
 ...mmon_sanitizer__netbsd__interceptors__ioctl.inc |   2 +-
 ...nitizer__common_sanitizer__netbsd__syscalls.inc |   2 +-
 ...zer__common_sanitizer__platform__interceptors.h |   5 +-
 ...__common_sanitizer__platform__limits__netbsd.cc |   9 +-
 ...r__common_sanitizer__platform__limits__netbsd.h |  25 +++--
 ...sanitizer__common_TestCases_NetBSD_kvm__open.cc |   2 +-
 ...izer__common_TestCases_NetBSD_kvm__openfiles.cc |   2 +-
 ...t_sanitizer__common_TestCases_NetBSD_paccept.cc |   2 +-
 ...t_sanitizer__common_TestCases_NetBSD_strlcat.cc |   2 +-
 ...t_sanitizer__common_TestCases_NetBSD_strlcpy.cc |   2 +-
 .../patch-utils_generate__netbsd__ioctls.awk       |   2 +-
 .../patch-utils_generate__netbsd__syscalls.awk     |   2 +-
 16 files changed, 149 insertions(+), 44 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index bf403769de..328a7176cc 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -2,33 +2,33 @@ $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
 SHA1 (patch-cmake_config-ix.cmake) = 11195c8254c84d5972a2ffee8a9e66758ab7105b
 SHA1 (patch-include_CMakeLists.txt) = b6f2713b7e5337aed542442936b6f747efe0a607
-SHA1 (patch-include_sanitizer_netbsd__syscall__hooks.h) = b22b03a6207858a65438be7b7617042b1289077b
+SHA1 (patch-include_sanitizer_netbsd__syscall__hooks.h) = 0ab2649ff30a6b59f09508d32c577beec85e27db
 SHA1 (patch-lib_asan_asan__interceptors.cc) = ea4005ce02775060ff52af76d568c450892067b5
 SHA1 (patch-lib_esan_esan__interceptors.cpp) = a7103ca053e92a810c87c593262bb386f3d02606
-SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 73acb0eb6ed83eb12cd509cfc116daf5de459148
+SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 1f3f096aa7768f24223c6c3c884eb624f52be738
 SHA1 (patch-lib_hwasan_hwasan__interceptors.cc) = c49ab3759728bbd3e27580a3d0d3e2db0bceb2a6
 SHA1 (patch-lib_msan_msan__interceptors.cc) = aacd9da9f5fc62e0f7cfe9ad9bcf90ceeb267630
 SHA1 (patch-lib_msan_msan__linux.cc) = d75d7587071a9e7a3f6a08a3008af55319e62cab
 SHA1 (patch-lib_sanitizer__common_CMakeLists.txt) = fcbf2987ccab5258fe760aef6ef47bd97e0e0b2c
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 9aef8e1457405c578a8fff21654a7c0806c6837e
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 4cb99369e9358c4d0a0c32e5425cd4b5e4a61334
 SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors__ioctl.inc) = 231f519a0564aa69d746a7f0bbee1b1aeed927a7
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 2ff74de8be0825ca4162969cb2ed367654934a17
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = b1057f01ae2f03498613eb1a02501c8a65d16fed
-SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd__interceptors__ioctl.inc) = ff6b3ff35179f3bb5378514a1abb05ae306c8cfd
-SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd__syscalls.inc) = acbe1641da20c8d6a271c1b2c99f4f85088c7d00
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 2fe514caca2bedd8cbc25d24474ce735e6073855
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 52a72419e20323a28e0c5768e114c5d6646c8006
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 4bcd536820608413316034c292d651e38d834ddc
+SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd__interceptors__ioctl.inc) = c4b3e466ed28ec13a121833b953e5f950cfc1af8
+SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd__syscalls.inc) = 64a8bfbdd99ecd9d3882e3b0486e05b37e12da63
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = b3c08becdfe284fd598991103eb10b88d20b3481
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = c8c96414670ca41c1fe191dd49921eb0b9c0fc15
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 270ab357a4e8379540a9dbe890c10fe0901e2aaf
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc) = 7e0deaeeada33bd13575251e5d8fb4a0ee4c53e8
 SHA1 (patch-lib_scudo_scudo__platform.h) = d44bd094136dd0381db87344fbbcad1dcfd44dc1
 SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = 4fbaa64e3f8d28cdbab6783c296dfd31cecb45a5
 SHA1 (patch-test_asan_lit.cfg) = becbc3c8c9cfd589e1dcbf1014dd4655f952c144
 SHA1 (patch-test_lsan_lit.common.cfg) = 10dc251f80efb96d015a22c740dc20b1843b9a11
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc) = f3cd911348d1269476b8fdbb8bb9c5109b02e409
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc) = ab8e66d7210166c5f9087d003c210888b61a27eb
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_paccept.cc) = d76eb671c64242ba8f6a2dce17891272e27becb1
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_strlcat.cc) = 2a93f02387ba50cabb1c6930e67768e08ca50500
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_strlcpy.cc) = d338838de63442b61e259037b707944f7db2cd43
+SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc) = 0486e691d5966daaf81bb6cae82bdcb1ab328000
+SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc) = 4a0ffa7305467bcc10b6b4572ae1b034af6a45d2
+SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_paccept.cc) = 10f1f6617bc2a07cfbdad708d4ced3a7df7ca077
+SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_strlcat.cc) = 5468c53e1997a53d6e60a6b27f37669b1592b7cc
+SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_strlcpy.cc) = 8a2786f0a3e0b05a06172410e94790251a877398
 SHA1 (patch-test_scudo_lit.cfg) = 111a66513b994534bb0d69d214b7e0cb4e2b8eb8
-SHA1 (patch-utils_generate__netbsd__ioctls.awk) = 9ef2ab0fa2d730f9db63ef1130f5111bec3d73d3
-SHA1 (patch-utils_generate__netbsd__syscalls.awk) = f84f53deabc51bbed2d88b3b62bb87bd6e5fcf00
+SHA1 (patch-utils_generate__netbsd__ioctls.awk) = b66063e44c68cc3ff070a6dad22cc26e56f8f8d2
+SHA1 (patch-utils_generate__netbsd__syscalls.awk) = cca5e80af100ec6e8084756485b87b84233ba793
diff --git a/compiler-rt-netbsd/patches/patch-include_sanitizer_netbsd__syscall__hooks.h b/compiler-rt-netbsd/patches/patch-include_sanitizer_netbsd__syscall__hooks.h
index 3bb7456162..ed134ac6cb 100644
--- a/compiler-rt-netbsd/patches/patch-include_sanitizer_netbsd__syscall__hooks.h
+++ b/compiler-rt-netbsd/patches/patch-include_sanitizer_netbsd__syscall__hooks.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- include/sanitizer/netbsd_syscall_hooks.h.orig	2018-01-23 23:10:30.960806482 +0000
+--- include/sanitizer/netbsd_syscall_hooks.h.orig	2018-01-24 15:01:49.070264647 +0000
 +++ include/sanitizer/netbsd_syscall_hooks.h
 @@ -0,0 +1,4730 @@
 +//===-- netbsd_syscall_hooks.h --------------------------------------------===//
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
index df676680b0..ba179ae7ce 100644
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/fuzzer/tests/CMakeLists.txt.orig	2018-01-23 23:09:21.609684076 +0000
+--- lib/fuzzer/tests/CMakeLists.txt.orig	2018-01-23 23:09:21.000000000 +0000
 +++ lib/fuzzer/tests/CMakeLists.txt
 @@ -10,6 +10,9 @@ add_custom_target(FuzzerUnitTests)
  set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
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 849bdafea8..0db40ae568 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-01-23 23:09:21.607269644 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-01-23 23:09:21.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -36,6 +36,7 @@
  //   COMMON_INTERCEPTOR_MEMCPY_IMPL
@@ -171,7 +171,7 @@ $NetBSD$
  #if SANITIZER_INTERCEPT___XSTAT
  INTERCEPTOR(int, __xstat, int version, const char *path, void *buf) {
    void *ctx;
-@@ -6631,6 +6679,837 @@ INTERCEPTOR(int, getgroupmembership, con
+@@ -6631,6 +6679,930 @@ INTERCEPTOR(int, getgroupmembership, con
  #define INIT_GETGROUPLIST
  #endif
  
@@ -1005,11 +1005,104 @@ $NetBSD$
 +#else
 +#define INIT_STRMODE
 +#endif
++
++#if SANITIZER_INTERCEPT_REGEX
++INTERCEPTOR(int, regcomp, void *preg, const char *pattern, int cflags) {
++  void *ctx;
++  int res;
++  COMMON_INTERCEPTOR_ENTER(ctx, regcomp, preg, pattern, cflags);
++  if (pattern)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, pattern, REAL(strlen)(pattern) + 1);
++  res = REAL(regcomp)(preg, pattern, cflags);
++  if (!res)
++    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, preg, struct_regex_sz);
++  return res;
++}
++
++INTERCEPTOR(int, regexec, const void *preg, const char *string, SIZE_T nmatch, struct __sanitizer_regmatch *pmatch[], int eflags) {
++  void *ctx;
++  int res;
++  COMMON_INTERCEPTOR_ENTER(ctx, regexec, preg, string, nmatch, pmatch, eflags);
++  if (preg)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, preg, struct_regex_sz);
++  if (string)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, string, REAL(strlen)(string) + 1);
++  res = REAL(regexec)(preg, string, nmatch, pmatch, eflags);
++  if (!res && pmatch)
++    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, pmatch, nmatch * struct_regmatch_sz);
++  return res;
++}
++
++INTERCEPTOR(SIZE_T, regerror, int errcode, const void *preg, char *errbuf, SIZE_T errbuf_size) {
++  void *ctx;
++  SIZE_T res;
++  COMMON_INTERCEPTOR_ENTER(ctx, regerror, errcode, preg, errbuf, errbuf_size);
++  if (preg)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, preg, struct_regex_sz);
++  res = REAL(regerror)(errcode, preg, errbuf, errbuf_size);
++  if (errbuf)
++    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, errbuf, REAL(strlen)(errbuf) + 1);
++  return res;
++}
++
++INTERCEPTOR(void, regfree, const void *preg) {
++  void *ctx;
++  COMMON_INTERCEPTOR_ENTER(ctx, regfree, preg);
++  if (preg)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, preg, struct_regex_sz);
++  REAL(regfree)(preg);
++}
++
++INTERCEPTOR(SSIZE_T, regnsub, char *buf, SIZE_T bufsiz, const char *sub, const struct __sanitizer_regmatch *rm, const char *str) {
++  void *ctx;
++  SSIZE_T res;
++  COMMON_INTERCEPTOR_ENTER(ctx, regnsub, buf, bufsiz, sub, rm, str);
++  if (sub)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, sub, REAL(strlen)(sub) + 1);
++  // Hardcode 10 elements as requested by the documentation as minimum
++  if (rm)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, rm, 10 * struct_regmatch_sz);
++  if (str)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, str, REAL(strlen)(str) + 1);
++  res = REAL(regnsub)(buf, bufsiz, sub, rm, str);
++  if (res > 0 && buf)
++    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, REAL(strlen)(buf) + 1);
++  return res;
++}
++
++INTERCEPTOR(SSIZE_T, regasub, char **buf, const char *sub, const struct __sanitizer_regmatch *rm, const char *sstr) {
++  void *ctx;
++  SSIZE_T res;
++  COMMON_INTERCEPTOR_ENTER(ctx, regasub, buf, sub, rm, sstr);
++  if (sub)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, sub, REAL(strlen)(sub) + 1);
++  // Hardcode 10 elements as requested by the documentation as minimum
++  if (rm)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, rm, 10 * struct_regmatch_sz);
++  if (sstr)
++    COMMON_INTERCEPTOR_READ_RANGE(ctx, sstr, REAL(strlen)(sstr) + 1);
++  res = REAL(regasub)(buf, sub, rm, sstr);
++  if (res > 0 && buf) {
++    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, sizeof(char *));
++    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *buf, REAL(strlen)(*buf) + 1);
++  }
++  return res;
++}
++#define INIT_REGEX \
++  COMMON_INTERCEPT_FUNCTION(regcomp); \
++  COMMON_INTERCEPT_FUNCTION(regexec); \
++  COMMON_INTERCEPT_FUNCTION(regerror); \
++  COMMON_INTERCEPT_FUNCTION(regfree); \
++  COMMON_INTERCEPT_FUNCTION(regnsub); \
++  COMMON_INTERCEPT_FUNCTION(regasub);
++#else
++#define INIT_REGEX
++#endif
 +
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -6833,6 +7712,7 @@ static void InitializeCommonInterceptors
+@@ -6833,6 +7805,7 @@ static void InitializeCommonInterceptors
    INIT_SEND_SENDTO;
    INIT_STAT;
    INIT_EVENTFD_READ_WRITE;
@@ -1017,7 +1110,7 @@ $NetBSD$
    INIT___XSTAT;
    INIT___XSTAT64;
    INIT___LXSTAT;
-@@ -6851,6 +7731,17 @@ static void InitializeCommonInterceptors
+@@ -6851,6 +7824,18 @@ static void InitializeCommonInterceptors
    INIT_ACCESS;
    INIT_FACCESSAT;
    INIT_GETGROUPLIST;
@@ -1032,6 +1125,7 @@ $NetBSD$
 +  INIT_GETNETENT;
 +  INIT_FTS;
 +  INIT_STRMODE;
++  INIT_REGEX;
  
  #if SANITIZER_NETBSD
    COMMON_INTERCEPT_FUNCTION(__libc_mutex_lock);
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__interceptors__ioctl.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__interceptors__ioctl.inc
index b393ba4fce..d0e414b7af 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__interceptors__ioctl.inc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__interceptors__ioctl.inc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_netbsd_interceptors_ioctl.inc.orig	2018-01-23 23:10:30.963651377 +0000
+--- lib/sanitizer_common/sanitizer_netbsd_interceptors_ioctl.inc.orig	2018-01-24 15:01:49.074625816 +0000
 +++ lib/sanitizer_common/sanitizer_netbsd_interceptors_ioctl.inc
 @@ -0,0 +1,1490 @@
 +//===-- sanitizer_common_interceptors_ioctl.inc -----------------*- C++ -*-===//
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__syscalls.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__syscalls.inc
index d7c5eaa960..c0ee0651ba 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__syscalls.inc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__netbsd__syscalls.inc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_netbsd_syscalls.inc.orig	2018-01-23 23:10:30.964496844 +0000
+--- lib/sanitizer_common/sanitizer_netbsd_syscalls.inc.orig	2018-01-24 15:01:49.075454110 +0000
 +++ lib/sanitizer_common/sanitizer_netbsd_syscalls.inc
 @@ -0,0 +1,3793 @@
 +//===-- sanitizer_common_syscalls.inc ---------------------------*- 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 de819fdef2..5882a9f87b 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,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-01-23 23:09:21.607729207 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-01-23 23:09:21.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
 @@ -406,6 +406,7 @@
  
@@ -10,7 +10,7 @@ $NetBSD$
  #define SANITIZER_INTERCEPT___XSTAT (!SANITIZER_INTERCEPT_STAT && SI_POSIX)
  #define SANITIZER_INTERCEPT___XSTAT64 SI_LINUX_NOT_ANDROID
  #define SANITIZER_INTERCEPT___LXSTAT SANITIZER_INTERCEPT___XSTAT
-@@ -441,5 +442,16 @@
+@@ -441,5 +442,17 @@
  #define SANITIZER_INTERCEPT_ACCESS SI_NETBSD
  #define SANITIZER_INTERCEPT_FACCESSAT SI_NETBSD
  #define SANITIZER_INTERCEPT_GETGROUPLIST SI_NETBSD
@@ -25,5 +25,6 @@ $NetBSD$
 +#define SANITIZER_INTERCEPT_GETNETENT SI_NETBSD
 +#define SANITIZER_INTERCEPT_FTS SI_NETBSD
 +#define SANITIZER_INTERCEPT_STRMODE SI_NETBSD
++#define SANITIZER_INTERCEPT_REGEX SI_NETBSD
  
  #endif  // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H
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 ba7b96cddd..91bf4c761f 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
@@ -172,17 +172,18 @@ $NetBSD$
  #include <sys/shm.h>
  #include <sys/signal.h>
  #include <sys/socket.h>
-@@ -67,6 +208,9 @@
+@@ -67,6 +208,10 @@
  #include <utmpx.h>
  #include <wchar.h>
  #include <wordexp.h>
 +#include <ttyent.h>
 +
 +#include <fts.h>
++#include <regex.h>
  
  // Include these after system headers to avoid name clashes and ambiguities.
  #include "sanitizer_internal_defs.h"
-@@ -99,18 +243,85 @@ unsigned struct_sockaddr_sz = sizeof(str
+@@ -99,18 +244,87 @@ unsigned struct_sockaddr_sz = sizeof(str
  unsigned ucontext_t_sz = sizeof(ucontext_t);
  unsigned struct_rlimit_sz = sizeof(struct rlimit);
  unsigned struct_timespec_sz = sizeof(struct timespec);
@@ -190,6 +191,8 @@ $NetBSD$
 +unsigned struct_kevent_sz = sizeof(struct kevent);
 +unsigned struct_FTS_sz = sizeof(FTS);
 +unsigned struct_FTSENT_sz = sizeof(FTSENT);
++unsigned struct_regex_sz = sizeof(regex_t);
++unsigned struct_regmatch_sz = sizeof(regmatch_t);
  unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
  unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
  unsigned struct_timex_sz = sizeof(struct timex);
@@ -268,7 +271,7 @@ $NetBSD$
  int shmctl_ipc_stat = (int)IPC_STAT;
  
  unsigned struct_utmp_sz = sizeof(struct utmp);
-@@ -137,65 +348,1731 @@ int glob_altdirfunc = GLOB_ALTDIRFUNC;
+@@ -137,65 +351,1731 @@ int glob_altdirfunc = GLOB_ALTDIRFUNC;
  
  unsigned path_max = PATH_MAX;
  
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 353c3d7fc5..3a4f208a3b 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
@@ -2,7 +2,7 @@ $NetBSD$
 
 --- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-01-15 06:00:16.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
-@@ -57,33 +57,38 @@ extern unsigned ucontext_t_sz;
+@@ -57,33 +57,45 @@ extern unsigned ucontext_t_sz;
  extern unsigned struct_rlimit_sz;
  extern unsigned struct_utimbuf_sz;
  extern unsigned struct_timespec_sz;
@@ -12,6 +12,13 @@ $NetBSD$
 +extern unsigned struct_kevent_sz;
 +extern unsigned struct_FTS_sz;
 +extern unsigned struct_FTSENT_sz;
++extern unsigned struct_regex_sz;
++extern unsigned struct_regmatch_sz;
++
++struct __sanitizer_regmatch {
++  OFF_T rm_so;
++  OFF_T rm_eo;
++};
 +
 +union __sanitizer_sigval {
 +  int sival_int;
@@ -62,7 +69,7 @@ $NetBSD$
  struct __sanitizer_sem_t {
    uptr data[5];
  };
-@@ -110,6 +115,19 @@ struct __sanitizer_shmid_ds {
+@@ -110,6 +122,19 @@ struct __sanitizer_shmid_ds {
    void *_shm_internal;
  };
  
@@ -82,7 +89,7 @@ $NetBSD$
  extern unsigned struct_msqid_ds_sz;
  extern unsigned struct_mq_attr_sz;
  extern unsigned struct_timex_sz;
-@@ -131,6 +149,8 @@ struct __sanitizer_ifaddrs {
+@@ -131,6 +156,8 @@ struct __sanitizer_ifaddrs {
    unsigned int ifa_addrflags;
  };
  
@@ -91,7 +98,7 @@ $NetBSD$
  typedef unsigned __sanitizer_pthread_key_t;
  
  typedef long long __sanitizer_time_t;
-@@ -200,6 +220,12 @@ struct __sanitizer_msghdr {
+@@ -200,6 +227,12 @@ struct __sanitizer_msghdr {
    unsigned msg_controllen;
    int msg_flags;
  };
@@ -104,7 +111,7 @@ $NetBSD$
  struct __sanitizer_cmsghdr {
    unsigned cmsg_len;
    int cmsg_level;
-@@ -252,6 +278,22 @@ struct __sanitizer_sigaction {
+@@ -252,6 +285,22 @@ struct __sanitizer_sigaction {
    int sa_flags;
  };
  
@@ -127,7 +134,7 @@ $NetBSD$
  typedef __sanitizer_sigset_t __sanitizer_kernel_sigset_t;
  
  struct __sanitizer_kernel_sigaction_t {
-@@ -309,6 +351,8 @@ struct __sanitizer_pollfd {
+@@ -309,6 +358,8 @@ struct __sanitizer_pollfd {
  
  typedef unsigned __sanitizer_nfds_t;
  
@@ -136,7 +143,7 @@ $NetBSD$
  struct __sanitizer_glob_t {
    uptr gl_pathc;
    uptr gl_matchc;
-@@ -328,6 +372,54 @@ extern int glob_altdirfunc;
+@@ -328,6 +379,54 @@ extern int glob_altdirfunc;
  
  extern unsigned path_max;
  
@@ -191,7 +198,7 @@ $NetBSD$
  struct __sanitizer_wordexp_t {
    uptr we_wordc;
    char **we_wordv;
-@@ -361,6 +453,53 @@ struct __sanitizer_ifconf {
+@@ -361,6 +460,53 @@ struct __sanitizer_ifconf {
    } ifc_ifcu;
  };
  
@@ -245,7 +252,7 @@ $NetBSD$
  #define IOC_NRBITS 8
  #define IOC_TYPEBITS 8
  #define IOC_SIZEBITS 14
-@@ -385,185 +524,1712 @@ struct __sanitizer_ifconf {
+@@ -385,185 +531,1712 @@ struct __sanitizer_ifconf {
  #define IOC_NR(nr) (((nr) >> IOC_NRSHIFT) & IOC_NRMASK)
  #define IOC_SIZE(nr) (((nr) >> IOC_SIZESHIFT) & IOC_SIZEMASK)
  
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 6cb45879a7..5b9b68b233 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-01-23 23:10:30.966547942 +0000
+--- test/sanitizer_common/TestCases/NetBSD/kvm_open.cc.orig	2018-01-24 15:01:49.077477894 +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 ddf040d2d7..590c5f36af 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-01-23 23:10:30.966625845 +0000
+--- test/sanitizer_common/TestCases/NetBSD/kvm_openfiles.cc.orig	2018-01-24 15:01:49.077554804 +0000
 +++ test/sanitizer_common/TestCases/NetBSD/kvm_openfiles.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_paccept.cc b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_paccept.cc
index 1f4ea335ed..341ff43314 100644
--- a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_paccept.cc
+++ b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_paccept.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/sanitizer_common/TestCases/NetBSD/paccept.cc.orig	2018-01-23 23:09:21.210142788 +0000
+--- test/sanitizer_common/TestCases/NetBSD/paccept.cc.orig	2018-01-23 23:09:21.000000000 +0000
 +++ test/sanitizer_common/TestCases/NetBSD/paccept.cc
 @@ -72,3 +72,77 @@ int main(void) {
  
diff --git a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcat.cc b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcat.cc
index 96c216a0d4..e813f1ae47 100644
--- a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcat.cc
+++ b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcat.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/sanitizer_common/TestCases/NetBSD/strlcat.cc.orig	2018-01-23 23:10:30.966775060 +0000
+--- test/sanitizer_common/TestCases/NetBSD/strlcat.cc.orig	2018-01-24 15:01:49.077711373 +0000
 +++ test/sanitizer_common/TestCases/NetBSD/strlcat.cc
 @@ -0,0 +1,56 @@
 +// RUN: %clangxx -O0 -g %s -o %t && %run %t
diff --git a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcpy.cc b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcpy.cc
index bf83ed08e3..b0e666ecd7 100644
--- a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcpy.cc
+++ b/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_strlcpy.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/sanitizer_common/TestCases/NetBSD/strlcpy.cc.orig	2018-01-23 23:10:30.966853389 +0000
+--- test/sanitizer_common/TestCases/NetBSD/strlcpy.cc.orig	2018-01-24 15:01:49.077791357 +0000
 +++ test/sanitizer_common/TestCases/NetBSD/strlcpy.cc
 @@ -0,0 +1,56 @@
 +// RUN: %clangxx -O0 -g %s -o %t && %run %t
diff --git a/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk b/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk
index 0075f3ef1c..231627e44c 100644
--- a/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk
+++ b/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- utils/generate_netbsd_ioctls.awk.orig	2018-01-23 23:10:30.967143151 +0000
+--- utils/generate_netbsd_ioctls.awk.orig	2018-01-24 15:01:49.078085846 +0000
 +++ utils/generate_netbsd_ioctls.awk
 @@ -0,0 +1,755 @@
 +#!/usr/bin/awk -f
diff --git a/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__syscalls.awk b/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__syscalls.awk
index e1627fbdb8..d4bb78f308 100644
--- a/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__syscalls.awk
+++ b/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__syscalls.awk
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- utils/generate_netbsd_syscalls.awk.orig	2018-01-23 23:10:30.967799251 +0000
+--- utils/generate_netbsd_syscalls.awk.orig	2018-01-24 15:01:49.078739242 +0000
 +++ utils/generate_netbsd_syscalls.awk
 @@ -0,0 +1,2989 @@
 +#!/usr/bin/awk -f
Prev by Date: 389-ds-base: Add a reference to CVE-2017-15135
Next by Date: wayland: dont use libepoll-shim on Linux
Previous by Thread: compiler-rt-netbsd: Sync with local patches
Next by Thread: compiler-rt-netbsd: Sync with local patches
Indexes:
Home | Main Index | Thread Index | Old Index