T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update object to 0.18 (#1381)

Browse Source
This commit is contained in:
bjorn3
2020-03-23 14:56:51 +01:00
committed by GitHub
parent 139536828a
commit d54611dac8
5 changed files with 20 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cranelift/object/Cargo.toml
View File

@@ -11,9 +11,8 @@ edition = "2018"
[dependencies]
cranelift-module = { path = "../module", version = "0.60.0" }
object = { version = "0.17", default-features = false, features = ["write"] }
object = { version = "0.18", default-features = false, features = ["write"] }
target-lexicon = "0.10"
goblin = "0.1.0"
[dependencies.cranelift-codegen]
path = "../codegen"

6
cranelift/object/src/backend.rs
View File

@@ -515,7 +515,7 @@ impl ObjectProduct {
/// Write the object bytes in memory.
#[inline]
pub fn emit(self) -> Result<Vec<u8>, String> {
pub fn emit(self) -> Result<Vec<u8>, object::write::Error> {
self.object.write()
}
}
@@ -584,7 +584,7 @@ impl RelocSink for ObjectRelocSink {
"ElfX86_64TlsGd is not supported for this file format"
);
(
RelocationKind::Elf(goblin::elf64::reloc::R_X86_64_TLSGD),
RelocationKind::Elf(object::elf::R_X86_64_TLSGD),
RelocationEncoding::Generic,
32,
)
@@ -598,7 +598,7 @@ impl RelocSink for ObjectRelocSink {
addend += 4; // X86_64_RELOC_TLV has an implicit addend of -4
(
RelocationKind::MachO {
value: goblin::mach::relocation::X86_64_RELOC_TLV,
value: object::macho::X86_64_RELOC_TLV,
relative: true,
},
RelocationEncoding::Generic,