Skip to content

Commit 8891aab

Browse files
Tobias Hietatstellar
authored andcommitted
[compiler-rt][Darwin] Add arm64 to simulator platforms
I was looking around and noticed that builtins for iossim, tvossim and watchossim was missing arm64 builds, while apple's clang toolchain ship with these. After a bit of searching around it just seems like these are not listed correctly in CMake to be enabled. I enabled just arm64 since I saw that Apple clang didn't include arm64e. Reviewed By: t.p.northover Differential Revision: https://reviews.llvm.org/D118759 (cherry picked from commit a8e5ce7)
1 parent e2cba65 commit 8891aab

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

compiler-rt/cmake/builtin-config-ix.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ if(APPLE)
115115
set(DARWIN_ios_BUILTIN_MIN_VER_FLAG
116116
${DARWIN_ios_MIN_VER_FLAG}=${DARWIN_ios_BUILTIN_MIN_VER})
117117
set(DARWIN_ios_BUILTIN_ALL_POSSIBLE_ARCHS ${ARM64} ${ARM32})
118-
set(DARWIN_iossim_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64})
118+
set(DARWIN_iossim_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64} arm64)
119119
endif()
120120
if(COMPILER_RT_ENABLE_WATCHOS)
121121
list(APPEND DARWIN_EMBEDDED_PLATFORMS watchos)
@@ -124,7 +124,7 @@ if(APPLE)
124124
set(DARWIN_watchos_BUILTIN_MIN_VER_FLAG
125125
${DARWIN_watchos_MIN_VER_FLAG}=${DARWIN_watchos_BUILTIN_MIN_VER})
126126
set(DARWIN_watchos_BUILTIN_ALL_POSSIBLE_ARCHS armv7 armv7k arm64_32)
127-
set(DARWIN_watchossim_BUILTIN_ALL_POSSIBLE_ARCHS ${X86})
127+
set(DARWIN_watchossim_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} arm64)
128128
endif()
129129
if(COMPILER_RT_ENABLE_TVOS)
130130
list(APPEND DARWIN_EMBEDDED_PLATFORMS tvos)
@@ -133,7 +133,7 @@ if(APPLE)
133133
set(DARWIN_tvos_BUILTIN_MIN_VER_FLAG
134134
${DARWIN_tvos_MIN_VER_FLAG}=${DARWIN_tvos_BUILTIN_MIN_VER})
135135
set(DARWIN_tvos_BUILTIN_ALL_POSSIBLE_ARCHS armv7 arm64)
136-
set(DARWIN_tvossim_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64})
136+
set(DARWIN_tvossim_BUILTIN_ALL_POSSIBLE_ARCHS ${X86} ${X86_64} arm64)
137137
endif()
138138

139139
set(BUILTIN_SUPPORTED_OS osx)

0 commit comments

Comments
 (0)