Use the target-lexicon crate.
This switches from a custom list of architectures to use the target-lexicon crate. - "set is_64bit=1; isa x86" is replaced with "target x86_64", and similar for other architectures, and the `is_64bit` flag is removed entirely. - The `is_compressed` flag is removed too; it's no longer being used to control REX prefixes on x86-64, ARM and Thumb are separate architectures in target-lexicon, and we can figure out how to select RISC-V compressed encodings when we're ready.
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
//! Utilities for working with Faerie container formats.
|
||||
|
||||
use cretonne_codegen::binemit::Reloc;
|
||||
use target_lexicon::BinaryFormat;
|
||||
|
||||
/// An object file format.
|
||||
#[derive(Copy, Clone, Debug, Eq, PartialEq)]
|
||||
@@ -13,9 +14,9 @@ pub enum Format {
|
||||
|
||||
/// Translate from a Cretonne `Reloc` to a raw object-file-format-specific
|
||||
/// relocation code.
|
||||
pub fn raw_relocation(reloc: Reloc, format: Format) -> u32 {
|
||||
pub fn raw_relocation(reloc: Reloc, format: BinaryFormat) -> u32 {
|
||||
match format {
|
||||
Format::ELF => {
|
||||
BinaryFormat::Elf => {
|
||||
use goblin::elf;
|
||||
match reloc {
|
||||
Reloc::Abs4 => elf::reloc::R_X86_64_32,
|
||||
@@ -28,6 +29,7 @@ pub fn raw_relocation(reloc: Reloc, format: Format) -> u32 {
|
||||
_ => unimplemented!(),
|
||||
}
|
||||
}
|
||||
Format::MachO => unimplemented!(),
|
||||
BinaryFormat::Macho => unimplemented!("macho relocations"),
|
||||
_ => unimplemented!("unsupported format"),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user