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. 345572



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Oct 30 09:42:55 2018 +0100
Changeset:	3441a6f782353e949c4fd511c52ef428f8d82480

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-CMakeLists.txt
	compiler-rt-netbsd/patches/patch-cmake_Modules_HandleCompilerRT.cmake
	compiler-rt-netbsd/patches/patch-lib_asan_asan__posix.cc
	compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp
	compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
	compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
	compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__internal__defs.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.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-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
	compiler-rt-netbsd/patches/patch-lib_scudo_scudo__platform.h
	compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt
	compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
	compiler-rt-netbsd/patches/patch-test_asan_TestCases_intercept-rethrow-exception.cc
	compiler-rt-netbsd/patches/patch-test_asan_TestCases_interception__failure__test.cc
	compiler-rt-netbsd/patches/patch-test_msan_fork.cc
Removed Files:
	compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk

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

Rebase to patches merged upstream:

[compiler-rt] r345490 - Mark test/tsan/ignore_lib5 as unsupported for NetBSD
[compiler-rt] r345492 - Disable the GNU strerror_r TSan test for NetBSD
[compiler-rt] r345493 - Mark test/tsan/getline_nohang as XFAIL for NetBSD
[compiler-rt] r345570 - Handle NetBSD symbol mangling for nanosleep and vfork
[compiler-rt] r345571 - Handle NetBSD symbol mangling for tzset
[compiler-rt] r345572 - Drop now hidden ioctl(2) operations for NetBSD

(and probably others)

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

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                        | 47 +++++++++++-----------
 compiler-rt-netbsd/patches/patch-CMakeLists.txt    |  6 +--
 .../patch-cmake_Modules_HandleCompilerRT.cmake     |  2 +-
 .../patches/patch-lib_asan_asan__posix.cc          |  2 +-
 .../patches/patch-lib_fuzzer_FuzzerLoop.cpp        |  2 +-
 .../patches/patch-lib_fuzzer_tests_CMakeLists.txt  |  2 +-
 .../patches/patch-lib_msan_msan__interceptors.cc   | 18 +++------
 .../patches/patch-lib_msan_msan__linux.cc          |  2 +-
 ...zer__common_sanitizer__common__interceptors.inc | 22 +++++-----
 ...mmon_sanitizer__interceptors__ioctl__netbsd.inc |  2 +-
 ...b_sanitizer__common_sanitizer__internal__defs.h |  2 +-
 ..._sanitizer__common_sanitizer__linux__libcdep.cc |  2 +-
 ...zer__common_sanitizer__platform__interceptors.h |  2 +-
 ...__common_sanitizer__platform__limits__netbsd.cc |  2 +-
 ...r__common_sanitizer__platform__limits__netbsd.h |  2 +-
 ...r__common_sanitizer__platform__limits__posix.cc |  2 +-
 ...er__common_sanitizer__platform__limits__posix.h |  2 +-
 ...er__common_sanitizer__unwind__linux__libcdep.cc |  2 +-
 .../patches/patch-lib_scudo_scudo__platform.h      |  2 +-
 .../patches/patch-lib_tsan_CMakeLists.txt          |  2 +-
 .../patches/patch-lib_xray_tests_CMakeLists.txt    |  2 +-
 ...t_asan_TestCases_intercept-rethrow-exception.cc |  2 +-
 ...t_asan_TestCases_interception__failure__test.cc |  2 +-
 compiler-rt-netbsd/patches/patch-test_msan_fork.cc |  2 +-
 .../patch-utils_generate__netbsd__ioctls.awk       | 36 -----------------
 26 files changed, 64 insertions(+), 107 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 0b7db407e4..15519ca112 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=	345269
+SVN_REVISION.compiler-rt=	345572
 
 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 770bc049fc..c5af5bdb9d 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -1,26 +1,25 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-SHA1 (patch-CMakeLists.txt) = 21042aa2a617bb927d3283e7dce6e99a5a7aa782
-SHA1 (patch-cmake_Modules_HandleCompilerRT.cmake) = a4a273fa4e0c4d5a3e85a4d4f3c66ef3eeda1e27
-SHA1 (patch-lib_asan_asan__posix.cc) = 368bf20ca2ad7d73eeb1a9faba88897d0fb5f2ad
-SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = 012de6a523f93b0fe8bc7078f0457d8ce821e55b
-SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 80fc1441ded9f8b840d2ce0210819ecb80d6abd4
-SHA1 (patch-lib_msan_msan__interceptors.cc) = b7bf267926a1a598c7f3dde16469b882616b091a
-SHA1 (patch-lib_msan_msan__linux.cc) = 29ad1843e880698eee4abfa4d4a8adf14aa23245
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 7c8201233dd4c7bd3a85871c74529341f9ee2de5
-SHA1 (patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc) = e400c0b202268fc3989d0f2927afa7df06a8cc77
-SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = c6242c839d09c014f6c656356a9b6bd90c473853
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = acce47f3c4ee5d0873e2e299c0e81bfae6a0d4f6
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 8ff0b577f3977b17ac11ed3b54118c881c8546c8
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = e0eef6ef860039d956e2520d37b0c4ddd830161c
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 663b297cf42b8115a56ab1ad8a860bbd851973b8
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = d788f0cb3eff9b858feccbec0096d8ade00d7a4f
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = daef24d02feeeb5cf3a5b181c696e71534749da8
-SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = c01c83eaef386031578225333d41555777d77077
-SHA1 (patch-lib_scudo_scudo__platform.h) = 0873a366edbb2b61f3880730d40f822097311b32
-SHA1 (patch-lib_tsan_CMakeLists.txt) = 18ea473279cb78b2f935241d6265903c92060c41
-SHA1 (patch-lib_xray_tests_CMakeLists.txt) = 2b0bcc6d9a35e1ca57741996939dd0f7e5a03bc2
-SHA1 (patch-test_asan_TestCases_intercept-rethrow-exception.cc) = db1e16d64edb9fd1e5f735264b67b613423aed48
-SHA1 (patch-test_asan_TestCases_interception__failure__test.cc) = 50148968bf20e5e5cfcdd79fed473d3cc82c56b3
-SHA1 (patch-test_msan_fork.cc) = 50b12fedb847bad658af18f4df967818031e6983
-SHA1 (patch-utils_generate__netbsd__ioctls.awk) = d5eb184b9f6a3047973576608c58b5223b3f805b
+SHA1 (patch-CMakeLists.txt) = 865deff3aa754d881df629a39b6eb9e161c0bb65
+SHA1 (patch-cmake_Modules_HandleCompilerRT.cmake) = fde0a4b440a257dec40c4f106c2352d5efecceef
+SHA1 (patch-lib_asan_asan__posix.cc) = be7e47c252e30184639f7ed1c98c75a8667fd261
+SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = b2e226a0d7b230cc8598a0591ae6f688527c6b2d
+SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = ee809130e36a9157a9bd1c01d45e651b4f2ba26b
+SHA1 (patch-lib_msan_msan__interceptors.cc) = 902567ca8faaa65f3cacc50b63542ad362644004
+SHA1 (patch-lib_msan_msan__linux.cc) = b5df0f4f5930d7c1681b1ad867c893d01d6e5cf7
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = f03c45c1be73eaf085467d9b7cdedd990550ab3c
+SHA1 (patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc) = 2a5a1edb38f87320959c57fa53f3a7080b562aea
+SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9475c8018dadbc4d865b52a03e43f9eae2011c3e
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = 351b15c78838f93fa4d413391b40541408f2ce98
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 48a0178377ff0610913487e1ee7032b198cd0437
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 363cefe2a4b5d1755b79bf5ed5b6561a3194bcb7
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = e8a0d9389f3ddd41f911e00f8ff62e214441296d
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 7c16ba866352f3a695a544094ca46f0f561c43c5
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 9f535e84c3e1ab5704b11e388ac240439a9900d6
+SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = 86d53010debaf2cc5c9793d83186db2db76b280f
+SHA1 (patch-lib_scudo_scudo__platform.h) = 68f33b18d913984c3a459597ef62f63d36184ca9
+SHA1 (patch-lib_tsan_CMakeLists.txt) = 4d8f8081ff2a3249565df26e67a35b5b3509e0b0
+SHA1 (patch-lib_xray_tests_CMakeLists.txt) = bb52916184d8e829395dd40d6d1b8b7eac40da92
+SHA1 (patch-test_asan_TestCases_intercept-rethrow-exception.cc) = 7edd6a5c5c00c067985f75ab2e2dc5e749204dcc
+SHA1 (patch-test_asan_TestCases_interception__failure__test.cc) = 0a359141e3c30b672842904b32d1542170b03ab1
+SHA1 (patch-test_msan_fork.cc) = dafca7816cf37b7c285637b54383254edfa6a345
diff --git a/compiler-rt-netbsd/patches/patch-CMakeLists.txt b/compiler-rt-netbsd/patches/patch-CMakeLists.txt
index f354f71c8e..eb08faf352 100644
--- a/compiler-rt-netbsd/patches/patch-CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- CMakeLists.txt.orig	2018-10-26 19:39:08.374027424 +0000
+--- CMakeLists.txt.orig	2018-10-30 08:42:09.431723770 +0000
 +++ CMakeLists.txt
-@@ -390,6 +390,10 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuch
+@@ -391,6 +391,10 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Fuch
    list(APPEND SANITIZER_COMMON_LINK_LIBS zircon)
  endif()
  
@@ -13,7 +13,7 @@ $NetBSD$
  if (SANITIZER_CXX_ABI_LIBNAME STREQUAL "libc++")
    if (SANITIZER_CXX_ABI_INTREE)
      if (NOT LIBCXXABI_ENABLE_STATIC_UNWINDER AND (TARGET unwind_shared OR HAVE_LIBUNWIND))
-@@ -432,7 +436,7 @@ foreach(path IN ITEMS ${LLVM_MAIN_SRC_DI
+@@ -433,7 +437,7 @@ foreach(path IN ITEMS ${LLVM_MAIN_SRC_DI
                        ${LLVM_MAIN_SRC_DIR}/../libcxx
                        ${LLVM_EXTERNAL_LIBCXX_SOURCE_DIR})
    if(IS_DIRECTORY ${path})
diff --git a/compiler-rt-netbsd/patches/patch-cmake_Modules_HandleCompilerRT.cmake b/compiler-rt-netbsd/patches/patch-cmake_Modules_HandleCompilerRT.cmake
index 2ebb0712ea..3c5f628c4e 100644
--- a/compiler-rt-netbsd/patches/patch-cmake_Modules_HandleCompilerRT.cmake
+++ b/compiler-rt-netbsd/patches/patch-cmake_Modules_HandleCompilerRT.cmake
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- cmake/Modules/HandleCompilerRT.cmake.orig	2018-10-26 19:41:21.261220908 +0000
+--- cmake/Modules/HandleCompilerRT.cmake.orig	2018-08-21 21:25:36.000000000 +0000
 +++ cmake/Modules/HandleCompilerRT.cmake
 @@ -1,5 +1,5 @@
  function(find_compiler_rt_library name variable)
diff --git a/compiler-rt-netbsd/patches/patch-lib_asan_asan__posix.cc b/compiler-rt-netbsd/patches/patch-lib_asan_asan__posix.cc
index 39cb34741a..aea86c1ee4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_asan_asan__posix.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_asan_asan__posix.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/asan/asan_posix.cc.orig	2018-10-26 19:38:24.429968751 +0000
+--- lib/asan/asan_posix.cc.orig	2018-08-21 21:25:41.000000000 +0000
 +++ lib/asan/asan_posix.cc
 @@ -40,31 +40,35 @@ void AsanOnDeadlySignal(int signo, void 
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp
index 71f305245e..0d2d810ed8 100644
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp
+++ b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerLoop.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/fuzzer/FuzzerLoop.cpp.orig	2018-10-26 19:38:37.382745571 +0000
+--- lib/fuzzer/FuzzerLoop.cpp.orig	2018-08-31 08:13:42.000000000 +0000
 +++ lib/fuzzer/FuzzerLoop.cpp
 @@ -275,7 +275,7 @@ NO_SANITIZE_MEMORY
  void Fuzzer::AlarmCallback() {
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 5a68e4642c..492285e811 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-10-26 19:38:37.388897610 +0000
+--- lib/fuzzer/tests/CMakeLists.txt.orig	2018-10-25 20:11:47.000000000 +0000
 +++ lib/fuzzer/tests/CMakeLists.txt
 @@ -13,6 +13,9 @@ add_custom_target(FuzzerUnitTests)
  set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
diff --git a/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc b/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
index 27dbfdd69a..b210d68c7b 100644
--- a/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/msan/msan_interceptors.cc.orig	2018-10-26 19:37:51.451921192 +0000
+--- lib/msan/msan_interceptors.cc.orig	2018-10-30 08:42:08.583936715 +0000
 +++ lib/msan/msan_interceptors.cc
-@@ -34,11 +34,13 @@
+@@ -34,6 +34,7 @@
  #include "sanitizer_common/sanitizer_libc.h"
  #include "sanitizer_common/sanitizer_linux.h"
  #include "sanitizer_common/sanitizer_tls_get_addr.h"
@@ -10,13 +10,7 @@ $NetBSD$
  
  #if SANITIZER_NETBSD
  #define fstat __fstat50
- #define gettimeofday __gettimeofday50
- #define getrusage __getrusage50
-+#define tzset __tzset50
- #endif
- 
- #include <stdarg.h>
-@@ -1069,6 +1071,18 @@ INTERCEPTOR(int, pthread_join, void *th,
+@@ -1070,6 +1071,18 @@ INTERCEPTOR(int, pthread_join, void *th,
  
  extern char *tzname[2];
  
@@ -35,7 +29,7 @@ $NetBSD$
  INTERCEPTOR(void, tzset, int fake) {
    ENSURE_MSAN_INITED();
    REAL(tzset)(fake);
-@@ -1078,29 +1092,85 @@ INTERCEPTOR(void, tzset, int fake) {
+@@ -1079,29 +1092,85 @@ INTERCEPTOR(void, tzset, int fake) {
      __msan_unpoison(tzname[1], REAL(strlen)(tzname[1]) + 1);
    return;
  }
@@ -124,7 +118,7 @@ $NetBSD$
  }
  
  static void BeforeFork() {
-@@ -1520,6 +1590,9 @@ namespace __msan {
+@@ -1521,6 +1590,9 @@ namespace __msan {
  void InitializeInterceptors() {
    static int inited = 0;
    CHECK_EQ(inited, 0);
@@ -134,7 +128,7 @@ $NetBSD$
    InitializeCommonInterceptors();
    InitializeSignalInterceptors();
  
-@@ -1629,6 +1702,7 @@ void InitializeInterceptors() {
+@@ -1630,6 +1702,7 @@ void InitializeInterceptors() {
  
    INTERCEPT_FUNCTION(pthread_join);
    INTERCEPT_FUNCTION(tzset);
diff --git a/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc b/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
index e8938bdd74..8c7e059cf7 100644
--- a/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_msan_msan__linux.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/msan/msan_linux.cc.orig	2018-10-26 19:37:51.625781767 +0000
+--- lib/msan/msan_linux.cc.orig	2018-08-21 21:25:44.000000000 +0000
 +++ lib/msan/msan_linux.cc
 @@ -31,6 +31,7 @@
  #include <sys/time.h>
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 29c2776a4a..97a62fd4c1 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-10-26 19:38:13.931205082 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-10-30 08:42:09.015511978 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -77,6 +77,11 @@
  #define ctime __ctime50
@@ -101,7 +101,7 @@ $NetBSD$
  #endif
  
  #if SANITIZER_INTERCEPT_SETPWENT
-@@ -3060,17 +3079,28 @@ INTERCEPTOR(int, sendmmsg, int fd, struc
+@@ -3062,17 +3081,28 @@ INTERCEPTOR(int, sendmmsg, int fd, struc
  #endif
  
  #if SANITIZER_INTERCEPT_GETPEERNAME
@@ -139,7 +139,7 @@ $NetBSD$
    return res;
  }
  #define INIT_GETPEERNAME COMMON_INTERCEPT_FUNCTION(getpeername);
-@@ -4240,7 +4270,7 @@ INTERCEPTOR(int, fstatfs64, int fd, void
+@@ -4242,7 +4272,7 @@ INTERCEPTOR(int, fstatfs64, int fd, void
  #endif
  
  #if SANITIZER_INTERCEPT_STATVFS
@@ -148,7 +148,7 @@ $NetBSD$
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, statvfs, path, buf);
    if (path) COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1);
-@@ -4819,6 +4849,14 @@ INTERCEPTOR(float, remquof, float x, flo
+@@ -4821,6 +4851,14 @@ INTERCEPTOR(float, remquof, float x, flo
    if (quo) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, quo, sizeof(*quo));
    return res;
  }
@@ -163,7 +163,7 @@ $NetBSD$
  INTERCEPTOR(long double, remquol, long double x, long double y, int *quo) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, remquol, x, y, quo);
-@@ -4829,12 +4867,10 @@ INTERCEPTOR(long double, remquol, long d
+@@ -4831,12 +4869,10 @@ INTERCEPTOR(long double, remquol, long d
    if (quo) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, quo, sizeof(*quo));
    return res;
  }
@@ -178,7 +178,7 @@ $NetBSD$
  #endif
  
  #if SANITIZER_INTERCEPT_LGAMMA
-@@ -4853,6 +4889,14 @@ INTERCEPTOR(float, lgammaf, float x) {
+@@ -4855,6 +4891,14 @@ INTERCEPTOR(float, lgammaf, float x) {
    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, &signgam, sizeof(signgam));
    return res;
  }
@@ -193,7 +193,7 @@ $NetBSD$
  INTERCEPTOR(long double, lgammal, long double x) {
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, lgammal, x);
-@@ -4860,12 +4904,10 @@ INTERCEPTOR(long double, lgammal, long d
+@@ -4862,12 +4906,10 @@ INTERCEPTOR(long double, lgammal, long d
    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, &signgam, sizeof(signgam));
    return res;
  }
@@ -209,7 +209,7 @@ $NetBSD$
  #endif
  
  #if SANITIZER_INTERCEPT_LGAMMA_R
-@@ -7235,6 +7277,1602 @@ INTERCEPTOR(struct __sanitizer_netent *,
+@@ -7237,6 +7279,1602 @@ INTERCEPTOR(struct __sanitizer_netent *,
  #define INIT_NETENT
  #endif
  
@@ -1812,7 +1812,7 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7299,6 +8937,8 @@ static void InitializeCommonInterceptors
+@@ -7301,6 +8939,8 @@ static void InitializeCommonInterceptors
    INIT_GETPWENT;
    INIT_FGETPWENT;
    INIT_GETPWENT_R;
@@ -1821,7 +1821,7 @@ $NetBSD$
    INIT_SETPWENT;
    INIT_CLOCK_GETTIME;
    INIT_GETITIMER;
-@@ -7408,7 +9048,9 @@ static void InitializeCommonInterceptors
+@@ -7410,7 +9050,9 @@ static void InitializeCommonInterceptors
    INIT_PTHREAD_GETNAME_NP;
    INIT_SINCOS;
    INIT_REMQUO;
@@ -1831,7 +1831,7 @@ $NetBSD$
    INIT_LGAMMA_R;
    INIT_LGAMMAL_R;
    INIT_DRAND48_R;
-@@ -7484,6 +9126,30 @@ static void InitializeCommonInterceptors
+@@ -7486,6 +9128,30 @@ static void InitializeCommonInterceptors
    INIT_TTYENT;
    INIT_PROTOENT;
    INIT_NETENT;
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
index 93d9d491bc..1eaab1514c 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc.orig	2018-10-26 19:38:13.731945818 +0000
+--- lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc.orig	2018-08-21 21:25:40.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
 @@ -672,14 +672,6 @@ static void ioctl_table_fill() {
    _(BIOCGRTIMEOUT, WRITE, struct_timeval_sz);
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 1e1cc2932a..0edac63440 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-10-26 19:38:13.650604405 +0000
+--- lib/sanitizer_common/sanitizer_internal_defs.h.orig	2018-09-26 10:51:27.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_internal_defs.h
 @@ -196,7 +196,9 @@ typedef u64 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__libcdep.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
index 150a5b2872..66b8130e9f 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_linux_libcdep.cc.orig	2018-10-26 19:38:23.525251811 +0000
+--- lib/sanitizer_common/sanitizer_linux_libcdep.cc.orig	2018-10-30 08:42:08.339073152 +0000
 +++ lib/sanitizer_common/sanitizer_linux_libcdep.cc
 @@ -25,6 +25,7 @@
  #include "sanitizer_freebsd.h"
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 78ad17a533..547290b1fe 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-10-26 19:38:22.451626392 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-08-21 21:25:40.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
 @@ -207,9 +207,13 @@
  #define SANITIZER_INTERCEPT_GETPWENT                                          \
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 f460add1e0..5836777228 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-10-26 19:38:22.297584747 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-08-21 21:25:40.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
 @@ -15,9 +15,15 @@
  #include "sanitizer_platform.h"
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 61cefc9393..28bd3cd409 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-10-26 19:38:23.831747259 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-08-21 21:25:38.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
 @@ -60,6 +60,15 @@ extern unsigned struct_timespec_sz;
  extern unsigned struct_sembuf_sz;
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
index 39ea754850..13e934cb79 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2018-10-26 19:38:08.580505412 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2018-09-26 10:51:26.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_posix.cc
 @@ -945,6 +945,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
index fcedd6fa60..f1d3e332ff 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2018-10-26 19:38:24.423161043 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2018-08-21 21:25:39.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_posix.h
 @@ -1504,6 +1504,7 @@ struct __sanitizer_cookie_io_functions_t
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
index b5192a2c5f..8d9d103baa 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cc.orig	2018-10-26 19:38:22.479902612 +0000
+--- lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cc.orig	2018-08-21 21:25:40.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cc
 @@ -97,7 +97,7 @@ uptr Unwind_GetIP(struct _Unwind_Context
    // Clear the Thumb bit.
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 735d6caac1..4cabee2f3d 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-10-26 19:38:04.308065269 +0000
+--- lib/scudo/scudo_platform.h.orig	2018-08-21 21:25:38.000000000 +0000
 +++ lib/scudo/scudo_platform.h
 @@ -17,7 +17,7 @@
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt
index e63e6b5fd3..4a288a28aa 100644
--- a/compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_tsan_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/tsan/CMakeLists.txt.orig	2018-10-26 19:37:55.830797558 +0000
+--- lib/tsan/CMakeLists.txt.orig	2018-09-26 10:51:27.000000000 +0000
 +++ lib/tsan/CMakeLists.txt
 @@ -224,7 +224,7 @@ endif()
  # in the base system due to incompatibilities between FreeBSD's and Clang's
diff --git a/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
index 00f53bab46..236cad85e4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/xray/tests/CMakeLists.txt.orig	2018-10-26 19:38:30.564890159 +0000
+--- lib/xray/tests/CMakeLists.txt.orig	2018-10-01 21:40:24.000000000 +0000
 +++ lib/xray/tests/CMakeLists.txt
 @@ -70,6 +70,7 @@ if (NOT APPLE)
      list(APPEND XRAY_UNITTEST_LINK_FLAGS -lLLVMXRay -lLLVMSupport -lLLVMTestingSupport)
diff --git a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_intercept-rethrow-exception.cc b/compiler-rt-netbsd/patches/patch-test_asan_TestCases_intercept-rethrow-exception.cc
index 70afea11ee..38d58ff0c6 100644
--- a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_intercept-rethrow-exception.cc
+++ b/compiler-rt-netbsd/patches/patch-test_asan_TestCases_intercept-rethrow-exception.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/asan/TestCases/intercept-rethrow-exception.cc.orig	2018-10-26 19:39:54.839975610 +0000
+--- test/asan/TestCases/intercept-rethrow-exception.cc.orig	2018-10-25 20:11:47.000000000 +0000
 +++ test/asan/TestCases/intercept-rethrow-exception.cc
 @@ -8,6 +8,9 @@
  // combination of libraries that are not used by default on NetBSD
diff --git a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_interception__failure__test.cc b/compiler-rt-netbsd/patches/patch-test_asan_TestCases_interception__failure__test.cc
index f8dfd554e9..36abb20d49 100644
--- a/compiler-rt-netbsd/patches/patch-test_asan_TestCases_interception__failure__test.cc
+++ b/compiler-rt-netbsd/patches/patch-test_asan_TestCases_interception__failure__test.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/asan/TestCases/interception_failure_test.cc.orig	2018-10-26 19:39:55.142092080 +0000
+--- test/asan/TestCases/interception_failure_test.cc.orig	2018-08-21 21:25:31.000000000 +0000
 +++ test/asan/TestCases/interception_failure_test.cc
 @@ -5,7 +5,7 @@
  // RUN: %clangxx_asan -O1 %s -o %t && %run %t 2>&1 | FileCheck %s
diff --git a/compiler-rt-netbsd/patches/patch-test_msan_fork.cc b/compiler-rt-netbsd/patches/patch-test_msan_fork.cc
index b59255d267..7504b7e8e0 100644
--- a/compiler-rt-netbsd/patches/patch-test_msan_fork.cc
+++ b/compiler-rt-netbsd/patches/patch-test_msan_fork.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/msan/fork.cc.orig	2018-10-26 19:41:04.814752153 +0000
+--- test/msan/fork.cc.orig	2018-10-25 20:11:47.000000000 +0000
 +++ test/msan/fork.cc
 @@ -17,6 +17,9 @@
  // Sometimes hangs
diff --git a/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk b/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk
deleted file mode 100644
index 5282623cec..0000000000
--- a/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
---- utils/generate_netbsd_ioctls.awk.orig	2018-10-26 19:41:22.632082148 +0000
-+++ utils/generate_netbsd_ioctls.awk
-@@ -314,6 +314,7 @@ FNR == 1 {
-       $0 ~ /PRIQ_IF_DETACH/ ||
-       $0 ~ /PRIQ_ENABLE/ ||
-       $0 ~ /WFQ_IF_ATTACH/ ||
-+      $0 ~ /POWER_IOC_GET_TYPE_WITH_LOSSAGE/ ||
-       $0 ~ /HFSC_DEL_FILTER/) {
-     # There are entries with duplicate codes.. disable the less used ones
-     next
-@@ -345,17 +346,12 @@ FNR == 1 {
- 
-   # This !NONE check allows to skip some unparsable entries
-   if (ioctl_mode[ioctl_table_max] != "NONE") {
--    # special cases first
--    if ($0 ~ /POWER_IOC_GET_TYPE_WITH_LOSSAGE/) {
--      ioctl_type[ioctl_table_max] = "sizeof(uptr)"
--    } else {
--      n = split($0, a, ",")
--      if (n == 3) {
--        gsub(/^[ ]+/, "", a[3])
--        match(a[3], /[a-zA-Z0-9_* ]+/)
--        type = get_type(substr(a[3], 0, RLENGTH))
--        ioctl_type[ioctl_table_max] = type
--      }
-+    n = split($0, a, ",")
-+    if (n == 3) {
-+      gsub(/^[ ]+/, "", a[3])
-+      match(a[3], /[a-zA-Z0-9_* ]+/)
-+      type = get_type(substr(a[3], 0, RLENGTH))
-+      ioctl_type[ioctl_table_max] = type
-     }
-   }
- 


Home | Main Index | Thread Index | Old Index