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

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Update to SVN r. 312160
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Wed, 30 Aug 2017 19:39:58 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Aug 30 21:39:58 2017 +0200
Changeset:	8dc11b3bae830ced163e684076a6e95f5cc4a592

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/PLIST
	compiler-rt-netbsd/distinfo
Removed Files:
	compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc
	compiler-rt-netbsd/patches/patch-test_tsan_thread__name.cc
	compiler-rt-netbsd/patches/patch-test_tsan_thread__name2.cc

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

Drop merged patches.
Sync PLIST with upstream (NetBSD acquired ubsan_minimal support).

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=8dc11b3bae830ced163e684076a6e95f5cc4a592

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/PLIST                           |   5 +
 compiler-rt-netbsd/distinfo                        |   3 -
 .../patch-lib_tsan_rtl_tsan__interceptors.cc       | 149 ---------------------
 .../patches/patch-test_tsan_thread__name.cc        |  29 ----
 .../patches/patch-test_tsan_thread__name2.cc       |  35 -----
 6 files changed, 6 insertions(+), 217 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 1c39a84e0a..b919d8e537 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=	311933
+SVN_REVISION.compiler-rt=	312160
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://compiler-rt.llvm.org/
diff --git a/compiler-rt-netbsd/PLIST b/compiler-rt-netbsd/PLIST
index caef302326..d0cbda626b 100644
--- a/compiler-rt-netbsd/PLIST
+++ b/compiler-rt-netbsd/PLIST
@@ -43,6 +43,11 @@ lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.tsan-x86_64.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.tsan-x86_64.a.syms
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.tsan_cxx-x86_64.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.tsan_cxx-x86_64.a.syms
+lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-i386.a
+lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-i386.so
+lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-x86_64.a
+lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-x86_64.a.sym
+lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_minimal-x86_64.so
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_standalone-i386.a
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_standalone-i386.so
 lib/clang/${PKGVERSION}/lib/${COMPILER_RT_OS_DIR}/libclang_rt.ubsan_standalone-x86_64.a
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index ad6be1eead..2ca9e0fe8c 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -21,12 +21,9 @@ SHA1 (patch-lib_fuzzer_afl_afl__driver.cpp) = a114e28152558b7147d0931eb638109c3d
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = eaffd9f8f2621ad465b5c734a764bdff0243af3d
 SHA1 (patch-lib_lsan_lsan__interceptors.cc) = 04cb038163d9d9eb098666d394bfca38e9f78a2f
 SHA1 (patch-lib_tsan_go_buildgo.sh) = fe64b3389bbf6ae2ddf187df3e0600b2f817f51d
-SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = feeaf47e154105201240af271c0187f146961523
 SHA1 (patch-lib_tsan_rtl_tsan__platform__linux.cc) = e572f99e72257dbaa17838378b34cde40e91bd54
 SHA1 (patch-lib_tsan_rtl_tsan__rtl__amd64.S) = 95591667c23372ceb72334b2ceae800d32574ac6
 SHA1 (patch-lib_tsan_tests_rtl_tsan__test__util__posix.cc) = 302c72dab4fe5a0c94d7de0d728033e616811e5e
 SHA1 (patch-test_tsan_lit.cfg) = c849d08c3df59a3de45c6515e05c3d9fac5424e7
-SHA1 (patch-test_tsan_thread__name.cc) = 96816e92b68e6fc5aaae92dfc062fe69a64c8c27
-SHA1 (patch-test_tsan_thread__name2.cc) = e022b5f3d531a0b666fafe1a81490211465f296e
 SHA1 (patch-test_tsan_tls__race.cc) = 7447ee161c27deb7196151f56ea739904bec8c1c
 SHA1 (patch-test_tsan_tls__race2.cc) = da9b3298b8e882db111b01ac10a5ae6dbeaa88dc
diff --git a/compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc b/compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc
deleted file mode 100644
index 979dcb429b..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-$NetBSD$
-
---- lib/tsan/rtl/tsan_interceptors.cc.orig	2017-08-03 21:24:38.000000000 +0000
-+++ lib/tsan/rtl/tsan_interceptors.cc
-@@ -17,7 +17,11 @@
- #include "sanitizer_common/sanitizer_errno.h"
- #include "sanitizer_common/sanitizer_libc.h"
- #include "sanitizer_common/sanitizer_linux.h"
-+#if SANITIZER_NETBSD
-+#include "sanitizer_common/sanitizer_platform_limits_netbsd.h"
-+#else
- #include "sanitizer_common/sanitizer_platform_limits_posix.h"
-+#endif
- #include "sanitizer_common/sanitizer_placement_new.h"
- #include "sanitizer_common/sanitizer_posix.h"
- #include "sanitizer_common/sanitizer_stacktrace.h"
-@@ -39,6 +43,13 @@ using namespace __tsan;  // NOLINT
- #define stderr __stderrp
- #endif
- 
-+#if SANITIZER_NETBSD
-+#define dirfd(dirp) (*(int*)(dirp))
-+#define fileno_unlocked fileno
-+#define stdout __sF[1]
-+#define stderr __sF[2]
-+#endif
-+
- #if SANITIZER_ANDROID
- #define mallopt(a, b)
- #endif
-@@ -84,19 +95,25 @@ DECLARE_REAL_AND_INTERCEPTOR(void, free,
- extern "C" void *pthread_self();
- extern "C" void _exit(int status);
- extern "C" int fileno_unlocked(void *stream);
-+#if !SANITIZER_NETBSD
- extern "C" int dirfd(void *dirp);
--#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID
-+#endif
-+#if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_NETBSD
- extern "C" int mallopt(int param, int value);
- #endif
-+#if SANITIZER_NETBSD
-+extern __sanitizer_FILE **__sF;
-+#else
- extern __sanitizer_FILE *stdout, *stderr;
--#if !SANITIZER_FREEBSD && !SANITIZER_MAC
-+#endif
-+#if !SANITIZER_FREEBSD && !SANITIZER_MAC && !SANITIZER_NETBSD
- const int PTHREAD_MUTEX_RECURSIVE = 1;
- const int PTHREAD_MUTEX_RECURSIVE_NP = 1;
- #else
- const int PTHREAD_MUTEX_RECURSIVE = 2;
- const int PTHREAD_MUTEX_RECURSIVE_NP = 2;
- #endif
--#if !SANITIZER_FREEBSD && !SANITIZER_MAC
-+#if !SANITIZER_FREEBSD && !SANITIZER_MAC && !SANITIZER_NETBSD
- const int EPOLL_CTL_ADD = 1;
- #endif
- const int SIGILL = 4;
-@@ -105,7 +122,7 @@ const int SIGFPE = 8;
- const int SIGSEGV = 11;
- const int SIGPIPE = 13;
- const int SIGTERM = 15;
--#if defined(__mips__) || SANITIZER_FREEBSD || SANITIZER_MAC
-+#if defined(__mips__) || SANITIZER_FREEBSD || SANITIZER_MAC || SANITIZER_NETBSD
- const int SIGBUS = 10;
- const int SIGSYS = 12;
- #else
-@@ -113,7 +130,9 @@ const int SIGBUS = 7;
- const int SIGSYS = 31;
- #endif
- void *const MAP_FAILED = (void*)-1;
--#if !SANITIZER_MAC
-+#if SANITIZER_NETBSD
-+const int PTHREAD_BARRIER_SERIAL_THREAD = 1234567;
-+#elif !SANITIZER_MAC
- const int PTHREAD_BARRIER_SERIAL_THREAD = -1;
- #endif
- const int MAP_FIXED = 0x10;
-@@ -138,6 +157,15 @@ struct sigaction_t {
-   __sanitizer_sigset_t sa_mask;
-   void (*sa_restorer)();
- };
-+#elif SANITIZER_NETBSD
-+struct sigaction_t {
-+  union {
-+    sighandler_t sa_handler;
-+    sigactionhandler_t sa_sigaction;
-+  };
-+  __sanitizer_sigset_t sa_mask;
-+  int sa_flags;
-+};
- #else
- struct sigaction_t {
- #ifdef __mips__
-@@ -166,7 +194,7 @@ struct sigaction_t {
- const sighandler_t SIG_DFL = (sighandler_t)0;
- const sighandler_t SIG_IGN = (sighandler_t)1;
- const sighandler_t SIG_ERR = (sighandler_t)-1;
--#if SANITIZER_FREEBSD || SANITIZER_MAC
-+#if SANITIZER_FREEBSD || SANITIZER_MAC || SANITIZER_NETBSD
- const int SA_SIGINFO = 0x40;
- const int SIG_SETMASK = 3;
- #elif defined(__mips__)
-@@ -282,7 +310,7 @@ void ScopedInterceptor::DisableIgnores()
- }
- 
- #define TSAN_INTERCEPT(func) INTERCEPT_FUNCTION(func)
--#if SANITIZER_FREEBSD
-+#if SANITIZER_FREEBSD || SANITIZER_NETBSD
- # define TSAN_INTERCEPT_VER(func, ver) INTERCEPT_FUNCTION(func)
- #else
- # define TSAN_INTERCEPT_VER(func, ver) INTERCEPT_FUNCTION_VER(func, ver)
-@@ -459,7 +487,7 @@ static void SetJmp(ThreadState *thr, upt
- static void LongJmp(ThreadState *thr, uptr *env) {
- #ifdef __powerpc__
-   uptr mangled_sp = env[0];
--#elif SANITIZER_FREEBSD
-+#elif SANITIZER_FREEBSD || SANITIZER_NETBSD
-   uptr mangled_sp = env[2];
- #elif SANITIZER_MAC
- # ifdef __aarch64__
-@@ -1345,7 +1373,7 @@ TSAN_INTERCEPTOR(int, __fxstat, int vers
- #endif
- 
- TSAN_INTERCEPTOR(int, fstat, int fd, void *buf) {
--#if SANITIZER_FREEBSD || SANITIZER_MAC || SANITIZER_ANDROID
-+#if SANITIZER_FREEBSD || SANITIZER_MAC || SANITIZER_ANDROID || SANITIZER_NETBSD
-   SCOPED_TSAN_INTERCEPTOR(fstat, fd, buf);
-   if (fd > 0)
-     FdAccess(thr, pc, fd);
-@@ -1926,7 +1954,7 @@ TSAN_INTERCEPTOR(int, sigaction, int sig
-   sigactions[sig].sa_flags = *(volatile int*)&act->sa_flags;
-   internal_memcpy(&sigactions[sig].sa_mask, &act->sa_mask,
-       sizeof(sigactions[sig].sa_mask));
--#if !SANITIZER_FREEBSD && !SANITIZER_MAC
-+#if !SANITIZER_FREEBSD && !SANITIZER_MAC && !SANITIZER_NETBSD
-   sigactions[sig].sa_restorer = act->sa_restorer;
- #endif
-   sigaction_t newact;
-@@ -2288,7 +2316,7 @@ struct ScopedSyscall {
-   }
- };
- 
--#if !SANITIZER_FREEBSD && !SANITIZER_MAC
-+#if !SANITIZER_FREEBSD && !SANITIZER_MAC && !SANITIZER_NETBSD
- static void syscall_access_range(uptr pc, uptr p, uptr s, bool write) {
-   TSAN_SYSCALL();
-   MemoryAccessRange(thr, pc, p, s, write);
diff --git a/compiler-rt-netbsd/patches/patch-test_tsan_thread__name.cc b/compiler-rt-netbsd/patches/patch-test_tsan_thread__name.cc
deleted file mode 100644
index ce47db6c20..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_tsan_thread__name.cc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
---- test/tsan/thread_name.cc.orig	2017-07-04 05:53:07.000000000 +0000
-+++ test/tsan/thread_name.cc
-@@ -3,10 +3,14 @@
- 
- #if defined(__linux__)
- #define USE_PTHREAD_SETNAME_NP __GLIBC_PREREQ(2, 12)
-+#define tsan_pthread_setname_np pthread_setname_np
- #elif defined(__FreeBSD__)
- #include <pthread_np.h>
- #define USE_PTHREAD_SETNAME_NP 1
--#define pthread_setname_np pthread_set_name_np
-+#define tasn_pthread_setname_np pthread_set_name_np
-+#elif defined(__NetBSD__)
-+#define USE_PTHREAD_SETNAME_NP 1
-+#define tsan_pthread_setname_np(a, b) pthread_setname_np((a), "%s", (void*)(b))
- #else
- #define USE_PTHREAD_SETNAME_NP 0
- #endif
-@@ -24,7 +28,7 @@ void *Thread1(void *x) {
- 
- void *Thread2(void *x) {
- #if USE_PTHREAD_SETNAME_NP
--  pthread_setname_np(pthread_self(), "Thread2");
-+  tsan_pthread_setname_np(pthread_self(), "Thread2");
- #else
-   AnnotateThreadName(__FILE__, __LINE__, "Thread2");
- #endif
diff --git a/compiler-rt-netbsd/patches/patch-test_tsan_thread__name2.cc b/compiler-rt-netbsd/patches/patch-test_tsan_thread__name2.cc
deleted file mode 100644
index 24443aa076..0000000000
--- a/compiler-rt-netbsd/patches/patch-test_tsan_thread__name2.cc
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
---- test/tsan/thread_name2.cc.orig	2017-07-04 05:53:06.000000000 +0000
-+++ test/tsan/thread_name2.cc
-@@ -6,7 +6,11 @@
- 
- #if defined(__FreeBSD__)
- #include <pthread_np.h>
--#define pthread_setname_np pthread_set_name_np
-+#define tsan_pthread_setname_np pthread_set_name_np
-+#elif defined(__NetBSD__)
-+#define tsan_pthread_setname_np(a, b) pthread_setname_np((a), "%s", (void*)(b))
-+#else
-+#define tsan_pthread_setname_np pthread_setname_np
- #endif
- 
- long long Global;
-@@ -18,7 +22,7 @@ void *Thread1(void *x) {
- }
- 
- void *Thread2(void *x) {
--  pthread_setname_np(pthread_self(), "foobar2");
-+  tsan_pthread_setname_np(pthread_self(), "foobar2");
-   Global--;
-   barrier_wait(&barrier);
-   return 0;
-@@ -29,7 +33,7 @@ int main() {
-   pthread_t t[2];
-   pthread_create(&t[0], 0, Thread1, 0);
-   pthread_create(&t[1], 0, Thread2, 0);
--  pthread_setname_np(t[0], "foobar1");
-+  tsan_pthread_setname_np(t[0], "foobar1");
-   barrier_wait(&barrier);
-   pthread_join(t[0], NULL);
-   pthread_join(t[1], NULL);
Prev by Date: epacts: Efficient and Parallelizable Association Container Toolbox
Next by Date: compiler-rt-netbsd: Update to SVN r. 312184
Previous by Thread: epacts: Efficient and Parallelizable Association Container Toolbox
Next by Thread: compiler-rt-netbsd: Update to SVN r. 312184
Indexes:
Home | Main Index | Thread Index | Old Index