From ddff1fa4c6cb80363a2c2a34fd5eace95be585d4 Mon Sep 17 00:00:00 2001 From: Alex Rønne Petersen Date: Sat, 15 Feb 2025 19:21:19 +0100 Subject: compiler-rt: Use Windows Arm ABI routines for UEFI for now. Until #21630 is addressed. Closes #22893. --- lib/compiler_rt/common.zig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/compiler_rt/common.zig b/lib/compiler_rt/common.zig index d85c05ba84..93bcd982e0 100644 --- a/lib/compiler_rt/common.zig +++ b/lib/compiler_rt/common.zig @@ -33,7 +33,8 @@ pub const want_aeabi = switch (builtin.abi) { }; /// These functions are provided by libc when targeting MSVC, but not MinGW. -pub const want_windows_arm_abi = builtin.cpu.arch.isArm() and builtin.os.tag == .windows and (builtin.abi.isGnu() or !builtin.link_libc); +// Temporarily used for thumb-uefi until https://github.com/ziglang/zig/issues/21630 is addressed. +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); pub const want_ppc_abi = builtin.cpu.arch.isPowerPC(); -- cgit v1.2.3