Skip to content

Revert "[CompilerRT] Remove sanitizer support for i386 watchsim (#11… #9717

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions compiler-rt/cmake/Modules/CompilerRTDarwinUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,14 @@ 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 simulators. We should drop it.
# a valid or useful architecture for the iOS simulator we should drop it.
if(${os} MATCHES "^(iossim|tvossim|watchossim)$")
list(REMOVE_ITEM archs "x86_64h")
if ("i386" IN_LIST archs)
list(REMOVE_ITEM archs "i386")
message(STATUS "Disabling i386 slice for simulator")
endif()
endif()

if(${os} MATCHES "iossim")
message(STATUS "Disabling i386 slice for iossim")
list(REMOVE_ITEM archs "i386")
endif()

if(${os} MATCHES "^ios$")
Expand Down