[compiler-rt] r197232 - [sanitizer] Disable call wrapping when building for Go.

[Evgeniy Stepanov]

Author: eugenis
Date: Fri Dec 13 08:58:21 2013
New Revision: 197232

URL: http://llvm.org/viewvc/llvm-project?rev=197232&view=rev
Log:
[sanitizer] Disable call wrapping when building for Go.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h?rev=197232&r1=197231&r2=197232&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common.h Fri Dec 13 08:58:21 2013
@@ -484,7 +484,7 @@ const uptr kPthreadDestructorIterations
 // Callback type for iterating over a set of memory ranges.
 typedef void (*RangeIteratorCallback)(uptr begin, uptr end, void *arg);
 
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX && !defined(SANITIZER_GO)
 extern uptr indirect_call_wrapper;
 void InitializeIndirectCallWrapping(const char *wrapper_name);
 

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc?rev=197232&r1=197231&r2=197232&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc Fri Dec 13 08:58:21 2013
@@ -353,12 +353,14 @@ uptr GetListOfModules(LoadedModule *modu
 }
 #endif  // SANITIZER_ANDROID
 
+#ifndef SANITIZER_GO
 uptr indirect_call_wrapper;
 
 void InitializeIndirectCallWrapping(const char *wrapper_name) {
   CHECK(wrapper_name && *wrapper_name);
   indirect_call_wrapper = (uptr)dlsym(RTLD_DEFAULT, wrapper_name);
 }
+#endif
 
 }  // namespace __sanitizer