Index: compiler-rt/trunk/lib/lsan/lsan_common_linux.cc
===================================================================
--- compiler-rt/trunk/lib/lsan/lsan_common_linux.cc
+++ compiler-rt/trunk/lib/lsan/lsan_common_linux.cc
@@ -34,10 +34,6 @@
   return LibraryNameIs(full_name, kLinkerName);
 }
 
-static THREADLOCAL u32 current_thread_tid = kInvalidTid;
-u32 GetCurrentThread() { return current_thread_tid; }
-void SetCurrentThread(u32 tid) { current_thread_tid = tid; }
-
 __attribute__((tls_model("initial-exec")))
 THREADLOCAL int disable_counter;
 bool DisabledInThisThread() { return disable_counter > 0; }
Index: compiler-rt/trunk/lib/lsan/lsan_linux.cc
===================================================================
--- compiler-rt/trunk/lib/lsan/lsan_linux.cc
+++ compiler-rt/trunk/lib/lsan/lsan_linux.cc
@@ -19,6 +19,10 @@
 
 namespace __lsan {
 
+static THREADLOCAL u32 current_thread_tid = kInvalidTid;
+u32 GetCurrentThread() { return current_thread_tid; }
+void SetCurrentThread(u32 tid) { current_thread_tid = tid; }
+
 static THREADLOCAL AllocatorCache allocator_cache;
 AllocatorCache *GetAllocatorCache() { return &allocator_cache; }