Skip to content

Commit a31cbd2

Browse files
committed
Revert "[rtsan] Restrict arches and disable android (#98268)"
Some failures in Rtsan-aarch64-NoInstTest have been reported. This reverts commit ed17431. This reverts commit b81fcd0.
1 parent 1b3e376 commit a31cbd2

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}
3232
${LOONGARCH64})
3333
set(ALL_ASAN_ABI_SUPPORTED_ARCH ${X86_64} ${ARM64} ${ARM64_32})
3434
set(ALL_DFSAN_SUPPORTED_ARCH ${X86_64} ${MIPS64} ${ARM64} ${LOONGARCH64})
35-
set(ALL_RTSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM64})
35+
#set(ALL_RTSAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}
36+
# ${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON}
37+
# ${LOONGARCH64})
3638

3739
if(ANDROID)
3840
set(OS_NAME "Android")

compiler-rt/cmake/config-ix.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -759,7 +759,7 @@ else()
759759
endif()
760760

761761
if (COMPILER_RT_HAS_SANITIZER_COMMON AND RTSAN_SUPPORTED_ARCH AND
762-
OS_NAME MATCHES "Darwin|Linux")
762+
OS_NAME MATCHES "Android|Darwin|Linux")
763763
set(COMPILER_RT_HAS_RTSAN TRUE)
764764
else()
765765
set(COMPILER_RT_HAS_RTSAN FALSE)

0 commit comments

Comments
 (0)