From 00138ff903c913b6f7ffdfb7dd699f48a996999f Mon Sep 17 00:00:00 2001 From: Cyndy Ishida Date: Wed, 20 Nov 2024 09:14:28 -0800 Subject: [PATCH] [CompilerRT] Remove sanitizer support for i386 watchsim This patch removes remaining support for i386 simulators, watch was the only one left though. resolves: rdar://102741146 --- compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake index f3c8fbe2c2fec..74a5d4edcd859 100644 --- a/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake +++ b/compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake @@ -136,14 +136,13 @@ function(darwin_test_archs os valid_archs) # The simple program will build for x86_64h on the simulator because it is # compatible with x86_64 libraries (mostly), but since x86_64h isn't actually - # a valid or useful architecture for the iOS simulator we should drop it. + # a valid or useful architecture for the simulators. We should drop it. if(${os} MATCHES "^(iossim|tvossim|watchossim)$") list(REMOVE_ITEM archs "x86_64h") - endif() - - if(${os} MATCHES "iossim") - message(STATUS "Disabling i386 slice for iossim") - list(REMOVE_ITEM archs "i386") + if ("i386" IN_LIST archs) + list(REMOVE_ITEM archs "i386") + message(STATUS "Disabling i386 slice for simulator") + endif() endif() if(${os} MATCHES "^ios$")