[compiler-rt] 678edfc - [sanitizer] Allow preinit array on Android

[Vitaly Buka via llvm-commits]

Author: Vy Nguyen
Date: 2020-11-04T16:46:10-08:00
New Revision: 678edfc1f39a60c113018ce6dd7a44b4c4a55f51

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

LOG: [sanitizer] Allow preinit array on Android

Extracted from D89251

Added: 
    

Modified: 
    compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
index 26a7d615d8b7..d8f0540037d2 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h
@@ -104,8 +104,7 @@
 //
 // FIXME: do we have anything like this on Mac?
 #ifndef SANITIZER_CAN_USE_PREINIT_ARRAY
-#if ((SANITIZER_LINUX && !SANITIZER_ANDROID) || \
-     SANITIZER_FUCHSIA || SANITIZER_NETBSD) && !defined(PIC)
+#if (SANITIZER_LINUX || SANITIZER_FUCHSIA || SANITIZER_NETBSD) && !defined(PIC)
 #define SANITIZER_CAN_USE_PREINIT_ARRAY 1
 // Before Solaris 11.4, .preinit_array is fully supported only with GNU ld.
 // FIXME: Check for those conditions.