Skip to content

Commit ddff1fa

Browse files
committed
compiler-rt: Use Windows Arm ABI routines for UEFI for now.
Until #21630 is addressed. Closes #22893.
1 parent 9ad5751 commit ddff1fa

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

lib/compiler_rt/common.zig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ pub const want_aeabi = switch (builtin.abi) {
3333
};
3434

3535
/// These functions are provided by libc when targeting MSVC, but not MinGW.
36-
pub const want_windows_arm_abi = builtin.cpu.arch.isArm() and builtin.os.tag == .windows and (builtin.abi.isGnu() or !builtin.link_libc);
36+
// Temporarily used for thumb-uefi until https://github.com/ziglang/zig/issues/21630 is addressed.
37+
pub const want_windows_arm_abi = builtin.cpu.arch.isArm() and (builtin.os.tag == .windows or builtin.os.tag == .uefi) and (builtin.abi.isGnu() or !builtin.link_libc);
3738

3839
pub const want_ppc_abi = builtin.cpu.arch.isPowerPC();
3940

0 commit comments

Comments
 (0)