compiler-rt-netbsd: Upgrade to SVN r. 332053

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Upgrade to SVN r. 332053
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Thu, 10 May 2018 23:18:45 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri May 11 01:18:45 2018 +0200
Changeset:	10b5b20477ed36f7eb6749147693773619454cf7

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
Removed Files:
	compiler-rt-netbsd/patches/patch-lib_asan_asan__mapping.h
	compiler-rt-netbsd/patches/patch-test_fuzzer_equivalence-signals.test
	compiler-rt-netbsd/patches/patch-test_lit.common.cfg

Log Message:
compiler-rt-netbsd: Upgrade to SVN r. 332053

Patches merged upstream:
r332051 - Enable SANITIZER_INTERCEPTOR_HOOKS for NetBSD
r332035 - Setup ORIGIN/NetBSD option in sanitizer tests
r332027 - Register NetBSD/i386 in asan_mapping.h
D46622: wrong usages of sem_open in the libFuzzer

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=10b5b20477ed36f7eb6749147693773619454cf7

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                        |  7 ++---
 .../patches/patch-lib_asan_asan__mapping.h         | 35 ----------------------
 .../patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp  | 29 ------------------
 ...zer__common_sanitizer__platform__interceptors.h | 14 ++-------
 .../patch-test_fuzzer_equivalence-signals.test     | 14 ---------
 .../patches/patch-test_lit.common.cfg              | 13 --------
 7 files changed, 5 insertions(+), 109 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 31f5265242..1b25f0be66 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=	330862
+SVN_REVISION.compiler-rt=	332053
 
 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 8a48b8ce35..8b41e8cd24 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -2,11 +2,10 @@ $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
 SHA1 (patch-CMakeLists.txt) = f84dd8cb370dce65de45e089d85598f15774fa18
 SHA1 (patch-cmake_config-ix.cmake) = 91ffb8c1e65394c7c6e9956379373b28348e3f1f
-SHA1 (patch-lib_asan_asan__mapping.h) = 1975314eb61f14b9fabbcfee20de63dc724d809c
 SHA1 (patch-lib_asan_asan__posix.cc) = 0f596061c078eaab0b5b4b183550aa7820677f46
 SHA1 (patch-lib_asan_asan__thread.cc) = 6408c904c1f3adbebff56aaf63f953f5b8b02bef
 SHA1 (patch-lib_fuzzer_FuzzerLoop.cpp) = fe6804c47064d10f311082a919ce84ebcd19bb4b
-SHA1 (patch-lib_fuzzer_FuzzerShmemPosix.cpp) = e2540a9385d641c77a2b5da49a2ac66313db8a94
+SHA1 (patch-lib_fuzzer_FuzzerShmemPosix.cpp) = adc83b19e793491b1c6ea0fd8b46cd9f32e592fc
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 0e559ebb791942cba9c83f3098d7752f91e1f187
 SHA1 (patch-lib_msan_msan__interceptors.cc) = 79bfe137923597d79bb467d0f282d57221079a85
 SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
@@ -14,7 +13,7 @@ SHA1 (patch-lib_msan_tests_msan__test.cc) = 8f0a40c51a200f5de107cac5bd47db87aeff
 SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = a89e76e65e7aa735e4f796505917b4993ccc2662
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 91f645a6652d895e97b0aefbb62d80e680cd2c39
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = e4c889d8c140b06cb62429b37d56eca88feaaf03
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 68b2c9a1cb019c41d4e7eccadc47f891e7cbb4e9
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = d385bfc1df8e6e8bec28f29dc7b9ee403a8101f5
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 0a5d94fff8dfe8cf62bcf2e269e33d52f8ac5137
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = a5036c0da703ad178daded1994008756dcc99cf1
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc) = 8b629840ff7f56c670d322a9dbbdf7e33ce90cb5
@@ -24,8 +23,6 @@ SHA1 (patch-test_asan_TestCases_Posix_stack-use-after-return.cc) = dea34873ff32e
 SHA1 (patch-test_asan_TestCases_heavy__uar__test.cc) = d271e63af0b399d3e64add96a1b1b1b5e1039d7e
 SHA1 (patch-test_asan_TestCases_interception__failure__test.cc) = b4711fcc3315eaacc2a4ec1021e04b8200749e51
 SHA1 (patch-test_asan_lit.cfg) = 16bf28a2625ba69b6d6a1ba96ed7bbf3e17b56a4
-SHA1 (patch-test_fuzzer_equivalence-signals.test) = 8d4f424d84bb1bd36ebb56dd1092c98208465a2e
 SHA1 (patch-test_fuzzer_lit.cfg) = b36c905a14ff1594dac503bc04e08f61d7e843b0
-SHA1 (patch-test_lit.common.cfg) = df0aa8345c30b5d7c53f14ca286e25e0f481d425
 SHA1 (patch-test_lsan_lit.common.cfg) = b09b4ab3a97dc881b701a3583b0b126b8206cfe2
 SHA1 (patch-test_scudo_lit.cfg) = 35e4f0524a8fd26e90e5d968b73d75f277da3779
diff --git a/compiler-rt-netbsd/patches/patch-lib_asan_asan__mapping.h b/compiler-rt-netbsd/patches/patch-lib_asan_asan__mapping.h
deleted file mode 100644
index 21e2a44d18..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_asan_asan__mapping.h
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
---- lib/asan/asan_mapping.h.orig	2018-02-01 23:46:05.000000000 +0000
-+++ lib/asan/asan_mapping.h
-@@ -122,6 +122,13 @@
- // || `[0x400000000000, 0x47ffffffffff]` || LowShadow  ||
- // || `[0x000000000000, 0x3fffffffffff]` || LowMem     ||
- //
-+// Shadow mapping on NerBSD/i386 with SHADOW_OFFSET == 0x40000000:
-+// || `[0x60000000, 0xfffff000]` || HighMem    ||
-+// || `[0x4c000000, 0x5fffffff]` || HighShadow ||
-+// || `[0x48000000, 0x4bffffff]` || ShadowGap  ||
-+// || `[0x40000000, 0x47ffffff]` || LowShadow  ||
-+// || `[0x00000000, 0x3fffffff]` || LowMem     ||
-+//
- // Default Windows/i386 mapping:
- // (the exact location of HighShadow/HighMem may vary depending
- //  on WoW64, /LARGEADDRESSAWARE, etc).
-@@ -152,6 +159,7 @@ static const u64 kPPC64_ShadowOffset64 =
- static const u64 kSystemZ_ShadowOffset64 = 1ULL << 52;
- static const u64 kFreeBSD_ShadowOffset32 = 1ULL << 30;  // 0x40000000
- static const u64 kFreeBSD_ShadowOffset64 = 1ULL << 46;  // 0x400000000000
-+static const u64 kNetBSD_ShadowOffset32 = 1ULL << 30;  // 0x40000000
- static const u64 kNetBSD_ShadowOffset64 = 1ULL << 46;  // 0x400000000000
- static const u64 kWindowsShadowOffset32 = 3ULL << 28;  // 0x30000000
- 
-@@ -166,6 +174,8 @@ static const u64 kWindowsShadowOffset32 
- #    define SHADOW_OFFSET kMIPS32_ShadowOffset32
- #  elif SANITIZER_FREEBSD
- #    define SHADOW_OFFSET kFreeBSD_ShadowOffset32
-+#  elif SANITIZER_NETBSD
-+#    define SHADOW_OFFSET kNetBSD_ShadowOffset32
- #  elif SANITIZER_WINDOWS
- #    define SHADOW_OFFSET kWindowsShadowOffset32
- #  elif SANITIZER_IOS
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp
index 851e2113c6..afc76512f4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp
+++ b/compiler-rt-netbsd/patches/patch-lib_fuzzer_FuzzerShmemPosix.cpp
@@ -1,31 +1,2 @@
 $NetBSD$
 
---- lib/fuzzer/FuzzerShmemPosix.cpp.orig	2018-02-01 23:46:06.000000000 +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,7 +54,7 @@ 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;
-@@ -70,7 +72,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_sanitizer__common_sanitizer__platform__interceptors.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
index 1bcccdd617..92517ba9f0 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,18 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-04-25 21:13:40.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-05-10 23:16:36.443785252 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -425,7 +425,8 @@
-   (SI_LINUX || SI_MAC || SI_FREEBSD || SI_NETBSD || SI_OPENBSD || SI_SOLARIS)
- #define SANITIZER_INTERCEPT_CTERMID_R (SI_MAC || SI_FREEBSD || SI_SOLARIS)
- 
--#define SANITIZER_INTERCEPTOR_HOOKS (SI_LINUX || SI_MAC || SI_WINDOWS)
-+#define SANITIZER_INTERCEPTOR_HOOKS \
-+  (SI_LINUX || SI_MAC || SI_WINDOWS || SI_NETBSD)
- #define SANITIZER_INTERCEPT_RECV_RECVFROM SI_POSIX
- #define SANITIZER_INTERCEPT_SEND_SENDTO SI_POSIX
- #define SANITIZER_INTERCEPT_EVENTFD_READ_WRITE SI_LINUX
-@@ -495,4 +496,10 @@
+@@ -496,4 +496,10 @@
  #define SANITIZER_INTERCEPT_PROTOENT SI_NETBSD
  #define SANITIZER_INTERCEPT_NETENT SI_NETBSD
  
diff --git a/compiler-rt-netbsd/patches/patch-test_fuzzer_equivalence-signals.test b/compiler-rt-netbsd/patches/patch-test_fuzzer_equivalence-signals.test
deleted file mode 100644
index 448c8be74d..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_fuzzer_equivalence-signals.test
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- test/fuzzer/equivalence-signals.test.orig	2018-04-25 21:13:41.000000000 +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_lit.common.cfg b/compiler-rt-netbsd/patches/patch-test_lit.common.cfg
deleted file mode 100644
index e906f87dc8..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_lit.common.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- test/lit.common.cfg.orig	2018-02-27 02:50:00.000000000 +0000
-+++ test/lit.common.cfg
-@@ -312,7 +312,7 @@ if config.host_os == 'Darwin' and config
- if config.host_os == 'Darwin':
-   config.substitutions.append( ("%ld_flags_rpath_exe", '-Wl,-rpath,@executable_path/ %dynamiclib') )
-   config.substitutions.append( ("%ld_flags_rpath_so", '-install_name @rpath/`basename %dynamiclib`') )
--elif config.host_os == 'FreeBSD':
-+elif config.host_os == 'FreeBSD' or config.host_os == 'NetBSD':
-   config.substitutions.append( ("%ld_flags_rpath_exe", "-Wl,-z,origin -Wl,-rpath,\$ORIGIN -L%T -l%xdynamiclib_namespec") )
-   config.substitutions.append( ("%ld_flags_rpath_so", '') )
- elif config.host_os == 'Linux':
Prev by Date: llvm-netbsd: Update to SVN r. 332053
Next by Date: clang-netbsd: Upgrade to SVN r. 332053
Previous by Thread: llvm-netbsd: Update to SVN r. 332053
Next by Thread: clang-netbsd: Upgrade to SVN r. 332053
Indexes:
Home | Main Index | Thread Index | Old Index