mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ABI flags in RISC-V/LoongArch ELF file generated by rustc

Browse Source
This commit is contained in:
Gary Guo 2023-08-01 16:30:02 +01:00
parent 0f7f6b7061
commit a8a92f5131
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
compiler/rustc_codegen_ssa/src/back/metadata.rs
View File

@ -16,6 +16,7 @@ use rustc_metadata::fs::METADATA_FILENAME;
use rustc_metadata::EncodedMetadata; use rustc_metadata::EncodedMetadata;
use rustc_session::cstore::MetadataLoader; use rustc_session::cstore::MetadataLoader;
use rustc_session::Session; use rustc_session::Session;
use rustc_span::sym;
use rustc_target::abi::Endian; use rustc_target::abi::Endian;
use rustc_target::spec::{ef_avr_arch, RelocModel, Target}; use rustc_target::spec::{ef_avr_arch, RelocModel, Target};
@ -272,35 +273,37 @@ pub(crate) fn create_object_file(sess: &Session) -> Option<write::Object<'static
Architecture::Riscv32 | Architecture::Riscv64 => { Architecture::Riscv32 | Architecture::Riscv64 => {
// Source: https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/079772828bd10933d34121117a222b4cc0ee2200/riscv-elf.adoc // Source: https://github.com/riscv-non-isa/riscv-elf-psabi-doc/blob/079772828bd10933d34121117a222b4cc0ee2200/riscv-elf.adoc
let mut e_flags: u32 = 0x0; let mut e_flags: u32 = 0x0;
let features = &sess.target.options.features;
// Check if compressed is enabled // Check if compressed is enabled
if features.contains("+c") { if sess.unstable_target_features.contains(&sym::c) {
e_flags |= elf::EF_RISCV_RVC; e_flags |= elf::EF_RISCV_RVC;
} }
// Select the appropriate floating-point ABI // Set the appropriate flag based on ABI
if features.contains("+d") { // This needs to match LLVM `RISCVELFStreamer.cpp`
e_flags |= elf::EF_RISCV_FLOAT_ABI_DOUBLE; match &*sess.target.llvm_abiname {
} else if features.contains("+f") { "ilp32" | "lp64" => (),
e_flags |= elf::EF_RISCV_FLOAT_ABI_SINGLE; "ilp32f" | "lp64f" => e_flags |= elf::EF_RISCV_FLOAT_ABI_SINGLE,
} else { "ilp32d" | "lp64d" => e_flags |= elf::EF_RISCV_FLOAT_ABI_DOUBLE,
e_flags |= elf::EF_RISCV_FLOAT_ABI_SOFT; "ilp32e" => e_flags |= elf::EF_RISCV_RVE,
_ => bug!("unknown RISC-V ABI name"),
} }
e_flags e_flags
} }
Architecture::LoongArch64 => { Architecture::LoongArch64 => {
// Source: https://github.com/loongson/la-abi-specs/blob/release/laelf.adoc#e_flags-identifies-abi-type-and-version // Source: https://github.com/loongson/la-abi-specs/blob/release/laelf.adoc#e_flags-identifies-abi-type-and-version
let mut e_flags: u32 = elf::EF_LARCH_OBJABI_V1; let mut e_flags: u32 = elf::EF_LARCH_OBJABI_V1;
let features = &sess.target.options.features;
// Select the appropriate floating-point ABI // Set the appropriate flag based on ABI
if features.contains("+d") { // This needs to match LLVM `LoongArchELFStreamer.cpp`
e_flags |= elf::EF_LARCH_ABI_DOUBLE_FLOAT; match &*sess.target.llvm_abiname {
} else if features.contains("+f") { "ilp32s" | "lp64s" => e_flags |= elf::EF_LARCH_ABI_SOFT_FLOAT,
e_flags |= elf::EF_LARCH_ABI_SINGLE_FLOAT; "ilp32f" | "lp64f" => e_flags |= elf::EF_LARCH_ABI_SINGLE_FLOAT,
} else { "ilp32d" | "lp64d" => e_flags |= elf::EF_LARCH_ABI_DOUBLE_FLOAT,
e_flags |= elf::EF_LARCH_ABI_SOFT_FLOAT; _ => bug!("unknown RISC-V ABI name"),
} }
e_flags e_flags
} }
Architecture::Avr => { Architecture::Avr => {

1
compiler/rustc_span/src/symbol.rs
View File

@ -445,6 +445,7 @@ symbols! {
bridge, bridge,
bswap, bswap,
builtin_syntax, builtin_syntax,
c,
c_str, c_str,
c_str_literals, c_str_literals,
c_unwind, c_unwind,