From 55f9f18cb2ea5b843bdff373b97f265ce288f1ec Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Thu, 8 Sep 2016 19:16:01 +0000 Subject: [PATCH] Fix tsan-go build. Disable the new abort-in-SIGABRT code under SANITIZER_GO. llvm-svn: 280980 --- compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc index 773de69..1a3e960 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_posix_libcdep.cc @@ -128,6 +128,7 @@ void SleepForMillis(int millis) { } void Abort() { +#ifndef SANITIZER_GO // If we are handling SIGABRT, unhandle it first. if (IsHandledDeadlySignal(SIGABRT)) { struct sigaction sigact; @@ -135,6 +136,7 @@ void Abort() { sigact.sa_sigaction = (sa_sigaction_t)SIG_DFL; internal_sigaction(SIGABRT, &sigact, nullptr); } +#endif abort(); } -- 2.7.4