diff --git a/compiler/rustc_target/src/callconv/mod.rs b/compiler/rustc_target/src/callconv/mod.rs
index e019dc55950e..6aae8bc75560 100644
--- a/compiler/rustc_target/src/callconv/mod.rs
+++ b/compiler/rustc_target/src/callconv/mod.rs
@@ -900,22 +900,21 @@ impl FromStr for Conv {
 
 fn conv_to_externabi(conv: &Conv) -> ExternAbi {
     match conv {
+        Conv::C => ExternAbi::C { unwind: false },
         Conv::Rust => ExternAbi::Rust,
         Conv::PreserveMost => ExternAbi::RustCold,
-        Conv::X86Stdcall => ExternAbi::Stdcall { unwind: false },
-        Conv::X86Fastcall => ExternAbi::Fastcall { unwind: false },
-        Conv::X86VectorCall => ExternAbi::Vectorcall { unwind: false },
-        Conv::X86ThisCall => ExternAbi::Thiscall { unwind: false },
-        Conv::C => ExternAbi::C { unwind: false },
-        Conv::X86_64Win64 => ExternAbi::Win64 { unwind: false },
-        Conv::X86_64SysV => ExternAbi::SysV64 { unwind: false },
         Conv::ArmAapcs => ExternAbi::Aapcs { unwind: false },
         Conv::CCmseNonSecureCall => ExternAbi::CCmseNonSecureCall,
         Conv::CCmseNonSecureEntry => ExternAbi::CCmseNonSecureEntry,
-        Conv::PtxKernel => ExternAbi::PtxKernel,
         Conv::Msp430Intr => ExternAbi::Msp430Interrupt,
-        Conv::X86Intr => ExternAbi::X86Interrupt,
         Conv::GpuKernel => ExternAbi::GpuKernel,
+        Conv::X86Fastcall => ExternAbi::Fastcall { unwind: false },
+        Conv::X86Intr => ExternAbi::X86Interrupt,
+        Conv::X86Stdcall => ExternAbi::Stdcall { unwind: false },
+        Conv::X86ThisCall => ExternAbi::Thiscall { unwind: false },
+        Conv::X86VectorCall => ExternAbi::Vectorcall { unwind: false },
+        Conv::X86_64SysV => ExternAbi::SysV64 { unwind: false },
+        Conv::X86_64Win64 => ExternAbi::Win64 { unwind: false },
         Conv::AvrInterrupt => ExternAbi::AvrInterrupt,
         Conv::AvrNonBlockingInterrupt => ExternAbi::AvrNonBlockingInterrupt,
         Conv::RiscvInterrupt { kind: RiscvInterruptKind::Machine } => ExternAbi::RiscvInterruptM,