[compiler-rt] r190669 - [asan] Android does not have TLS

[Kostya Serebryany]

Author: kcc
Date: Fri Sep 13 03:58:22 2013
New Revision: 190669

URL: http://llvm.org/viewvc/llvm-project?rev=190669&view=rev
Log:
[asan] Android does not have TLS

Modified:
    compiler-rt/trunk/lib/asan/asan_fake_stack.cc

Modified: compiler-rt/trunk/lib/asan/asan_fake_stack.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_fake_stack.cc?rev=190669&r1=190668&r2=190669&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_fake_stack.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_fake_stack.cc Fri Sep 13 03:58:22 2013
@@ -123,7 +123,7 @@ NOINLINE void FakeStack::GC(uptr real_st
   needs_gc_ = false;
 }
 
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX && !SANITIZER_ANDROID
 static THREADLOCAL FakeStack *fake_stack_tls;
 
 FakeStack *GetTLSFakeStack() {
@@ -135,7 +135,7 @@ void SetTLSFakeStack(FakeStack *fs) {
 #else
 FakeStack *GetTLSFakeStack() { return 0; }
 void SetTLSFakeStack(FakeStack *fs) { }
-#endif  // SANITIZER_LINUX
+#endif  // SANITIZER_LINUX && !SANITIZER_ANDROID
 
 static FakeStack *GetFakeStack() {
   AsanThread *t = GetCurrentThread();