[compiler-rt] r200549 - [libsanitizer] Fix compilation for gotsan.

Alexander Potapenko glider at google.com
Fri Jan 31 06:30:12 PST 2014


Author: glider
Date: Fri Jan 31 08:30:12 2014
New Revision: 200549

URL: http://llvm.org/viewvc/llvm-project?rev=200549&view=rev
Log:
[libsanitizer] Fix compilation for gotsan.

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

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=200549&r1=200548&r2=200549&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux_libcdep.cc Fri Jan 31 08:30:12 2014
@@ -50,6 +50,7 @@ static int my_pthread_attr_getstack(void
 
 namespace __sanitizer {
 
+#ifndef SANITIZER_GO
 extern "C" SANITIZER_WEAK_ATTRIBUTE int
 __sanitizer_sigaction_f(int signum, const void *act, void *oldact);
 
@@ -59,7 +60,6 @@ int internal_sigaction(int signum, const
   return sigaction(signum, (struct sigaction *)act, (struct sigaction *)oldact);
 }
 
-#ifndef SANITIZER_GO
 void GetThreadStackTopAndBottom(bool at_initialization, uptr *stack_top,
                                 uptr *stack_bottom) {
   static const uptr kMaxThreadStackSize = 1 << 30;  // 1Gb

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc?rev=200549&r1=200548&r2=200549&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_posix_libcdep.cc Fri Jan 31 08:30:12 2014
@@ -92,6 +92,7 @@ int internal_isatty(fd_t fd) {
   return isatty(fd);
 }
 
+#ifndef SANITIZER_GO
 // TODO(glider): different tools may require different altstack size.
 static const uptr kAltStackSize = SIGSTKSZ * 4;  // SIGSTKSZ is not enough.
 
@@ -141,6 +142,7 @@ void InstallDeadlySignalHandlers(SignalH
   MaybeInstallSigaction(SIGSEGV, handler);
   MaybeInstallSigaction(SIGBUS, handler);
 }
+#endif  // SANITIZER_GO
 
 }  // namespace __sanitizer
 





More information about the llvm-commits mailing list