summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
authorSergey Matveev <earthdok@google.com>2013-05-07 16:29:26 +0000
committerSergey Matveev <earthdok@google.com>2013-05-07 16:29:26 +0000
commit3704453368e2711e7e99e40e659752a9b1127fdd (patch)
treea2cc88e29579ec69f45052ad517f552cd4b78320 /compiler-rt
parent3e40f214a4ea519373245142afdc4d9def382234 (diff)
downloadbcm5719-llvm-3704453368e2711e7e99e40e659752a9b1127fdd.tar.gz
bcm5719-llvm-3704453368e2711e7e99e40e659752a9b1127fdd.zip
[sanitizer] Fixed InitTlsSize for Android.
llvm-svn: 181330
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_linux.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
index 2dbabe93b32..29c67220e65 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
@@ -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");
OpenPOWER on IntegriCloud