From 0b211be054ff4922e0edc2b989b1745fa4d59c68 Mon Sep 17 00:00:00 2001 From: bjorn3 Date: Sun, 19 Jul 2020 14:45:58 +0200 Subject: [PATCH] Use SystemV abi for extern "sysv64" even on Windows --- src/abi/mod.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/abi/mod.rs b/src/abi/mod.rs index 1b67f3d6f15..0a6d54c73b3 100644 --- a/src/abi/mod.rs +++ b/src/abi/mod.rs @@ -91,7 +91,8 @@ fn clif_sig_from_fn_sig<'tcx>( }; let (call_conv, inputs, output): (CallConv, Vec>, Ty<'tcx>) = match abi { Abi::Rust => (CallConv::triple_default(triple), sig.inputs().to_vec(), sig.output()), - Abi::C | Abi::Unadjusted | Abi::SysV64 => (CallConv::triple_default(triple), sig.inputs().to_vec(), sig.output()), + Abi::C | Abi::Unadjusted => (CallConv::triple_default(triple), sig.inputs().to_vec(), sig.output()), + Abi::SysV64 => (CallConv::SystemV, sig.inputs().to_vec(), sig.output()), Abi::RustCall => { assert_eq!(sig.inputs().len(), 2); let extra_args = match sig.inputs().last().unwrap().kind {