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

Upgrade to target-lexicon 0.11

Browse Source 
This allows downstream library users to use `CDataModel` without having
to install two different versions of target-lexicon.
This commit is contained in:
Joshua Nelson
2020-09-15 13:24:50 -04:00
committed by Dan Gohman
parent 379aed8092
commit d28abad441
23 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cranelift/object/Cargo.toml
View File

@@ -13,7 +13,7 @@ edition = "2018"
cranelift-module = { path = "../module", version = "0.66.0" }
cranelift-codegen = { path = "../codegen", version = "0.66.0", default-features = false, features = ["std"] }
object = { version = "0.21.1", default-features = false, features = ["write"] }
target-lexicon = "0.10"
target-lexicon = "0.11"
anyhow = "1.0"
[badges]

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

@@ -57,11 +57,15 @@ impl ObjectBuilder {
target_lexicon::BinaryFormat::Unknown => {
return Err(ModuleError::Backend(anyhow!("binary format is unknown")))
}
other => {
return Err(ModuleError::Backend(anyhow!(
"binary format {} not recognized",
other
)))
}
};
let architecture = match isa.triple().architecture {
target_lexicon::Architecture::I386
| target_lexicon::Architecture::I586
| target_lexicon::Architecture::I686 => object::Architecture::I386,
target_lexicon::Architecture::X86_32(_) => object::Architecture::I386,
target_lexicon::Architecture::X86_64 => object::Architecture::X86_64,
target_lexicon::Architecture::Arm(_) => object::Architecture::Arm,
target_lexicon::Architecture::Aarch64(_) => object::Architecture::Aarch64,