[llvm-branch-commits] [compiler-rt] ed99428 - fix undefined symbols on Android side issues
via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Oct 24 17:57:07 PDT 2022
Author: zijunzhao
Date: 2022-01-20T22:11:41Z
New Revision: ed994281816e17ae9e0b77b0fb1f2de9de939379
URL: https://github.com/llvm/llvm-project/commit/ed994281816e17ae9e0b77b0fb1f2de9de939379
DIFF: https://github.com/llvm/llvm-project/commit/ed994281816e17ae9e0b77b0fb1f2de9de939379.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 5fe846d771038..dd0d236efeaa7 100644
--- a/compiler-rt/cmake/config-ix.cmake
+++ b/compiler-rt/cmake/config-ix.cmake
@@ -665,13 +665,24 @@ 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")
- 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")
+ set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME TRUE)
+else()
+ set(COMPILER_RT_TSAN_HAS_STATIC_RUNTIME FALSE)
+endif()
+
if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|SunOS")
set(COMPILER_RT_HAS_UBSAN TRUE)
More information about the llvm-branch-commits
mailing list