[compiler-rt] r181330 - [sanitizer] Fixed InitTlsSize for Android.

Sergey Matveev earthdok at google.com
Tue May 7 09:29:27 PDT 2013


Author: smatveev
Date: Tue May  7 11:29:26 2013
New Revision: 181330

URL: http://llvm.org/viewvc/llvm-project?rev=181330&view=rev
Log:
[sanitizer] Fixed InitTlsSize for Android.

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc?rev=181330&r1=181329&r2=181330&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_linux.cc Tue May  7 11:29:26 2013
@@ -749,7 +749,7 @@ static uptr g_tls_size;
 #endif
 
 void InitTlsSize() {
-#ifndef SANITIZER_GO
+#if !defined(SANITIZER_GO) && !SANITIZER_ANDROID
   typedef void (*get_tls_func)(size_t*, size_t*) DL_INTERNAL_FUNCTION;
   get_tls_func get_tls;
   void *get_tls_static_info_ptr = dlsym(RTLD_NEXT, "_dl_get_tls_static_info");





More information about the llvm-commits mailing list