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

@@ -16,7 +16,7 @@ gimli = "0.21.0"
wasmparser = "0.59.0"
object = { version = "0.21.1", default-features = false, features = ["read", "write"] }
wasmtime-environ = { path = "../environ", version = "0.19.0" }
target-lexicon = { version = "0.10.0", default-features = false }
target-lexicon = { version = "0.11.0", default-features = false }
anyhow = "1.0"
thiserror = "1.0.4"
more-asserts = "0.2.1"

2
crates/jit/Cargo.toml
View File

@@ -27,7 +27,7 @@ wasmtime-obj = { path = "../obj", version = "0.19.0" }
rayon = { version = "1.0", optional = true }
region = "2.1.0"
thiserror = "1.0.4"
target-lexicon = { version = "0.10.0", default-features = false }
target-lexicon = { version = "0.11.0", default-features = false }
wasmparser = "0.59.0"
more-asserts = "0.2.1"
anyhow = "1.0"

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() {

2
crates/profiling/Cargo.toml
View File

@@ -18,7 +18,7 @@ lazy_static = "1.4"
libc = { version = "0.2.60", default-features = false }
scroll = { version = "0.10.1", features = ["derive"], optional = true }
serde = { version = "1.0.99", features = ["derive"] }
target-lexicon = "0.10.0"
target-lexicon = "0.11.0"
wasmtime-environ = { path = "../environ", version = "0.19.0" }
wasmtime-runtime = { path = "../runtime", version = "0.19.0" }
ittapi-rs = { version = "0.1.5", optional = true }

2
crates/profiling/src/jitdump_linux.rs
View File

@@ -238,7 +238,7 @@ impl State {
fn get_e_machine(&self) -> u32 {
match target_lexicon::HOST.architecture {
Architecture::X86_64 => elf::EM_X86_64 as u32,
Architecture::I686 => elf::EM_386 as u32,
Architecture::X86_32(_) => elf::EM_386 as u32,
Architecture::Arm(_) => elf::EM_ARM as u32,
Architecture::Aarch64(_) => elf::EM_AARCH64 as u32,
_ => unimplemented!("unrecognized architecture"),

2
crates/test-programs/Cargo.toml
View File

@@ -13,7 +13,7 @@ cfg-if = "0.1.9"
wasi-common = { path = "../wasi-common", version = "0.19.0" }
wasmtime-wasi = { path = "../wasi", version = "0.19.0" }
wasmtime = { path = "../wasmtime", version = "0.19.0" }
target-lexicon = "0.10.0"
target-lexicon = "0.11.0"
pretty_env_logger = "0.4.0"
tempfile = "3.1.0"
os_pipe = "0.9"

2
crates/wasmtime/Cargo.toml
View File

@@ -16,7 +16,7 @@ wasmtime-jit = { path = "../jit", version = "0.19.0" }
wasmtime-cache = { path = "../cache", version = "0.19.0", optional = true }
wasmtime-profiling = { path = "../profiling", version = "0.19.0" }
wasmparser = "0.59.0"
target-lexicon = { version = "0.10.0", default-features = false }
target-lexicon = { version = "0.11.0", default-features = false }
anyhow = "1.0.19"
region = "2.2.0"
libc = "0.2"