Merge pull request #541 from nicholasbishop/bishop-gnuwin-or-uefi-2

rust-lang · Jul 21, 2023 · 8d36e03 · 8d36e03
2 parents 98881e9 + f4a2143
commit 8d36e03
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/src/x86_64.rs b/src/x86_64.rs
@@ -11,8 +11,7 @@ use core::intrinsics;
 intrinsics! {
     #[naked]
     #[cfg(all(
-        windows,
-        target_env = "gnu",
+        any(all(windows, target_env = "gnu"), target_os = "uefi"),
         not(feature = "no-asm")
     ))]
     pub unsafe extern "C" fn ___chkstk_ms() {
@@ -40,8 +39,7 @@ intrinsics! {
 
     #[naked]
     #[cfg(all(
-        windows,
-        target_env = "gnu",
+        any(all(windows, target_env = "gnu"), target_os = "uefi"),
         not(feature = "no-asm")
     ))]
     pub unsafe extern "C" fn __alloca() {
@@ -54,8 +52,7 @@ intrinsics! {
 
     #[naked]
     #[cfg(all(
-        windows,
-        target_env = "gnu",
+        any(all(windows, target_env = "gnu"), target_os = "uefi"),
         not(feature = "no-asm")
     ))]
     pub unsafe extern "C" fn ___chkstk() {