From 7a5a3daaff67a7dcc4f4ac5dbfef97d24821f139 Mon Sep 17 00:00:00 2001 From: Chris Apple Date: Tue, 9 Jul 2024 20:11:46 -0700 Subject: [PATCH 1/2] Restrict the architectures rtsan runs on --- compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake b/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake index bc152e304aaaf..7e99df0a3c7f5 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") From 5ff0aae854eb3323c5f470f4f04dfed3cd0e0b8e Mon Sep 17 00:00:00 2001 From: Chris Apple Date: Tue, 9 Jul 2024 20:12:00 -0700 Subject: [PATCH 2/2] Only build for linux and darwin for now --- compiler-rt/cmake/config-ix.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compiler-rt/cmake/config-ix.cmake b/compiler-rt/cmake/config-ix.cmake index c0bee77bfe70f..1833f0776ec24 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)