Skip to content

Commit 813e724

Browse files
drodriguezsmeenai
authored andcommitted
[builtins] Build for arm64_32 for watchOS (Darwin)
Trying to build the builtins code fails because `arm64_32_SOURCES` is missing. Setting it to the same list used for `aarch64_SOURCES` solves that problem and allow the builtins to compile for that architecture. Additionally, arm64_32 is added as a possible architecture for watchos platforms. Reviewed By: compnerd Differential Revision: https://reviews.llvm.org/D99690
1 parent 0187c3a commit 813e724

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ if(APPLE)
122122
set(DARWIN_watchos_BUILTIN_MIN_VER 2.0)
123123
set(DARWIN_watchos_BUILTIN_MIN_VER_FLAG
124124
${DARWIN_watchos_MIN_VER_FLAG}=${DARWIN_watchos_BUILTIN_MIN_VER})
125-
set(DARWIN_watchos_BUILTIN_ALL_POSSIBLE_ARCHS armv7 armv7k)
125+
set(DARWIN_watchos_BUILTIN_ALL_POSSIBLE_ARCHS armv7 armv7k arm64_32)
126126
set(DARWIN_watchossim_BUILTIN_ALL_POSSIBLE_ARCHS ${X86})
127127
endif()
128128
if(COMPILER_RT_ENABLE_TVOS)

compiler-rt/lib/builtins/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,7 @@ set(armv7s_SOURCES ${arm_SOURCES})
555555
set(armv7k_SOURCES ${arm_SOURCES})
556556
set(arm64_SOURCES ${aarch64_SOURCES})
557557
set(arm64e_SOURCES ${aarch64_SOURCES})
558+
set(arm64_32_SOURCES ${aarch64_SOURCES})
558559

559560
# macho_embedded archs
560561
set(armv6m_SOURCES ${thumb1_SOURCES})

0 commit comments

Comments
 (0)