diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2016-04-27 14:28:42 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2016-04-27 14:28:42 +0000 |
| commit | 74527d700b4ee1c36ea7cfd137a7140227fd567a (patch) | |
| tree | 4b4bd8d92e626b7d1a3ee0c0b5d765df666e3ec8 /lib | |
| parent | 9721f9a6b1b8b1e1582ab4f39fbe11e00060eae0 (diff) | |
tsan: fix darwin Go support
os_trace turns out to be a macro that creates static object.
Function-static objects use __cxa_atexit and __dso_handle
which are not present in Go runtime.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@267720 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sanitizer_common/sanitizer_mac.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sanitizer_common/sanitizer_mac.cc b/lib/sanitizer_common/sanitizer_mac.cc index 2d383707f..356541d23 100644 --- a/lib/sanitizer_common/sanitizer_mac.cc +++ b/lib/sanitizer_common/sanitizer_mac.cc @@ -468,6 +468,7 @@ void LogMessageOnPrintf(const char *str) { } void LogFullErrorReport(const char *buffer) { +#ifndef SANITIZER_GO // Log with os_trace. This will make it into the crash log. #if SANITIZER_OS_TRACE if (GetMacosVersion() >= MACOS_VERSION_YOSEMITE) { @@ -489,7 +490,6 @@ void LogFullErrorReport(const char *buffer) { } #endif -#ifndef SANITIZER_GO // Log to syslog. // The logging on OS X may call pthread_create so we need the threading // environment to be fully initialized. Also, this should never be called when @@ -500,9 +500,9 @@ void LogFullErrorReport(const char *buffer) { BlockingMutexLock l(&syslog_lock); if (common_flags()->log_to_syslog) WriteToSyslog(buffer); -#endif // The report is added to CrashLog as part of logging all of Printf output. +#endif } SignalContext::WriteFlag SignalContext::GetWriteFlag(void *context) { |