pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

compiler-rt-netbsd: fix semaphore usages



Module Name:	pkgsrc-wip
Committed By:	Yang Zheng <tomsun.0.7%gmail.com@localhost>
Pushed By:	tomsun.0.7
Date:		Fri May 4 08:25:00 2018 +0000
Changeset:	6206caab736c46a3b7b41d5a7483557caac016c7

Modified Files:
	compiler-rt-netbsd/TODO.fuzzer
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
	compiler-rt-netbsd/patches/patch-lib_asan_asan__posix.cc
	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__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-lib_sanitizer__common_sanitizer__procmaps__bsd.cc
	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-test_lsan_lit.common.cfg
	compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
Added Files:
	compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp
	compiler-rt-netbsd/patches/patch-test_fuzzer_equivalence-signals.test
Removed Files:
	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: fix semaphore usages

Three improper semaphore usages in libFuzzer has been fixed:
1. Using "(void *)-1" instead of "SEM_FAILED" to check failure;
2. Using semaphore name which does not start with slash("/");
3. Using "run_equivalencd_server" parameter which is too long for NetBSD due to semaphore name limit (SEM_MAX_NAMELEN).

Currently the equivalence.test and equivalence-signals.test can pass in check-fuzzer.

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

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

diffstat:
 compiler-rt-netbsd/TODO.fuzzer                     | 33 ++++----------------
 compiler-rt-netbsd/distinfo                        | 36 +++++++++++-----------
 .../patches/patch-cmake_config-ix.cmake            |  6 ++--
 .../patches/patch-lib_asan_asan__posix.cc          |  2 +-
 .../patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp  | 33 ++++++++++++++++++++
 .../patches/patch-lib_fuzzer_tests_CMakeLists.txt  |  2 +-
 .../patches/patch-lib_msan_msan__interceptors.cc   | 10 +++---
 .../patches/patch-lib_msan_msan__linux.cc          |  2 +-
 ...zer__common_sanitizer__common__interceptors.inc |  8 ++---
 ...b_sanitizer__common_sanitizer__internal__defs.h |  4 +--
 ...patch-lib_sanitizer__common_sanitizer__linux.cc |  2 +-
 ...zer__common_sanitizer__platform__interceptors.h |  4 +--
 ...__common_sanitizer__platform__limits__netbsd.cc |  4 +--
 ...r__common_sanitizer__platform__limits__netbsd.h |  6 ++--
 ...b_sanitizer__common_sanitizer__procmaps__bsd.cc |  2 +-
 ...er__common_sanitizer__unwind__linux__libcdep.cc |  2 +-
 .../patches/patch-lib_scudo_scudo__platform.h      |  2 +-
 .../patch-test_fuzzer_equivalence-signals.test     | 14 +++++++++
 .../patches/patch-test_lsan_lit.common.cfg         |  2 +-
 ...sanitizer__common_TestCases_NetBSD_kvm__open.cc | 18 -----------
 ...izer__common_TestCases_NetBSD_kvm__openfiles.cc | 18 -----------
 .../patches/patch-test_scudo_lit.cfg               |  2 +-
 22 files changed, 101 insertions(+), 111 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/TODO.fuzzer b/compiler-rt-netbsd/TODO.fuzzer
index af205b1bfb..32456e5ad7 100644
--- a/compiler-rt-netbsd/TODO.fuzzer
+++ b/compiler-rt-netbsd/TODO.fuzzer
@@ -16,12 +16,10 @@ Do we need llvm-cov for libFuzzer?
 $ make check-fuzzer
 
 ********************
-Testing Time: 694.80s
+Testing Time: 328.39s
 ********************
-Failing Tests (21):
+Failing Tests (19):
     LLVMFuzzer :: cxxstring.test
-    LLVMFuzzer :: equivalence-signals.test
-    LLVMFuzzer :: equivalence.test
     LLVMFuzzer :: fuzzer-leak.test
     LLVMFuzzer :: fuzzer-oom.test
     LLVMFuzzer :: fuzzer-timeout.test
@@ -41,9 +39,10 @@ Failing Tests (21):
     LLVMFuzzer :: value-profile-strcmp.test
     LLVMFuzzer :: value-profile-strncmp.test
 
-  Expected Passes    : 87
+  Expected Passes    : 90
   Unsupported Tests  : 6
-  Unexpected Failures: 21
+  Unexpected Failures: 19
+
 
 libFuzzer Failed cases (make check-fuzzer):
 I. kernel panic
@@ -57,25 +56,5 @@ II. hangs
 
   workaround: kill with pkill(1) or kill(1)
 
-III. *semaphore* NULL pointer error
-  Description:
-    This category results from null pointer error in semaphore interfaces like sem_unlink or sem_trywait from shared library libpthread.so.
-    Error log:
-      ==23411==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000000 (pc 0x7b6db2206a0e bp 0x7f7fff62f340 sp 0x7f7fff62f288 T0)
-      ==23411==The signal is caused by a READ memory access.
-      ==23411==Hint: address points to the zero page.
-        #0 0x7b6db2206a0d in sem_unlink (/usr/lib/libpthread.so.1+0x6a0d)
-        #1 0x424ff4 in WaitClient /public/llvm/projects/compiler-rt/lib/fuzzer/FuzzerShmem.h:32:22
-    	#2 0x424ff4 in fuzzer::FuzzerDriver(int*, char***, int (*)(unsigned char const*, unsigned long)) /public/llvm/projects/compiler-rt/lib/fuzzer/FuzzerDriver.cpp:676
-    	#3 0x43d472 in main /public/llvm/projects/compiler-rt/lib/fuzzer/FuzzerMain.cpp:20:10
- 	#4 0x41f2b5 in ___start (/public/llvm-build/projects/compiler-rt/test/fuzzer/Output/equivalence.test.tmp-EquivalenceATest+0x41f2b5)
-
-  Test cases:
-    equivalence-signals.test
-    equivalence.test
-  Reproduce:
-    clang --driver-mode=g++ -std=c++11 -lstdc++ -O2 -gline-tables-only -fsanitize=address,fuzzer EquivalenceATest.cpp
-    ./a.out -run_equivalence_server=EQUIV_SIG_TEST
-
-IV. Unknown
+III. Unknown
   the rest
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 977a8f3ae8..149a4813aa 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -1,20 +1,20 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
-SHA1 (patch-cmake_config-ix.cmake) = 720ede87150ae1ac59d8415c77644d917da9cd16
-SHA1 (patch-lib_asan_asan__posix.cc) = 0f596061c078eaab0b5b4b183550aa7820677f46
-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) = 3fb4836fb665a272094bbb0a9026b21b293f9a0a
-SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = bd972f5a18ffd76662b161515b31fe4940abbb5a
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 0ea2f811b94e8bc3aff929d0671c0d56376972b1
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = c11001b5e4f99d340fea4c661c51a14d4e5c61d6
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 92c7aad101270b8403fcc7faf553d13210402f13
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 1c8e35603d97b8dc86f991feebb11276e1310115
-SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc) = 8b629840ff7f56c670d322a9dbbdf7e33ce90cb5
-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) = ab092ca89d13e8d65c590c96bde7fd63979eee83
-SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc) = 620a4fadd4447d390db2bff81b1d5758409bbdb5
-SHA1 (patch-test_scudo_lit.cfg) = 35e4f0524a8fd26e90e5d968b73d75f277da3779
+SHA1 (patch-cmake_config-ix.cmake) = c67b7b096926a6c515ccd2b074527b75cf8c7b48
+SHA1 (patch-lib_asan_asan__posix.cc) = 7722d9789e463b06aa3b271584507c24fb76b59d
+SHA1 (patch-lib_fuzzer_FuzzerShmemPosix.cpp) = e8e5ebeb03e2fcf1773f5979e4966386d80c742a
+SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 2e8b9ce5dd468fef6c774c40da8cc29d7dadf744
+SHA1 (patch-lib_msan_msan__interceptors.cc) = 4c925295c34b7945d7d64bba421e8d2f62022248
+SHA1 (patch-lib_msan_msan__linux.cc) = d343f2286f248921859ae0b06c42919c8fbd69b8
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 6cf85b551f35106b38b90191d9329ce57a95234f
+SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = ecfd60810adbac4e5700e5b61fe23987685465b3
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = ac6194df3380f084e42802aa3349aadeed1cb8f8
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 84b805965de62b9e8ef3a9457ec8fdf12359e031
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = dcfa389e4be13a67354eac93e1e9b7127c861d09
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 1a7eb6c97cb69fc7ccfffe77703938138e941ab0
+SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc) = bbab1a3f78ab04b72b612a7bc028ed1fde3aaf92
+SHA1 (patch-lib_sanitizer__common_sanitizer__unwind__linux__libcdep.cc) = 0e911b8328ff3e5f041675d62425c2dff5e60511
+SHA1 (patch-lib_scudo_scudo__platform.h) = c978a609763a1acc197058c9f127f049fa336aae
+SHA1 (patch-test_fuzzer_equivalence-signals.test) = 51540aac4a065e05c8c1e834717c53a83c0f2cd9
+SHA1 (patch-test_lsan_lit.common.cfg) = 7a768835f358adc0cbd81e22b024e3e6f3d53ce5
+SHA1 (patch-test_scudo_lit.cfg) = 99e5a8140bc42cc6ef44b3a31d9932115b4a0070
diff --git a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
index 1a2a6ea96f..bd89dc9c17 100644
--- a/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
+++ b/compiler-rt-netbsd/patches/patch-cmake_config-ix.cmake
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- cmake/config-ix.cmake.orig	2018-02-19 18:40:37.000000000 +0000
+--- cmake/config-ix.cmake.orig	2018-05-04 08:00:10.159967293 +0000
 +++ cmake/config-ix.cmake
-@@ -542,7 +542,7 @@ else()
+@@ -551,7 +551,7 @@ else()
  endif()
  
  if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
@@ -11,7 +11,7 @@ $NetBSD$
    set(COMPILER_RT_HAS_PROFILE TRUE)
  else()
    set(COMPILER_RT_HAS_PROFILE FALSE)
-@@ -590,7 +590,7 @@ else()
+@@ -599,7 +599,7 @@ else()
  endif()
  
  if (COMPILER_RT_HAS_SANITIZER_COMMON AND SCUDO_SUPPORTED_ARCH AND
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 91acb1083e..df456d4496 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-02-01 23:46:05.000000000 +0000
+--- lib/asan/asan_posix.cc.orig	2018-05-04 08:00:20.277669793 +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_FuzzerShmemPosix.cpp b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp
new file mode 100644
index 0000000000..df57528c1a
--- /dev/null
+++ b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp
@@ -0,0 +1,33 @@
+$NetBSD$
+
+--- lib/fuzzer/FuzzerShmemPosix.cpp.orig	2018-05-04 08:00:20.583688133 +0000
++++ lib/fuzzer/FuzzerShmemPosix.cpp
+@@ -32,6 +32,8 @@ std::string SharedMemoryRegion::Path(con
+ 
+ std::string SharedMemoryRegion::SemName(const char *Name, int Idx) {
+   std::string Res(Name);
++  if (!Res.empty() && Res[0] != '/')
++    Res.insert(Res.begin(), '/');
+   return Res + (char)('0' + Idx);
+ }
+ 
+@@ -52,8 +54,9 @@ bool SharedMemoryRegion::Create(const ch
+   for (int i = 0; i < 2; i++) {
+     sem_unlink(SemName(Name, i).c_str());
+     Semaphore[i] = sem_open(SemName(Name, i).c_str(), O_CREAT, 0644, 0);
+-    if (Semaphore[i] == (void *)-1)
++    if (Semaphore[i] == SEM_FAILED) {
+       return false;
++    }
+   }
+   IAmServer = true;
+   return true;
+@@ -70,7 +73,7 @@ bool SharedMemoryRegion::Open(const char
+     return false;
+   for (int i = 0; i < 2; i++) {
+     Semaphore[i] = sem_open(SemName(Name, i).c_str(), 0);
+-    if (Semaphore[i] == (void *)-1)
++    if (Semaphore[i] == SEM_FAILED)
+       return false;
+   }
+   IAmServer = false;
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 a549559baf..d7ea6a9cab 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-02-01 23:46:06.000000000 +0000
+--- lib/fuzzer/tests/CMakeLists.txt.orig	2018-05-04 08:00:20.295801193 +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_msan_msan__interceptors.cc b/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
index 93e6c8a576..bd344f9a59 100644
--- a/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_msan_msan__interceptors.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/msan/msan_interceptors.cc.orig	2018-02-20 18:23:53.000000000 +0000
+--- lib/msan/msan_interceptors.cc.orig	2018-05-04 08:00:27.417464903 +0000
 +++ lib/msan/msan_interceptors.cc
 @@ -33,11 +33,13 @@
  #include "sanitizer_common/sanitizer_libc.h"
@@ -16,7 +16,7 @@ $NetBSD$
  #endif
  
  #include <stdarg.h>
-@@ -1130,6 +1132,18 @@ INTERCEPTOR(int, pthread_join, void *th,
+@@ -1074,6 +1076,18 @@ INTERCEPTOR(int, pthread_join, void *th,
  
  extern char *tzname[2];
  
@@ -35,7 +35,7 @@ $NetBSD$
  INTERCEPTOR(void, tzset, int fake) {
    ENSURE_MSAN_INITED();
    REAL(tzset)(fake);
-@@ -1139,29 +1153,85 @@ INTERCEPTOR(void, tzset, int fake) {
+@@ -1083,29 +1097,85 @@ INTERCEPTOR(void, tzset, int fake) {
      __msan_unpoison(tzname[1], REAL(strlen)(tzname[1]) + 1);
    return;
  }
@@ -124,7 +124,7 @@ $NetBSD$
  }
  
  static void BeforeFork() {
-@@ -1574,6 +1644,9 @@ namespace __msan {
+@@ -1524,6 +1594,9 @@ namespace __msan {
  void InitializeInterceptors() {
    static int inited = 0;
    CHECK_EQ(inited, 0);
@@ -134,7 +134,7 @@ $NetBSD$
    InitializeCommonInterceptors();
    InitializeSignalInterceptors();
  
-@@ -1689,6 +1762,7 @@ void InitializeInterceptors() {
+@@ -1634,6 +1707,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 9d80fab403..82d516a7f7 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-02-01 23:45:59.000000000 +0000
+--- lib/msan/msan_linux.cc.orig	2018-05-04 08:00:26.914805073 +0000
 +++ lib/msan/msan_linux.cc
 @@ -30,6 +30,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 c2e767257f..5ef38cc731 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,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-02-27 02:50:00.133153771 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-05-04 08:00:15.541116903 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
-@@ -76,6 +76,11 @@
+@@ -77,6 +77,11 @@
  #define ctime __ctime50
  #define ctime_r __ctime_r50
  #define devname __devname50
@@ -14,7 +14,7 @@ $NetBSD$
  #define getitimer __getitimer50
  #define getpwent __getpwent50
  #define getpwnam __getpwnam50
-@@ -7025,6 +7030,625 @@ INTERCEPTOR(struct __sanitizer_netent *,
+@@ -7161,6 +7166,625 @@ INTERCEPTOR(struct __sanitizer_netent *,
  #define INIT_NETENT
  #endif
  
@@ -640,7 +640,7 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7258,6 +7882,11 @@ static void InitializeCommonInterceptors
+@@ -7402,6 +8026,11 @@ static void InitializeCommonInterceptors
    INIT_TTYENT;
    INIT_PROTOENT;
    INIT_NETENT;
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 0246e6f7ed..c8d6b7341a 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,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_internal_defs.h.orig	2018-02-25 10:48:27.000000000 +0000
+--- lib/sanitizer_common/sanitizer_internal_defs.h.orig	2018-05-04 08:00:18.006055373 +0000
 +++ lib/sanitizer_common/sanitizer_internal_defs.h
-@@ -189,7 +189,9 @@ typedef uptr tid_t;
+@@ -186,7 +186,9 @@ typedef u64 tid_t;
  // This header should NOT include any other headers to avoid portability issues.
  
  // Common defs.
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 e3c541deeb..01304f2471 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-04-25 21:13:40.388126746 +0000
+--- lib/sanitizer_common/sanitizer_linux.cc.orig	2018-05-04 08:00:15.553459333 +0000
 +++ lib/sanitizer_common/sanitizer_linux.cc
 @@ -93,6 +93,7 @@ extern "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 ed1c3b549d..b6a683caf8 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,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-02-27 02:50:00.133595047 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-05-04 08:00:15.557522313 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -465,4 +465,10 @@
+@@ -495,4 +495,10 @@
  #define SANITIZER_INTERCEPT_PROTOENT SI_NETBSD
  #define SANITIZER_INTERCEPT_NETENT 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 de1c4f1b43..48cd56435e 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-27 02:50:00.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-05-04 08:00:15.526146093 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
 @@ -15,9 +15,15 @@
  #include "sanitizer_platform.h"
@@ -48,7 +48,7 @@ $NetBSD$
  unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
  unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
  unsigned struct_timex_sz = sizeof(struct timex);
-@@ -341,6 +354,9 @@ unsigned path_max = PATH_MAX;
+@@ -339,6 +352,9 @@ unsigned path_max = PATH_MAX;
  
  int struct_ttyent_sz = sizeof(struct ttyent);
  
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 0f91b7f8c4..69ea8448dc 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-27 02:50:00.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-05-04 08:00:15.477300193 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
 @@ -60,6 +60,15 @@ extern unsigned struct_timespec_sz;
  extern unsigned struct_sembuf_sz;
@@ -28,7 +28,7 @@ $NetBSD$
  extern int ptrace_pt_io;
  extern int ptrace_pt_lwpinfo;
  extern int ptrace_pt_set_event_mask;
-@@ -398,6 +410,7 @@ extern int ptrace_pt_getfpregs;
+@@ -396,6 +408,7 @@ extern int ptrace_pt_getfpregs;
  extern int ptrace_pt_setdbregs;
  extern int ptrace_pt_getdbregs;
  
@@ -36,7 +36,7 @@ $NetBSD$
  struct __sanitizer_ptrace_io_desc {
    int piod_op;
    void *piod_offs;
-@@ -462,6 +475,43 @@ struct __sanitizer_ttyent {
+@@ -460,6 +473,43 @@ struct __sanitizer_ttyent {
    char *ty_class;
  };
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc
index 3caee22a2f..65b4a37353 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_procmaps_bsd.cc.orig	2018-04-25 21:13:40.000000000 +0000
+--- lib/sanitizer_common/sanitizer_procmaps_bsd.cc.orig	2018-05-04 08:00:15.481287563 +0000
 +++ lib/sanitizer_common/sanitizer_procmaps_bsd.cc
 @@ -19,6 +19,10 @@
  #endif
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 85b2dc39d1..9f4c25309c 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-02-01 23:46:05.000000000 +0000
+--- lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cc.orig	2018-05-04 08:00:15.561205773 +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 b10883f4be..ad1a07e6e5 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-02-01 23:46:04.000000000 +0000
+--- lib/scudo/scudo_platform.h.orig	2018-05-04 08:00:13.523354513 +0000
 +++ lib/scudo/scudo_platform.h
 @@ -17,7 +17,7 @@
  
diff --git a/compiler-rt-netbsd/patches/patch-test_fuzzer_equivalence-signals.test b/compiler-rt-netbsd/patches/patch-test_fuzzer_equivalence-signals.test
new file mode 100644
index 0000000000..6c34f6cdaa
--- /dev/null
+++ b/compiler-rt-netbsd/patches/patch-test_fuzzer_equivalence-signals.test
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- test/fuzzer/equivalence-signals.test.orig	2018-05-04 07:59:26.951280343 +0000
++++ test/fuzzer/equivalence-signals.test
+@@ -7,7 +7,7 @@ UNSUPPORTED: freebsd
+ UNSUPPORTED: darwin
+ 
+ RUN: %cpp_compiler %S/EquivalenceATest.cpp -o %t-EquivalenceATest
+-RUN: %t-EquivalenceATest -timeout=1 -run_equivalence_server=EQUIV_SIG_TEST & export APID=$!
++RUN: %t-EquivalenceATest -timeout=1 -run_equivalence_server=EQ_SIG_TEST & export APID=$!
+ RUN: sleep 3
+-RUN: %t-EquivalenceATest -timeout=1 -use_equivalence_server=EQUIV_SIG_TEST -runs=500000 2>&1
++RUN: %t-EquivalenceATest -timeout=1 -use_equivalence_server=EQ_SIG_TEST -runs=500000 2>&1
+ RUN: kill -9 $APID
diff --git a/compiler-rt-netbsd/patches/patch-test_lsan_lit.common.cfg b/compiler-rt-netbsd/patches/patch-test_lsan_lit.common.cfg
index 3c065eeec9..30f4421e0f 100644
--- a/compiler-rt-netbsd/patches/patch-test_lsan_lit.common.cfg
+++ b/compiler-rt-netbsd/patches/patch-test_lsan_lit.common.cfg
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/lsan/lit.common.cfg.orig	2018-02-01 23:45:50.000000000 +0000
+--- test/lsan/lit.common.cfg.orig	2018-05-04 07:59:35.651438853 +0000
 +++ test/lsan/lit.common.cfg
 @@ -67,10 +67,10 @@ config.substitutions.append( ("%clangxx 
  config.substitutions.append( ("%clang_lsan ", build_invocation(clang_lsan_cflags)) )
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
deleted file mode 100644
index b3b37c9b61..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
---- 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
-+
-+#include <fcntl.h>
-+#include <kvm.h>
-+
-+int main(void) {
-+  kvm_t K;
-+
-+  K = kvm_open(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open");
-+  kvm_close(&K);
-+
-+  return 0;
-+}
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
deleted file mode 100644
index 32aa7d92ba..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_sanitizer__common_TestCases_NetBSD_kvm__openfiles.cc
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
---- 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
-+
-+#include <fcntl.h>
-+#include <kvm.h>
-+
-+int main(void) {
-+  kvm_t K;
-+
-+  K = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, "kvm_open");
-+  kvm_close(&K);
-+
-+  return 0;
-+}
diff --git a/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg b/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
index 9c67ac91e7..94d8eeea64 100644
--- a/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
+++ b/compiler-rt-netbsd/patches/patch-test_scudo_lit.cfg
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- test/scudo/lit.cfg.orig	2018-02-01 23:45:54.000000000 +0000
+--- test/scudo/lit.cfg.orig	2018-05-04 07:59:57.577602353 +0000
 +++ test/scudo/lit.cfg
 @@ -21,9 +21,11 @@ c_flags = ([config.target_cflags] +
             "-pie",


Home | Main Index | Thread Index | Old Index