diff --git a/compiler/rustc_target/src/abi/mod.rs b/compiler/rustc_abi/src/layout/ty.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/mod.rs
rename to compiler/rustc_abi/src/layout/ty.rs
diff --git a/compiler/rustc_target/src/abi/call/aarch64.rs b/compiler/rustc_target/src/callconv/aarch64.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/aarch64.rs
rename to compiler/rustc_target/src/callconv/aarch64.rs
diff --git a/compiler/rustc_target/src/abi/call/amdgpu.rs b/compiler/rustc_target/src/callconv/amdgpu.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/amdgpu.rs
rename to compiler/rustc_target/src/callconv/amdgpu.rs
diff --git a/compiler/rustc_target/src/abi/call/arm.rs b/compiler/rustc_target/src/callconv/arm.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/arm.rs
rename to compiler/rustc_target/src/callconv/arm.rs
diff --git a/compiler/rustc_target/src/abi/call/avr.rs b/compiler/rustc_target/src/callconv/avr.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/avr.rs
rename to compiler/rustc_target/src/callconv/avr.rs
diff --git a/compiler/rustc_target/src/abi/call/bpf.rs b/compiler/rustc_target/src/callconv/bpf.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/bpf.rs
rename to compiler/rustc_target/src/callconv/bpf.rs
diff --git a/compiler/rustc_target/src/abi/call/csky.rs b/compiler/rustc_target/src/callconv/csky.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/csky.rs
rename to compiler/rustc_target/src/callconv/csky.rs
diff --git a/compiler/rustc_target/src/abi/call/hexagon.rs b/compiler/rustc_target/src/callconv/hexagon.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/hexagon.rs
rename to compiler/rustc_target/src/callconv/hexagon.rs
diff --git a/compiler/rustc_target/src/abi/call/loongarch.rs b/compiler/rustc_target/src/callconv/loongarch.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/loongarch.rs
rename to compiler/rustc_target/src/callconv/loongarch.rs
diff --git a/compiler/rustc_target/src/abi/call/m68k.rs b/compiler/rustc_target/src/callconv/m68k.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/m68k.rs
rename to compiler/rustc_target/src/callconv/m68k.rs
diff --git a/compiler/rustc_target/src/abi/call/mips.rs b/compiler/rustc_target/src/callconv/mips.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/mips.rs
rename to compiler/rustc_target/src/callconv/mips.rs
diff --git a/compiler/rustc_target/src/abi/call/mips64.rs b/compiler/rustc_target/src/callconv/mips64.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/mips64.rs
rename to compiler/rustc_target/src/callconv/mips64.rs
diff --git a/compiler/rustc_target/src/abi/call/mod.rs b/compiler/rustc_target/src/callconv/mod.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/mod.rs
rename to compiler/rustc_target/src/callconv/mod.rs
diff --git a/compiler/rustc_target/src/abi/call/msp430.rs b/compiler/rustc_target/src/callconv/msp430.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/msp430.rs
rename to compiler/rustc_target/src/callconv/msp430.rs
diff --git a/compiler/rustc_target/src/abi/call/nvptx64.rs b/compiler/rustc_target/src/callconv/nvptx64.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/nvptx64.rs
rename to compiler/rustc_target/src/callconv/nvptx64.rs
diff --git a/compiler/rustc_target/src/abi/call/powerpc.rs b/compiler/rustc_target/src/callconv/powerpc.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/powerpc.rs
rename to compiler/rustc_target/src/callconv/powerpc.rs
diff --git a/compiler/rustc_target/src/abi/call/powerpc64.rs b/compiler/rustc_target/src/callconv/powerpc64.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/powerpc64.rs
rename to compiler/rustc_target/src/callconv/powerpc64.rs
diff --git a/compiler/rustc_target/src/abi/call/riscv.rs b/compiler/rustc_target/src/callconv/riscv.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/riscv.rs
rename to compiler/rustc_target/src/callconv/riscv.rs
diff --git a/compiler/rustc_target/src/abi/call/s390x.rs b/compiler/rustc_target/src/callconv/s390x.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/s390x.rs
rename to compiler/rustc_target/src/callconv/s390x.rs
diff --git a/compiler/rustc_target/src/abi/call/sparc.rs b/compiler/rustc_target/src/callconv/sparc.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/sparc.rs
rename to compiler/rustc_target/src/callconv/sparc.rs
diff --git a/compiler/rustc_target/src/abi/call/sparc64.rs b/compiler/rustc_target/src/callconv/sparc64.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/sparc64.rs
rename to compiler/rustc_target/src/callconv/sparc64.rs
diff --git a/compiler/rustc_target/src/abi/call/wasm.rs b/compiler/rustc_target/src/callconv/wasm.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/wasm.rs
rename to compiler/rustc_target/src/callconv/wasm.rs
diff --git a/compiler/rustc_target/src/abi/call/x86.rs b/compiler/rustc_target/src/callconv/x86.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/x86.rs
rename to compiler/rustc_target/src/callconv/x86.rs
diff --git a/compiler/rustc_target/src/abi/call/x86_64.rs b/compiler/rustc_target/src/callconv/x86_64.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/x86_64.rs
rename to compiler/rustc_target/src/callconv/x86_64.rs
diff --git a/compiler/rustc_target/src/abi/call/x86_win64.rs b/compiler/rustc_target/src/callconv/x86_win64.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/x86_win64.rs
rename to compiler/rustc_target/src/callconv/x86_win64.rs
diff --git a/compiler/rustc_target/src/abi/call/xtensa.rs b/compiler/rustc_target/src/callconv/xtensa.rs
similarity index 100%
rename from compiler/rustc_target/src/abi/call/xtensa.rs
rename to compiler/rustc_target/src/callconv/xtensa.rs