[llvm-branch-commits] [compiler-rt] aa83f69 - v

[via llvm-branch-commits]

Author: zijunzhao
Date: 2022-10-14T22:45:17Z
New Revision: aa83f690033955c0b4175ddaa6e2a09b4f309763

URL: https://github.com/llvm/llvm-project/commit/aa83f690033955c0b4175ddaa6e2a09b4f309763
DIFF: https://github.com/llvm/llvm-project/commit/aa83f690033955c0b4175ddaa6e2a09b4f309763.diff

LOG: v

Change-Id: I0e820c7c1333f5943bf7c3d43301f525fb79b40f

Added: 
    

Modified: 
    compiler-rt/lib/tsan/rtl/tsan_rtl.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.h b/compiler-rt/lib/tsan/rtl/tsan_rtl.h
index 7788c3508c38c..728a46e97a313 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl.h
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.h
@@ -667,7 +667,7 @@ void LazyInitialize(ThreadState *thr) {
   // If we can use .preinit_array, assume that __tsan_init
   // called from .preinit_array initializes runtime before
   // any instrumented code.
-#if !SANITIZER_CAN_USE_PREINIT_ARRAY
+#if (!SANITIZER_CAN_USE_PREINIT_ARRAY || defined(__ANDROID__))
   if (UNLIKELY(!is_initialized))
     Initialize(thr);
 #endif