pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

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

Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sat Jan 20 15:39:46 2018 +0100
Changeset:	cc502f6844733b6cb6a0cd9a7c5058d291421757

Modified Files:
	compiler-rt-netbsd/Makefile
	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_scudo_scudo__platform.h
	compiler-rt-netbsd/patches/patch-test_asan_lit.cfg
	compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
	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: Update to SVN r. 323038

Local patches merged upstream:
D42046: Intercept accept4() on NetBSD
https://reviews.llvm.org/D42046

D42045: Support the localtime interceptor for NetBSD
https://reviews.llvm.org/D42045

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=cc502f6844733b6cb6a0cd9a7c5058d291421757

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                        | 22 +++++------
 ...atch-include_sanitizer_netbsd__syscall__hooks.h |  2 +-
 .../patches/patch-lib_fuzzer_tests_CMakeLists.txt  |  2 +-
 ...zer__common_sanitizer__common__interceptors.inc | 44 +++++++++-------------
 ...mmon_sanitizer__netbsd__interceptors__ioctl.inc |  2 +-
 ...nitizer__common_sanitizer__netbsd__syscalls.inc |  2 +-
 ...zer__common_sanitizer__platform__interceptors.h |  8 ++--
 .../patches/patch-lib_scudo_scudo__platform.h      |  2 +-
 compiler-rt-netbsd/patches/patch-test_asan_lit.cfg |  4 +-
 .../patches/patch-test_scudo_lit.cfg               |  6 +--
 .../patch-utils_generate__netbsd__ioctls.awk       |  2 +-
 .../patch-utils_generate__netbsd__syscalls.awk     |  2 +-
 13 files changed, 45 insertions(+), 55 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 1147e97299..70b9c3d3d2 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=	322947
+SVN_REVISION.compiler-rt=	323038
 
 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 3873fecbb2..a64dc209c6 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -2,28 +2,28 @@ $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) = 728e5f9bd0c6eaa242bc3b4612a182f702189c73
+SHA1 (patch-include_sanitizer_netbsd__syscall__hooks.h) = 0cfe2581c93293197e18bb2fead71c251aee2898
 SHA1 (patch-lib_asan_asan__interceptors.cc) = ea4005ce02775060ff52af76d568c450892067b5
 SHA1 (patch-lib_esan_esan__interceptors.cpp) = a7103ca053e92a810c87c593262bb386f3d02606
-SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = d15d3869f2c1bbbf13c0a1dead902e8734e5d4f8
+SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = bed69bc433f70ec4d88fc5aa11d47ffbd18f4b74
 SHA1 (patch-lib_hwasan_hwasan__interceptors.cc) = c49ab3759728bbd3e27580a3d0d3e2db0bceb2a6
 SHA1 (patch-lib_msan_msan__interceptors.cc) = 9f0c1a05430314581b1711f1d5a1ab8870053879
 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) = 9b84657b7350cb93cc42747e478b9bfadfb40182
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 546d892d17802f9793c4212c5ca0d215665ba719
 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) = 3d858a30990efa5c4d4b422798186cf87b62d9b7
-SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd__syscalls.inc) = 8080d04f99f7f695cdfc8e561874d374ee634084
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = d238d1355c76db0979b822919dcc93a82d71458c
+SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd__interceptors__ioctl.inc) = bf83b4078f157a10c2afc456ab7451e3851cf119
+SHA1 (patch-lib_sanitizer__common_sanitizer__netbsd__syscalls.inc) = 75fee289e5db1bf3572fcd8ab08921343f94e088
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = e3e1f49c182209afde967ae61f6f4a4d03815f6d
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 47236661e37673d66a52e80c3f55be13029014ca
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 2441d51ba207b067a52b7688076335bb38ad0bb9
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc) = 7e0deaeeada33bd13575251e5d8fb4a0ee4c53e8
-SHA1 (patch-lib_scudo_scudo__platform.h) = 3e8155bcbe8457fd49203bfb4f73420e58a4020b
+SHA1 (patch-lib_scudo_scudo__platform.h) = d44bd094136dd0381db87344fbbcad1dcfd44dc1
 SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = 4fbaa64e3f8d28cdbab6783c296dfd31cecb45a5
-SHA1 (patch-test_asan_lit.cfg) = f7a52f504286ae8a69a4b683210ad6b51f433bc6
+SHA1 (patch-test_asan_lit.cfg) = d84f23432954031f2c03287d70eef2110d8a9ce0
 SHA1 (patch-test_lsan_lit.common.cfg) = 10dc251f80efb96d015a22c740dc20b1843b9a11
-SHA1 (patch-test_scudo_lit.cfg) = 171f340505f7c87f74a7814b9c4d12d7fcbc5690
-SHA1 (patch-utils_generate__netbsd__ioctls.awk) = cbb68f507a84f4f72ca8658b8d20ce327eaabd76
-SHA1 (patch-utils_generate__netbsd__syscalls.awk) = e24d4ed78db6217acf935b688462a84ec38c1e06
+SHA1 (patch-test_scudo_lit.cfg) = 314da51eef4c4a85c2c5d4610ca2233ece05d78f
+SHA1 (patch-utils_generate__netbsd__ioctls.awk) = 2c3558807c20a534f1ba703c9bfe1d70853d1aa6
+SHA1 (patch-utils_generate__netbsd__syscalls.awk) = 6c8bee596d7fea1b02d070992c2767dbeb0c5e23
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 ad1b8478ec..411d6e583e 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-18 12:27:21.936563177 +0000
+--- include/sanitizer/netbsd_syscall_hooks.h.orig	2018-01-20 14:39:09.255061178 +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 9cb32c0024..50f2e37712 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-18 12:26:39.374508608 +0000
+--- lib/fuzzer/tests/CMakeLists.txt.orig	2018-01-18 12:26:39.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 cdb5b3d3bf..12f2534062 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-18 12:26:39.364964646 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-01-20 14:37:44.460284188 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -36,6 +36,7 @@
  //   COMMON_INTERCEPTOR_MEMCPY_IMPL
@@ -18,15 +18,7 @@ $NetBSD$
  #define getitimer __getitimer50
  #define getpwent __getpwent50
  #define getpwnam __getpwnam50
-@@ -88,6 +90,7 @@
- #define glob __glob30
- #define gmtime __gmtime50
- #define gmtime_r __gmtime_r50
-+#define localtime __locatime50
- #define localtime_r __localtime_r50
- #define mktime __mktime50
- #define opendir __opendir30
-@@ -107,6 +110,9 @@
+@@ -108,6 +110,9 @@
  #define times __times13
  #define wait3 __wait350
  #define wait4 __wait450
@@ -36,7 +28,7 @@ $NetBSD$
  #endif
  
  // Platform-specific options.
-@@ -279,6 +285,10 @@ bool PlatformHasDifferentMemcpyAndMemmov
+@@ -280,6 +285,10 @@ bool PlatformHasDifferentMemcpyAndMemmov
    return new_mem;
  #endif
  
@@ -47,7 +39,7 @@ $NetBSD$
  struct FileMetadata {
    // For open_memstream().
    char **addr;
-@@ -1229,6 +1239,7 @@ static void unpoison_tm(void *ctx, __san
+@@ -1230,6 +1239,7 @@ static void unpoison_tm(void *ctx, __san
  INTERCEPTOR(__sanitizer_tm *, localtime, unsigned long *timep) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, localtime, timep);
@@ -55,7 +47,7 @@ $NetBSD$
    __sanitizer_tm *res = REAL(localtime)(timep);
    if (res) {
      COMMON_INTERCEPTOR_READ_RANGE(ctx, timep, sizeof(*timep));
-@@ -1239,6 +1250,7 @@ INTERCEPTOR(__sanitizer_tm *, localtime,
+@@ -1240,6 +1250,7 @@ INTERCEPTOR(__sanitizer_tm *, localtime,
  INTERCEPTOR(__sanitizer_tm *, localtime_r, unsigned long *timep, void *result) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, localtime_r, timep, result);
@@ -63,7 +55,7 @@ $NetBSD$
    __sanitizer_tm *res = REAL(localtime_r)(timep, result);
    if (res) {
      COMMON_INTERCEPTOR_READ_RANGE(ctx, timep, sizeof(*timep));
-@@ -1249,6 +1261,7 @@ INTERCEPTOR(__sanitizer_tm *, localtime_
+@@ -1250,6 +1261,7 @@ INTERCEPTOR(__sanitizer_tm *, localtime_
  INTERCEPTOR(__sanitizer_tm *, gmtime, unsigned long *timep) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, gmtime, timep);
@@ -71,7 +63,7 @@ $NetBSD$
    __sanitizer_tm *res = REAL(gmtime)(timep);
    if (res) {
      COMMON_INTERCEPTOR_READ_RANGE(ctx, timep, sizeof(*timep));
-@@ -1259,6 +1272,7 @@ INTERCEPTOR(__sanitizer_tm *, gmtime, un
+@@ -1260,6 +1272,7 @@ INTERCEPTOR(__sanitizer_tm *, gmtime, un
  INTERCEPTOR(__sanitizer_tm *, gmtime_r, unsigned long *timep, void *result) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, gmtime_r, timep, result);
@@ -79,7 +71,7 @@ $NetBSD$
    __sanitizer_tm *res = REAL(gmtime_r)(timep, result);
    if (res) {
      COMMON_INTERCEPTOR_READ_RANGE(ctx, timep, sizeof(*timep));
-@@ -1269,6 +1283,7 @@ INTERCEPTOR(__sanitizer_tm *, gmtime_r, 
+@@ -1270,6 +1283,7 @@ INTERCEPTOR(__sanitizer_tm *, gmtime_r, 
  INTERCEPTOR(char *, ctime, unsigned long *timep) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, ctime, timep);
@@ -87,7 +79,7 @@ $NetBSD$
    // FIXME: under ASan the call below may write to freed memory and corrupt
    // its metadata. See
    // https://github.com/google/sanitizers/issues/321.
-@@ -1282,6 +1297,7 @@ INTERCEPTOR(char *, ctime, unsigned long
+@@ -1283,6 +1297,7 @@ INTERCEPTOR(char *, ctime, unsigned long
  INTERCEPTOR(char *, ctime_r, unsigned long *timep, char *result) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, ctime_r, timep, result);
@@ -95,7 +87,7 @@ $NetBSD$
    // FIXME: under ASan the call below may write to freed memory and corrupt
    // its metadata. See
    // https://github.com/google/sanitizers/issues/321.
-@@ -1295,6 +1311,7 @@ INTERCEPTOR(char *, ctime_r, unsigned lo
+@@ -1296,6 +1311,7 @@ INTERCEPTOR(char *, ctime_r, unsigned lo
  INTERCEPTOR(char *, asctime, __sanitizer_tm *tm) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, asctime, tm);
@@ -103,7 +95,7 @@ $NetBSD$
    // FIXME: under ASan the call below may write to freed memory and corrupt
    // its metadata. See
    // https://github.com/google/sanitizers/issues/321.
-@@ -1308,6 +1325,7 @@ INTERCEPTOR(char *, asctime, __sanitizer
+@@ -1309,6 +1325,7 @@ INTERCEPTOR(char *, asctime, __sanitizer
  INTERCEPTOR(char *, asctime_r, __sanitizer_tm *tm, char *result) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, asctime_r, tm, result);
@@ -111,7 +103,7 @@ $NetBSD$
    // FIXME: under ASan the call below may write to freed memory and corrupt
    // its metadata. See
    // https://github.com/google/sanitizers/issues/321.
-@@ -1321,6 +1339,7 @@ INTERCEPTOR(char *, asctime_r, __sanitiz
+@@ -1322,6 +1339,7 @@ INTERCEPTOR(char *, asctime_r, __sanitiz
  INTERCEPTOR(long, mktime, __sanitizer_tm *tm) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, mktime, tm);
@@ -119,7 +111,7 @@ $NetBSD$
    COMMON_INTERCEPTOR_READ_RANGE(ctx, &tm->tm_sec, sizeof(tm->tm_sec));
    COMMON_INTERCEPTOR_READ_RANGE(ctx, &tm->tm_min, sizeof(tm->tm_min));
    COMMON_INTERCEPTOR_READ_RANGE(ctx, &tm->tm_hour, sizeof(tm->tm_hour));
-@@ -1703,6 +1722,7 @@ FORMAT_INTERCEPTOR_IMPL(__isoc99_snprint
+@@ -1704,6 +1722,7 @@ FORMAT_INTERCEPTOR_IMPL(__isoc99_snprint
  
  #if SANITIZER_INTERCEPT_IOCTL
  #include "sanitizer_common_interceptors_ioctl.inc"
@@ -127,7 +119,7 @@ $NetBSD$
  INTERCEPTOR(int, ioctl, int d, unsigned long request, ...) {
    // We need a frame pointer, because we call into ioctl_common_[pre|post] which
    // can trigger a report and we need to be able to unwind through this
-@@ -2776,6 +2796,30 @@ INTERCEPTOR(int, accept4, int fd, void *
+@@ -2777,6 +2796,30 @@ INTERCEPTOR(int, accept4, int fd, void *
  #define INIT_ACCEPT4
  #endif
  
@@ -158,7 +150,7 @@ $NetBSD$
  #if SANITIZER_INTERCEPT_MODF
  INTERCEPTOR(double, modf, double x, double *iptr) {
    void *ctx;
-@@ -3164,7 +3208,14 @@ INTERCEPTOR(char *, setlocale, int categ
+@@ -3165,7 +3208,14 @@ INTERCEPTOR(char *, setlocale, int categ
    if (locale)
      COMMON_INTERCEPTOR_READ_RANGE(ctx, locale, REAL(strlen)(locale) + 1);
    char *res = REAL(setlocale)(category, locale);
@@ -174,7 +166,7 @@ $NetBSD$
    return res;
  }
  
-@@ -6607,6 +6658,488 @@ INTERCEPTOR(int, getgroupmembership, con
+@@ -6608,6 +6658,488 @@ INTERCEPTOR(int, getgroupmembership, con
  #define INIT_GETGROUPLIST
  #endif
  
@@ -663,7 +655,7 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -6686,6 +7219,7 @@ static void InitializeCommonInterceptors
+@@ -6687,6 +7219,7 @@ static void InitializeCommonInterceptors
    INIT_GETSOCKOPT;
    INIT_ACCEPT;
    INIT_ACCEPT4;
@@ -671,7 +663,7 @@ $NetBSD$
    INIT_MODF;
    INIT_RECVMSG;
    INIT_SENDMSG;
-@@ -6826,6 +7360,13 @@ static void InitializeCommonInterceptors
+@@ -6827,6 +7360,13 @@ static void InitializeCommonInterceptors
    INIT_ACCESS;
    INIT_FACCESSAT;
    INIT_GETGROUPLIST;
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 cb27e47cfd..16f37d7ab8 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-18 12:27:21.939365748 +0000
+--- lib/sanitizer_common/sanitizer_netbsd_interceptors_ioctl.inc.orig	2018-01-20 14:39:09.258621476 +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 3707e4fd28..37e1a9e084 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-18 12:27:21.940197418 +0000
+--- lib/sanitizer_common/sanitizer_netbsd_syscalls.inc.orig	2018-01-20 14:39:09.259564334 +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 ddb3660829..53bfc15f20 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,13 +1,11 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-01-18 12:26:39.365442943 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-01-20 14:37:44.460760436 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -217,7 +217,8 @@
-   (SI_FREEBSD || SI_LINUX_NOT_ANDROID || SI_SOLARIS)
+@@ -218,6 +218,7 @@
  #define SANITIZER_INTERCEPT_GETSOCKOPT SI_POSIX
  #define SANITIZER_INTERCEPT_ACCEPT SI_POSIX
--#define SANITIZER_INTERCEPT_ACCEPT4 SI_LINUX_NOT_ANDROID
-+#define SANITIZER_INTERCEPT_ACCEPT4 SI_LINUX_NOT_ANDROID || SI_NETBSD
+ #define SANITIZER_INTERCEPT_ACCEPT4 SI_LINUX_NOT_ANDROID || SI_NETBSD
 +#define SANITIZER_INTERCEPT_PACCEPT SI_NETBSD
  #define SANITIZER_INTERCEPT_MODF SI_POSIX
  #define SANITIZER_INTERCEPT_RECVMSG SI_POSIX
diff --git a/compiler-rt-netbsd/patches/patch-lib_scudo_scudo__platform.h b/compiler-rt-netbsd/patches/patch-lib_scudo_scudo__platform.h
index 2b025d09b6..c00fb146fe 100644
--- a/compiler-rt-netbsd/patches/patch-lib_scudo_scudo__platform.h
+++ b/compiler-rt-netbsd/patches/patch-lib_scudo_scudo__platform.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/scudo/scudo_platform.h.orig	2018-01-18 12:26:38.973686973 +0000
+--- lib/scudo/scudo_platform.h.orig	2018-01-18 12:26:38.000000000 +0000
 +++ lib/scudo/scudo_platform.h
 @@ -17,7 +17,7 @@
  
diff --git a/compiler-rt-netbsd/patches/patch-test_asan_lit.cfg b/compiler-rt-netbsd/patches/patch-test_asan_lit.cfg
index 5227ff7940..e33e88fef2 100644
--- a/compiler-rt-netbsd/patches/patch-test_asan_lit.cfg
+++ b/compiler-rt-netbsd/patches/patch-test_asan_lit.cfg
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/asan/lit.cfg.orig	2018-01-17 14:42:51.000000000 +0000
+--- test/asan/lit.cfg.orig	2018-01-20 14:37:44.078179409 +0000
 +++ test/asan/lit.cfg
 @@ -209,7 +209,7 @@ else:
    config.substitutions.append(('%pie', '-pie'))
@@ -10,4 +10,4 @@ $NetBSD$
 +if config.host_os not in ['Linux', 'Darwin', 'FreeBSD', 'SunOS', 'Windows', 'NetBSD']:
    config.unsupported = True
  
- if config.host_os == 'Darwin' and config.target_arch in ["x86_64", "x86_64h"]:
+ if config.host_os == 'Darwin':
diff --git a/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg b/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
index bee3a49757..d7ed5251e6 100644
--- a/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
+++ b/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- test/scudo/lit.cfg.orig	2017-12-04 19:21:18.000000000 +0000
+--- test/scudo/lit.cfg.orig	2018-01-20 14:37:44.075290564 +0000
 +++ test/scudo/lit.cfg
-@@ -26,9 +26,11 @@ c_flags = ([config.target_cflags] +
+@@ -21,9 +21,11 @@ c_flags = ([config.target_cflags] +
             "-pie",
             "-O0",
             "-UNDEBUG",
@@ -15,7 +15,7 @@ $NetBSD$
  # Android doesn't want -lrt.
  if not config.android:
    c_flags += ["-lrt"]
-@@ -57,5 +59,5 @@ config.substitutions.append(('%env_scudo
+@@ -54,5 +56,5 @@ config.substitutions.append(('%env_scudo
                               'env SCUDO_OPTIONS=' + default_scudo_opts))
  
  # Hardened Allocator tests are currently supported on Linux only.
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 b78d2716e9..c2090b396b 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-18 12:27:21.942437750 +0000
+--- utils/generate_netbsd_ioctls.awk.orig	2018-01-20 14:39:09.262418467 +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 b7e279a58e..3c2a21b646 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-18 12:27:21.943088110 +0000
+--- utils/generate_netbsd_syscalls.awk.orig	2018-01-20 14:39:09.263158156 +0000
 +++ utils/generate_netbsd_syscalls.awk
 @@ -0,0 +1,2989 @@
 +#!/usr/bin/awk -f
Home | Main Index | Thread Index | Old Index