From e8509dd054bf960bde4de66f76829a755a0c46a9 Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Fri, 27 Oct 2023 20:19:55 +0000 Subject: [PATCH] Enable src/math for all UEFI targets This fixes various math operations on aarch64-unknown-uefi and i686-unknown-uefi. --- library/compiler-builtins/src/lib.rs | 2 +- library/compiler-builtins/src/math.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/compiler-builtins/src/lib.rs b/library/compiler-builtins/src/lib.rs index d1195a4a83de..e2e35fbd324a 100644 --- a/library/compiler-builtins/src/lib.rs +++ b/library/compiler-builtins/src/lib.rs @@ -46,7 +46,7 @@ pub mod int; #[cfg(any( all(target_family = "wasm", target_os = "unknown"), all(target_arch = "x86_64", target_os = "none"), - all(target_arch = "x86_64", target_os = "uefi"), + target_os = "uefi", all(target_arch = "arm", target_os = "none"), all(target_arch = "xtensa", target_os = "none"), all(target_arch = "mips", target_os = "none"), diff --git a/library/compiler-builtins/src/math.rs b/library/compiler-builtins/src/math.rs index f8f9d225bea9..63d85833393e 100644 --- a/library/compiler-builtins/src/math.rs +++ b/library/compiler-builtins/src/math.rs @@ -22,7 +22,7 @@ macro_rules! no_mangle { not(target_env = "wasi") ), target_os = "xous", - all(target_arch = "x86_64", target_os = "uefi"), + target_os = "uefi", all(target_arch = "xtensa", target_os = "none"), all(target_vendor = "fortanix", target_env = "sgx") ))] @@ -94,7 +94,7 @@ no_mangle! { not(target_env = "wasi") ), target_os = "xous", - all(target_arch = "x86_64", target_os = "uefi"), + target_os = "uefi", all(target_arch = "xtensa", target_os = "none"), all(target_vendor = "fortanix", target_env = "sgx"), target_os = "windows"