pkgsrc-WIP-changes archive

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

compiler-rt-netbsd: Fixes in tsan



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Sun Aug 20 13:51:57 2017 +0200
Changeset:	d2fd4d28edfb393a0b41e550043e8a9cc19459ad

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-test_tsan_thread__name.cc
	compiler-rt-netbsd/patches/patch-test_tsan_thread__name2.cc
Added Files:
	compiler-rt-netbsd/patches/patch-lib_tsan_go_buildgo.sh

Log Message:
compiler-rt-netbsd: Fixes in tsan

This code fixes execution of tsan-tests... so far tsan is broken, but it builds now.

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=d2fd4d28edfb393a0b41e550043e8a9cc19459ad

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

diffstat:
 compiler-rt-netbsd/distinfo                        |  5 +++--
 .../patches/patch-lib_tsan_go_buildgo.sh           | 26 ++++++++++++++++++++++
 .../patches/patch-test_tsan_thread__name.cc        |  2 +-
 .../patches/patch-test_tsan_thread__name2.cc       |  2 +-
 4 files changed, 31 insertions(+), 4 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index df7d2c7644..f10051e207 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -69,6 +69,7 @@ SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = b508e40fe09eb73649a2f7eecdec1bd1e
 SHA1 (patch-lib_fuzzer_tests_FuzzerUnittest.cpp) = d2c25d452c1bdda4274196784e4fb3c0341e3303
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 36a89517584891a1a50536a681a5d42e99ef904d
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 89302e7b40901faaa471cdd76eefa222a0cc055d
+SHA1 (patch-lib_tsan_go_buildgo.sh) = fe64b3389bbf6ae2ddf187df3e0600b2f817f51d
 SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = d3643d5b3a787dba1b5585856449be6b1c02b607
 SHA1 (patch-lib_tsan_rtl_tsan__platform__linux.cc) = 4269acd5ea1d1f448fb9a7a31def2f84a03b27da
 SHA1 (patch-lib_tsan_rtl_tsan__rtl__amd64.S) = 95591667c23372ceb72334b2ceae800d32574ac6
@@ -221,7 +222,7 @@ SHA1 (patch-test_fuzzer_value-profile-strcmp.test) = 376152eec4743126f51057748cc
 SHA1 (patch-test_fuzzer_value-profile-strncmp.test) = 8402e55ee6bd65a956ff6fac40e31eda2568983f
 SHA1 (patch-test_fuzzer_value-profile-switch.test) = 1ac9a42ed690e96155aa94311fe08c06da6e0709
 SHA1 (patch-test_tsan_lit.cfg) = c849d08c3df59a3de45c6515e05c3d9fac5424e7
-SHA1 (patch-test_tsan_thread__name.cc) = 0f6a51b98adeabdea82cc8874f9a3ddc68a34b54
-SHA1 (patch-test_tsan_thread__name2.cc) = b12bac7de9c8307972a3ee3dbadb41563e8658f5
+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_go_buildgo.sh b/compiler-rt-netbsd/patches/patch-lib_tsan_go_buildgo.sh
new file mode 100644
index 0000000000..b98aa5a3ce
--- /dev/null
+++ b/compiler-rt-netbsd/patches/patch-lib_tsan_go_buildgo.sh
@@ -0,0 +1,26 @@
+$NetBSD$
+
+--- lib/tsan/go/buildgo.sh.orig	2017-07-24 13:39:38.000000000 +0000
++++ lib/tsan/go/buildgo.sh
+@@ -68,6 +68,21 @@ elif [ "`uname -a | grep FreeBSD`" != ""
+ 		../../sanitizer_common/sanitizer_linux_libcdep.cc
+ 		../../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
+ 	"
++elif [ "`uname -a | grep NetBSD`" != "" ]; then
++	SUFFIX="netbsd_amd64"
++	OSCFLAGS="-fno-strict-aliasing -fPIC -Werror"
++	OSLDFLAGS="-lpthread -fPIC -fpie"
++	SRCS="
++		$SRCS
++		../rtl/tsan_platform_linux.cc
++		../../sanitizer_common/sanitizer_posix.cc
++		../../sanitizer_common/sanitizer_posix_libcdep.cc
++		../../sanitizer_common/sanitizer_procmaps_common.cc
++		../../sanitizer_common/sanitizer_procmaps_freebsd.cc
++		../../sanitizer_common/sanitizer_linux.cc
++		../../sanitizer_common/sanitizer_linux_libcdep.cc
++		../../sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cc
++	"
+ elif [ "`uname -a | grep Darwin`" != "" ]; then
+ 	SUFFIX="darwin_amd64"
+ 	OSCFLAGS="-fPIC -Wno-unused-const-variable -Wno-unknown-warning-option -isysroot $(xcodebuild -version -sdk macosx Path) -mmacosx-version-min=10.7"
diff --git a/compiler-rt-netbsd/patches/patch-test_tsan_thread__name.cc b/compiler-rt-netbsd/patches/patch-test_tsan_thread__name.cc
index a4275a5537..ce47db6c20 100644
--- a/compiler-rt-netbsd/patches/patch-test_tsan_thread__name.cc
+++ b/compiler-rt-netbsd/patches/patch-test_tsan_thread__name.cc
@@ -14,7 +14,7 @@ $NetBSD$
 +#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))
++#define tsan_pthread_setname_np(a, b) pthread_setname_np((a), "%s", (void*)(b))
  #else
  #define USE_PTHREAD_SETNAME_NP 0
  #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
index 735778bb04..24443aa076 100644
--- a/compiler-rt-netbsd/patches/patch-test_tsan_thread__name2.cc
+++ b/compiler-rt-netbsd/patches/patch-test_tsan_thread__name2.cc
@@ -9,7 +9,7 @@ $NetBSD$
 -#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))
++#define tsan_pthread_setname_np(a, b) pthread_setname_np((a), "%s", (void*)(b))
 +#else
 +#define tsan_pthread_setname_np pthread_setname_np
  #endif


Home | Main Index | Thread Index | Old Index