Author: zijunzhao Date: 2022-02-02T18:26:41Z New Revision: e71f3d8fba67d62acfa495bf88bb84202c176d75
URL: https://github.com/llvm/llvm-project/commit/e71f3d8fba67d62acfa495bf88bb84202c176d75 DIFF: https://github.com/llvm/llvm-project/commit/e71f3d8fba67d62acfa495bf88bb84202c176d75.diff LOG: fix undefined symbols on Android side issues Change-Id: I1186f86370737c064cebda5f2d38085a97db7457 Added: Modified: compiler-rt/cmake/config-ix.cmake Removed: ################################################################################ diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index ca976e962008..0463ed2a7e6f 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -744,14 +744,19 @@ else() set(COMPILER_RT_HAS_PROFILE FALSE) endif() -if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH AND - OS_NAME MATCHES "Darwin|Linux|FreeBSD|Android|NetBSD" AND ANDROID_PLATFORM_LEVEL GREATER 23) - set(COMPILER_RT_HAS_TSAN TRUE) +if (COMPILER_RT_HAS_SANITIZER_COMMON AND TSAN_SUPPORTED_ARCH) + if (OS_NAME MATCHES "Linux|Darwin|FreeBSD|NetBSD") + set(COMPILER_RT_HAS_TSAN TRUE) + elseif (OS_NAME MATCHES "Android" AND ANDROID_PLATFORM_LEVEL GREATER 23) + set(COMPILER_RT_HAS_TSAN TRUE) + else() + set(COMPILER_RT_HAS_TSAN FALSE) + endif() else() set(COMPILER_RT_HAS_TSAN FALSE) endif() -if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD|SunOS" AND ANDROID_PLATFORM_LEVEL GREATER 23) +if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD|SunOS") set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME TRUE) else() set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME FALSE) _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits