Skip to content

Commit ffb9cb7

Browse files
smeenaimemfrob
authored and
memfrob
committed
[builtins] Build for arm64e for Darwin
swiftlang/swift#30112 makes the Swift standard library for iOS build for arm64e. If you're building Swift against your own LLVM, this in turn requires having the builtins built for arm64e, otherwise you won't be able to use the builtins (which will in turn lead to an undefined symbol for `__isOSVersionAtLeast`). Make the builtins build for arm64e to fix this. Differential Revision: https://reviews.llvm.org/D76041
1 parent 9abbd0c commit ffb9cb7

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ set(WASM32 wasm32)
3939
set(WASM64 wasm64)
4040

4141
if(APPLE)
42-
set(ARM64 arm64)
42+
set(ARM64 arm64 arm64e)
4343
set(ARM32 armv7 armv7k armv7s)
4444
set(X86_64 x86_64 x86_64h)
4545
endif()

compiler-rt/lib/builtins/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -485,6 +485,7 @@ set(armv7_SOURCES ${arm_SOURCES})
485485
set(armv7s_SOURCES ${arm_SOURCES})
486486
set(armv7k_SOURCES ${arm_SOURCES})
487487
set(arm64_SOURCES ${aarch64_SOURCES})
488+
set(arm64e_SOURCES ${aarch64_SOURCES})
488489

489490
# macho_embedded archs
490491
set(armv6m_SOURCES ${thumb1_SOURCES})

0 commit comments

Comments
 (0)