Skip to content

rustc_target: Add efiapi ABI support for LoongArch #150012

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
heiher wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −3
Open

rustc_target: Add efiapi ABI support for LoongArch #150012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler/rustc_target/src/asm/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,8 +997,8 @@ impl InlineAsmClobberAbi {
_ => Err(&["C", "system"]),
},
InlineAsmArch::LoongArch32 | InlineAsmArch::LoongArch64 => match name {
"C" | "system" => Ok(InlineAsmClobberAbi::LoongArch),
_ => Err(&["C", "system"]),
"C" | "system" | "efiapi" => Ok(InlineAsmClobberAbi::LoongArch),
_ => Err(&["C", "system", "efiapi"]),
},
InlineAsmArch::PowerPC | InlineAsmArch::PowerPC64 => match name {
"C" | "system" => Ok(if target.abi == Abi::Spe {
Expand Down
7 changes: 6 additions & 1 deletion compiler/rustc_target/src/spec/abi_map.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ impl AbiMap {
ArmVer::Other
}),
Arch::Avr => ArchKind::Avr,
Arch::LoongArch32 | Arch::LoongArch64 => ArchKind::LoongArch,
Arch::Msp430 => ArchKind::Msp430,
Arch::Nvptx64 => ArchKind::Nvptx,
Arch::RiscV32 | Arch::RiscV64 => ArchKind::Riscv,
Expand Down Expand Up @@ -108,7 +109,10 @@ impl AbiMap {

(ExternAbi::EfiApi, ArchKind::Arm(..)) => CanonAbi::Arm(ArmCall::Aapcs),
(ExternAbi::EfiApi, ArchKind::X86_64) => CanonAbi::X86(X86Call::Win64),
(ExternAbi::EfiApi, ArchKind::Aarch64 | ArchKind::Riscv | ArchKind::X86) => CanonAbi::C,
(
ExternAbi::EfiApi,
ArchKind::Aarch64 | ArchKind::LoongArch | ArchKind::Riscv | ArchKind::X86,
) => CanonAbi::C,
(ExternAbi::EfiApi, _) => return AbiMapping::Invalid,

/* arm */
Expand Down Expand Up @@ -196,6 +200,7 @@ enum ArchKind {
Amdgpu,
Arm(ArmVer),
Avr,
LoongArch,
Msp430,
Nvptx,
Riscv,
Expand Down
Loading