Skip to content

Commit 5737558

Browse files
author
Pat Hickey
authored
Merge pull request #2976 from bjorn3/aarch64-object
Lower Arm64Call relocations in cranelift-object
2 parents b506bc3 + e9f3ac2 commit 5737558

3 files changed

Lines changed: 9 additions & 4 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cranelift/object/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ edition = "2018"
1212
[dependencies]
1313
cranelift-module = { path = "../module", version = "0.75.0" }
1414
cranelift-codegen = { path = "../codegen", version = "0.75.0", default-features = false, features = ["std"] }
15-
object = { version = "0.25.0", default-features = false, features = ["write"] }
15+
object = { version = "0.25.3", default-features = false, features = ["write"] }
1616
target-lexicon = "0.12"
1717
anyhow = "1.0"
1818
log = { version = "0.4.6", default-features = false }

cranelift/object/src/backend.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -585,6 +585,11 @@ impl ObjectModule {
585585
32,
586586
),
587587
Reloc::X86GOTPCRel4 => (RelocationKind::GotRelative, RelocationEncoding::Generic, 32),
588+
Reloc::Arm64Call => (
589+
RelocationKind::Relative,
590+
RelocationEncoding::AArch64Call,
591+
26,
592+
),
588593
Reloc::ElfX86_64TlsGd => {
589594
assert_eq!(
590595
self.object.format(),
@@ -614,7 +619,7 @@ impl ObjectModule {
614619
)
615620
}
616621
// FIXME
617-
_ => unimplemented!(),
622+
reloc => unimplemented!("{:?}", reloc),
618623
};
619624
ObjectRelocRecord {
620625
offset: record.offset,

0 commit comments

Comments
 (0)