From b81fcd01bde51eb8976b81a2c0c19fc0645cd2ff Mon Sep 17 00:00:00 2001 From: Chris Apple Date: Wed, 10 Jul 2024 11:28:58 -0700 Subject: [PATCH] [rtsan] Restrict arches and disable android (#98268) Follow on to #92460 (reporting old android builds failing) and #98264 (powerpc failing to discover gtests). Getting back to stability by getting back down to a very basic set of supported arches and OS's. In the future if there is demand we can build it back up. Especially when I understand how to test these systems, or have people who want to do the work on them. --------- Co-authored-by: David Trevelyan --- compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake | 4 +--- compiler-rt/cmake/config-ix.cmake | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake b/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake index c8bec41db36e..7e99df0a3c7f 100644 --- a/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake +++ b/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake @@ -32,9 +32,7 @@ set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64} ${LOONGARCH64}) set(ALL_ASAN_ABI_SUPPORTED_ARCH ${X86_64} ${ARM64} ${ARM64_32}) set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64} ${LOONGARCH64}) -#set(ALL_RTSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64} -# ${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON} -# ${LOONGARCH64}) +set(ALL_RTSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64}) if(ANDROID) set(OS_NAME "Android") diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index c0bee77bfe70..1833f0776ec2 100644 --- a/compiler-rt/cmake/config-ix.cmake +++ b/compiler-rt/cmake/config-ix.cmake @@ -752,7 +752,7 @@ else() endif() if (COMPILER_RT_HAS_SANITIZER_COMMON AND RTSAN_SUPPORTED_ARCH AND - OS_NAME MATCHES "Android|Darwin|Linux") + OS_NAME MATCHES "Darwin|Linux") set(COMPILER_RT_HAS_RTSAN TRUE) else() set(COMPILER_RT_HAS_RTSAN FALSE)