Skip to content

Commit

Permalink
Merge pull request #5017 from ArchGuyWu/fix-mingw-build
Browse files Browse the repository at this point in the history
Use ___chkstk_ms for mingw
  • Loading branch information
syrusakbary authored Aug 19, 2024
2 parents b26b999 + 99ea117 commit f59fac6
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions lib/vm/src/probestack.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ cfg_if::cfg_if! {
// ___chkstk (note the triple underscore) is implemented in compiler-builtins/src/x86_64.rs
// by the Rust compiler for the MinGW target
#[cfg(all(target_os = "windows", target_env = "gnu"))]
pub fn ___chkstk();
pub fn ___chkstk_ms();
}
/// The probestack for Windows when compiled with GNU
pub const PROBESTACK: unsafe extern "C" fn() = ___chkstk;
pub const PROBESTACK: unsafe extern "C" fn() = ___chkstk_ms;
} else if #[cfg(not(any(target_arch = "x86_64", target_arch = "x86")))] {
// As per
// https://github.com/rust-lang/compiler-builtins/blob/cae3e6ea23739166504f9f9fb50ec070097979d4/src/probestack.rs#L39,
Expand Down

0 comments on commit f59fac6

Please sign in to comment.