summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2015-01-07 02:12:41 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2015-01-07 02:12:41 +0000
commitb3793db6a5060ab98be7f01a5d9e8247e95f4261 (patch)
tree87b841eb1e313095fdccacaa8b92bc52ea9d0a59
parent8bb699b511904af2acc7188db146f29da94022da (diff)
downloadcompiler-rt-b3793db6a5060ab98be7f01a5d9e8247e95f4261.tar.gz
[TSan] Fix Go build.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@225336 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/sanitizer_common/sanitizer_linux.cc6
-rw-r--r--lib/tsan/go/tsan_go.cc7
2 files changed, 6 insertions, 7 deletions
diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc
index 1000a99d2..c9bad22ed 100644
--- a/lib/sanitizer_common/sanitizer_linux.cc
+++ b/lib/sanitizer_common/sanitizer_linux.cc
@@ -940,6 +940,7 @@ bool IsDeadlySignal(int signum) {
return (signum == SIGSEGV) && common_flags()->handle_segv;
}
+#ifndef SANITIZER_GO
void *internal_start_thread(void(*func)(void *arg), void *arg) {
// Start the thread with signals blocked, otherwise it can steal user signals.
__sanitizer_sigset_t set, old;
@@ -954,6 +955,11 @@ void *internal_start_thread(void(*func)(void *arg), void *arg) {
void internal_join_thread(void *th) {
real_pthread_join(th, 0);
}
+#else
+void *internal_start_thread(void (*func)(void *), void *arg) { return 0; }
+
+void internal_join_thread(void *th) {}
+#endif
} // namespace __sanitizer
diff --git a/lib/tsan/go/tsan_go.cc b/lib/tsan/go/tsan_go.cc
index cccf72ced..ea0beb742 100644
--- a/lib/tsan/go/tsan_go.cc
+++ b/lib/tsan/go/tsan_go.cc
@@ -28,13 +28,6 @@ bool IsExpectedReport(uptr addr, uptr size) {
return false;
}
-void *internal_start_thread(void(*func)(void*), void *arg) {
- return 0;
-}
-
-void internal_join_thread(void *th) {
-}
-
ReportLocation *SymbolizeData(uptr addr) {
return 0;
}