compiler-rt-netbsd: Rebase to SVN r. 323413
A local patch incorporated upstream: Author: kamil Date: Thu Jan 25 03:07:42 2018 New Revision: 323413 URL: http://llvm.org/viewvc/llvm-project?rev=323413&view=rev Log: Correct typo in TSan code We wrongly enabled additional (unwanted) branch for NetBSD. Noted by Vlad Tsyrklevich Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interceptors.cc Sponsored by <The NetBSD Foundation>
This commit is contained in:
parent
e5c85c682f
commit
56107cb414
|
@ -21,7 +21,7 @@ SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = c8c9
|
|||
SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 270ab357a4e8379540a9dbe890c10fe0901e2aaf
|
||||
SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__freebsd.cc) = 7e0deaeeada33bd13575251e5d8fb4a0ee4c53e8
|
||||
SHA1 (patch-lib_scudo_scudo__platform.h) = d44bd094136dd0381db87344fbbcad1dcfd44dc1
|
||||
SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = 1303b1827c56f92e649ae195d1398e2d1a6ddc6a
|
||||
SHA1 (patch-lib_tsan_rtl_tsan__interceptors.cc) = 4fbaa64e3f8d28cdbab6783c296dfd31cecb45a5
|
||||
SHA1 (patch-test_asan_lit.cfg) = becbc3c8c9cfd589e1dcbf1014dd4655f952c144
|
||||
SHA1 (patch-test_lsan_lit.common.cfg) = 10dc251f80efb96d015a22c740dc20b1843b9a11
|
||||
SHA1 (patch-test_sanitizer__common_TestCases_NetBSD_kvm__open.cc) = 484d51d5a7b8de82c3d456d532b64e9cc123d071
|
||||
|
|
|
@ -2,31 +2,6 @@ $NetBSD$
|
|||
|
||||
--- lib/tsan/rtl/tsan_interceptors.cc.orig 2017-12-08 18:27:50.000000000 +0000
|
||||
+++ lib/tsan/rtl/tsan_interceptors.cc
|
||||
@@ -597,7 +597,7 @@ extern "C" int TSAN_INTERCEPTOR_SIGSETJM
|
||||
return 0;
|
||||
}
|
||||
|
||||
-#if !SANITIEZER_NETBSD
|
||||
+#if !SANITIZER_NETBSD
|
||||
extern "C" SANITIZER_INTERFACE_ATTRIBUTE
|
||||
int __interceptor___sigsetjmp(void *env);
|
||||
extern "C" int __interceptor___sigsetjmp(void *env) {
|
||||
@@ -609,13 +609,13 @@ extern "C" int __interceptor___sigsetjmp
|
||||
extern "C" int setjmp_symname(void *env);
|
||||
extern "C" int _setjmp(void *env);
|
||||
extern "C" int sigsetjmp_symname(void *env);
|
||||
-#if !SANITIEZER_NETBSD
|
||||
+#if !SANITIZER_NETBSD
|
||||
extern "C" int __sigsetjmp(void *env);
|
||||
#endif
|
||||
DEFINE_REAL(int, setjmp_symname, void *env)
|
||||
DEFINE_REAL(int, _setjmp, void *env)
|
||||
DEFINE_REAL(int, sigsetjmp_symname, void *env)
|
||||
-#if !SANITIEZER_NETBSD
|
||||
+#if !SANITIZER_NETBSD
|
||||
DEFINE_REAL(int, __sigsetjmp, void *env)
|
||||
#endif
|
||||
#endif // SANITIZER_MAC
|
||||
@@ -2426,7 +2426,7 @@ struct ScopedSyscall {
|
||||
}
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue