Skip to content

Commit

Permalink
ensure arm arch before adjusting VEXos system ABI to aapcs
Browse files Browse the repository at this point in the history
  • Loading branch information
doinkythederp authored and Tropix126 committed Jan 5, 2025
1 parent 9522587 commit 3f6b70c
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion compiler/rustc_target/src/spec/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2817,7 +2817,9 @@ impl Target {
Abi::System { unwind } if self.is_like_windows && self.arch == "x86" && !c_variadic => {
Abi::Stdcall { unwind }
}
Abi::System { unwind } if self.is_like_vexos && !c_variadic => Abi::Aapcs { unwind },
Abi::System { unwind } if self.is_like_vexos && self.arch == "arm" && !c_variadic => {
Abi::Aapcs { unwind }
}
Abi::System { unwind } => Abi::C { unwind },
Abi::EfiApi if self.arch == "arm" => Abi::Aapcs { unwind: false },
Abi::EfiApi if self.arch == "x86_64" => Abi::Win64 { unwind: false },
Expand Down

0 comments on commit 3f6b70c

Please sign in to comment.