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



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Nov 28 12:24:14 2017 +0100
Changeset:	62ed7b7685aed05c26ebceb47b43e1c7a0ac4c0c

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc

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

Patch merged upstream:

Correct mangled_sp on NetBSD/amd64 in TSan

http://llvm.org/viewvc/llvm-project?rev=319163&view=rev

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=62ed7b7685aed05c26ebceb47b43e1c7a0ac4c0c

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                          |  2 +-
 .../patches/patch-lib_tsan_rtl_tsan__interceptors.cc | 20 --------------------
 3 files changed, 2 insertions(+), 22 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index d6967cb2e5..cca385b1f6 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=	319160
+SVN_REVISION.compiler-rt=	319163
 
 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 711fa6b90b..b2d40f8529 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -3,6 +3,6 @@ $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 SHA1 (patch-cmake_config-ix.cmake) = ed4b2f8aea3e0e62c552bebcd766ece3e574c99e
 SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 38ca750154dfc9843a56748078235824b772a147
 SHA1 (patch-lib_msan_msan.h) = 1ee0f86ccb410561d381afba526c85aa5dace912
-SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = 4210a48686ca5159b4648e668e43b4ceec4c436d
+SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = 0bb8bfd5f0286796541bd630a69d430ea293049d
 SHA1 (patch-lib_tsan_rtl_tsan__rtl.cc) = a2485075212f150ee2ce33616e887be2b3f41822
 SHA1 (patch-lib_tsan_rtl_tsan__rtl__amd64.S) = 5a0bed4cf2c1f63affeed8886983a53b4376ab5b
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
index 33a83d1c99..e0c22f2df4 100644
--- a/compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_tsan_rtl_tsan__interceptors.cc
@@ -2,26 +2,6 @@ $NetBSD$
 
 --- lib/tsan/rtl/tsan_interceptors.cc.orig	2017-11-21 09:38:56.000000000 +0000
 +++ lib/tsan/rtl/tsan_interceptors.cc
-@@ -502,15 +502,17 @@ static void SetJmp(ThreadState *thr, upt
- static void LongJmp(ThreadState *thr, uptr *env) {
- #ifdef __powerpc__
-   uptr mangled_sp = env[0];
--#elif SANITIZER_FREEBSD || SANITIZER_NETBSD
-+#elif SANITIZER_FREEBSD
-   uptr mangled_sp = env[2];
-+#elif SANITIZER_NETBSD
-+  uptr mangled_sp = env[6];
- #elif SANITIZER_MAC
- # ifdef __aarch64__
-     uptr mangled_sp = env[13];
- # else
-     uptr mangled_sp = env[2];
- # endif
--#elif defined(SANITIZER_LINUX)
-+#elif SANITIZER_LINUX
- # ifdef __aarch64__
-   uptr mangled_sp = env[13];
- # elif defined(__mips64)
 @@ -548,7 +550,37 @@ extern "C" void __tsan_setjmp(uptr sp, u
    SetJmp(cur_thread(), sp, mangled_sp);
  }


Home | Main Index | Thread Index | Old Index