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
crates/obj/Cargo.toml
View File

@@ -15,7 +15,7 @@ anyhow = "1.0"
wasmtime-environ = { path = "../environ", version = "0.19.0" }
object = { version = "0.21.1", default-features = false, features = ["write"] }
more-asserts = "0.2.1"
target-lexicon = { version = "0.10.0", default-features = false }
target-lexicon = { version = "0.11.0", default-features = false }
wasmtime-debug = { path = "../debug", version = "0.19.0" }
[badges]

3
crates/obj/src/builder.rs
View File

@@ -98,7 +98,7 @@ fn to_object_architecture(
) -> Result<Architecture, anyhow::Error> {
use target_lexicon::Architecture::*;
Ok(match arch {
I386 | I586 | I686 => Architecture::I386,
X86_32(_) => Architecture::I386,
X86_64 => Architecture::X86_64,
Arm(_) => Architecture::Arm,
Aarch64(_) => Architecture::Aarch64,
@@ -238,6 +238,7 @@ impl ObjectBuilderTarget {
target_lexicon::BinaryFormat::Unknown => {
bail!("binary format is unknown");
}
other => bail!("binary format {} is unsupported", other),
};
let architecture = to_object_architecture(triple.architecture)?;
let endianness = match triple.endianness().unwrap() {