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

4
Cargo.lock generated
View File

@@ -2018,9 +2018,9 @@ dependencies = [
[[package]] [[package]]
name = "target-lexicon" name = "target-lexicon"
version = "0.10.0" version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ab0e7238dcc7b40a7be719a25365910f6807bd864f4cce6b2e6b873658e2b19d" checksum = "fe2635952a442a01fd4cb53d98858b5e4bb461b02c0d111f22f31772e3e7a8b2"
[[package]] [[package]]
name = "tempfile" name = "tempfile"

2
Cargo.toml
View File

@@ -34,7 +34,7 @@ wasi-common = { path = "crates/wasi-common", version = "0.19.0" }
structopt = { version = "0.3.5", features = ["color", "suggestions"] } structopt = { version = "0.3.5", features = ["color", "suggestions"] }
object = { version = "0.21.1", default-features = false, features = ["write"] } object = { version = "0.21.1", default-features = false, features = ["write"] }
anyhow = "1.0.19" anyhow = "1.0.19"
target-lexicon = { version = "0.10.0", default-features = false } target-lexicon = { version = "0.11.0", default-features = false }
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"
file-per-thread-logger = "0.1.1" file-per-thread-logger = "0.1.1"
wat = "1.0.23" wat = "1.0.23"

2
cranelift/Cargo.toml
View File

@@ -34,7 +34,7 @@ log = "0.4.8"
term = "0.6.1" term = "0.6.1"
capstone = { version = "0.6.0", optional = true } capstone = { version = "0.6.0", optional = true }
wat = { version = "1.0.18", optional = true } wat = { version = "1.0.18", optional = true }
target-lexicon = { version = "0.10", features = ["std"] } target-lexicon = { version = "0.11", features = ["std"] }
peepmatic-souper = { path = "./peepmatic/crates/souper", version = "0.66.0", optional = true } peepmatic-souper = { path = "./peepmatic/crates/souper", version = "0.66.0", optional = true }
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"
rayon = { version = "1", optional = true } rayon = { version = "1", optional = true }

2
cranelift/codegen/Cargo.toml
View File

@@ -17,7 +17,7 @@ cranelift-codegen-shared = { path = "./shared", version = "0.66.0" }
cranelift-entity = { path = "../entity", version = "0.66.0" } cranelift-entity = { path = "../entity", version = "0.66.0" }
cranelift-bforest = { path = "../bforest", version = "0.66.0" } cranelift-bforest = { path = "../bforest", version = "0.66.0" }
hashbrown = { version = "0.7", optional = true } hashbrown = { version = "0.7", optional = true }
target-lexicon = "0.10" target-lexicon = "0.11"
log = { version = "0.4.6", default-features = false } log = { version = "0.4.6", default-features = false }
serde = { version = "1.0.94", features = ["derive"], optional = true } serde = { version = "1.0.94", features = ["derive"], optional = true }
bincode = { version = "1.2.1", optional = true } bincode = { version = "1.2.1", optional = true }

6
cranelift/codegen/src/isa/mod.rs
View File

@@ -119,8 +119,10 @@ macro_rules! isa_builder {
/// Return a builder that can create a corresponding `TargetIsa`. /// Return a builder that can create a corresponding `TargetIsa`.
pub fn lookup(triple: Triple) -> Result<Builder, LookupError> { pub fn lookup(triple: Triple) -> Result<Builder, LookupError> {
match triple.architecture { match triple.architecture {
Architecture::Riscv32 | Architecture::Riscv64 => isa_builder!(riscv, "riscv", triple), Architecture::Riscv32 { .. } | Architecture::Riscv64 { .. } => {
Architecture::I386 | Architecture::I586 | Architecture::I686 | Architecture::X86_64 => { isa_builder!(riscv, "riscv", triple)
}
Architecture::X86_32 { .. } | Architecture::X86_64 => {
if cfg!(feature = "x64") { if cfg!(feature = "x64") {
isa_builder!(x64, "x64", triple) isa_builder!(x64, "x64", triple)
} else { } else {

2
cranelift/filetests/Cargo.toml
View File

@@ -23,7 +23,7 @@ gimli = { version = "0.21.0", default-features = false, features = ["read"] }
log = "0.4.6" log = "0.4.6"
memmap = "0.7.0" memmap = "0.7.0"
num_cpus = "1.8.0" num_cpus = "1.8.0"
target-lexicon = "0.10" target-lexicon = "0.11"
thiserror = "1.0.15" thiserror = "1.0.15"
anyhow = "1.0.32" anyhow = "1.0.32"

2
cranelift/frontend/Cargo.toml
View File

@@ -12,7 +12,7 @@ edition = "2018"
[dependencies] [dependencies]
cranelift-codegen = { path = "../codegen", version = "0.66.0", default-features = false } cranelift-codegen = { path = "../codegen", version = "0.66.0", default-features = false }
target-lexicon = "0.10" target-lexicon = "0.11"
log = { version = "0.4.6", default-features = false } log = { version = "0.4.6", default-features = false }
hashbrown = { version = "0.7", optional = true } hashbrown = { version = "0.7", optional = true }
smallvec = { version = "1.0.0" } smallvec = { version = "1.0.0" }

2
cranelift/native/Cargo.toml
View File

@@ -12,7 +12,7 @@ edition = "2018"
[dependencies] [dependencies]
cranelift-codegen = { path = "../codegen", version = "0.66.0", default-features = false } cranelift-codegen = { path = "../codegen", version = "0.66.0", default-features = false }
target-lexicon = "0.10" target-lexicon = "0.11"
[target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies] [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
raw-cpuid = "7.0.3" raw-cpuid = "7.0.3"

2
cranelift/object/Cargo.toml
View File

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

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

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

2
cranelift/reader/Cargo.toml
View File

@@ -12,7 +12,7 @@ edition = "2018"
[dependencies] [dependencies]
cranelift-codegen = { path = "../codegen", version = "0.66.0" } cranelift-codegen = { path = "../codegen", version = "0.66.0" }
smallvec = "1.0.0" smallvec = "1.0.0"
target-lexicon = "0.10" target-lexicon = "0.11"
thiserror = "1.0.15" thiserror = "1.0.15"
[badges] [badges]

2
cranelift/simplejit/Cargo.toml
View File

@@ -16,7 +16,7 @@ cranelift-codegen = { path = "../codegen", version = "0.66.0", default-features
region = "2.2.0" region = "2.2.0"
libc = { version = "0.2.42" } libc = { version = "0.2.42" }
errno = "0.2.4" errno = "0.2.4"
target-lexicon = "0.10" target-lexicon = "0.11"
memmap = { version = "0.7.0", optional = true } memmap = { version = "0.7.0", optional = true }
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]

4
cranelift/src/disasm.rs
View File

@@ -127,10 +127,10 @@ cfg_if! {
fn get_disassembler(isa: &dyn TargetIsa) -> Result<Capstone> { fn get_disassembler(isa: &dyn TargetIsa) -> Result<Capstone> {
let cs = match isa.triple().architecture { let cs = match isa.triple().architecture {
Architecture::Riscv32 | Architecture::Riscv64 => { Architecture::Riscv32(_) | Architecture::Riscv64(_) => {
anyhow::bail!("No disassembler for RiscV"); anyhow::bail!("No disassembler for RiscV");
} }
Architecture::I386 | Architecture::I586 | Architecture::I686 => Capstone::new() Architecture::X86_32(_) => Capstone::new()
.x86() .x86()
.mode(arch::x86::ArchMode::Mode32) .mode(arch::x86::ArchMode::Mode32)
.build()?, .build()?,

2
cranelift/wasm/Cargo.toml
View File

@@ -23,7 +23,7 @@ thiserror = "1.0.4"
[dev-dependencies] [dev-dependencies]
wat = "1.0.23" wat = "1.0.23"
target-lexicon = "0.10" target-lexicon = "0.11"
# Enable the riscv feature for cranelift-codegen, as some tests require it # Enable the riscv feature for cranelift-codegen, as some tests require it
cranelift-codegen = { path = "../codegen", version = "0.66.0", default-features = false, features = ["riscv"] } cranelift-codegen = { path = "../codegen", version = "0.66.0", default-features = false, features = ["riscv"] }

2
crates/debug/Cargo.toml
View File

@@ -16,7 +16,7 @@ gimli = "0.21.0"
wasmparser = "0.59.0" wasmparser = "0.59.0"
object = { version = "0.21.1", default-features = false, features = ["read", "write"] } object = { version = "0.21.1", default-features = false, features = ["read", "write"] }
wasmtime-environ = { path = "../environ", version = "0.19.0" } 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" anyhow = "1.0"
thiserror = "1.0.4" thiserror = "1.0.4"
more-asserts = "0.2.1" 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 } rayon = { version = "1.0", optional = true }
region = "2.1.0" region = "2.1.0"
thiserror = "1.0.4" 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" wasmparser = "0.59.0"
more-asserts = "0.2.1" more-asserts = "0.2.1"
anyhow = "1.0" 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" } wasmtime-environ = { path = "../environ", version = "0.19.0" }
object = { version = "0.21.1", default-features = false, features = ["write"] } object = { version = "0.21.1", default-features = false, features = ["write"] }
more-asserts = "0.2.1" 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" } wasmtime-debug = { path = "../debug", version = "0.19.0" }
[badges] [badges]

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

@@ -98,7 +98,7 @@ fn to_object_architecture(
) -> Result<Architecture, anyhow::Error> { ) -> Result<Architecture, anyhow::Error> {
use target_lexicon::Architecture::*; use target_lexicon::Architecture::*;
Ok(match arch { Ok(match arch {
I386 | I586 | I686 => Architecture::I386, X86_32(_) => Architecture::I386,
X86_64 => Architecture::X86_64, X86_64 => Architecture::X86_64,
Arm(_) => Architecture::Arm, Arm(_) => Architecture::Arm,
Aarch64(_) => Architecture::Aarch64, Aarch64(_) => Architecture::Aarch64,
@@ -238,6 +238,7 @@ impl ObjectBuilderTarget {
target_lexicon::BinaryFormat::Unknown => { target_lexicon::BinaryFormat::Unknown => {
bail!("binary format is unknown"); bail!("binary format is unknown");
} }
other => bail!("binary format {} is unsupported", other),
}; };
let architecture = to_object_architecture(triple.architecture)?; let architecture = to_object_architecture(triple.architecture)?;
let endianness = match triple.endianness().unwrap() { 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 } libc = { version = "0.2.60", default-features = false }
scroll = { version = "0.10.1", features = ["derive"], optional = true } scroll = { version = "0.10.1", features = ["derive"], optional = true }
serde = { version = "1.0.99", features = ["derive"] } 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-environ = { path = "../environ", version = "0.19.0" }
wasmtime-runtime = { path = "../runtime", version = "0.19.0" } wasmtime-runtime = { path = "../runtime", version = "0.19.0" }
ittapi-rs = { version = "0.1.5", optional = true } 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 { fn get_e_machine(&self) -> u32 {
match target_lexicon::HOST.architecture { match target_lexicon::HOST.architecture {
Architecture::X86_64 => elf::EM_X86_64 as u32, 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::Arm(_) => elf::EM_ARM as u32,
Architecture::Aarch64(_) => elf::EM_AARCH64 as u32, Architecture::Aarch64(_) => elf::EM_AARCH64 as u32,
_ => unimplemented!("unrecognized architecture"), _ => 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" } wasi-common = { path = "../wasi-common", version = "0.19.0" }
wasmtime-wasi = { path = "../wasi", version = "0.19.0" } wasmtime-wasi = { path = "../wasi", version = "0.19.0" }
wasmtime = { path = "../wasmtime", 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" pretty_env_logger = "0.4.0"
tempfile = "3.1.0" tempfile = "3.1.0"
os_pipe = "0.9" 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-cache = { path = "../cache", version = "0.19.0", optional = true }
wasmtime-profiling = { path = "../profiling", version = "0.19.0" } wasmtime-profiling = { path = "../profiling", version = "0.19.0" }
wasmparser = "0.59.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" anyhow = "1.0.19"
region = "2.2.0" region = "2.2.0"
libc = "0.2" libc = "0.2"

2
fuzz/Cargo.toml
View File

@@ -13,7 +13,7 @@ cranelift-codegen = { path = "../cranelift/codegen" }
cranelift-reader = { path = "../cranelift/reader" } cranelift-reader = { path = "../cranelift/reader" }
cranelift-wasm = { path = "../cranelift/wasm" } cranelift-wasm = { path = "../cranelift/wasm" }
libfuzzer-sys = "0.3.3" libfuzzer-sys = "0.3.3"
target-lexicon = "0.10" target-lexicon = "0.11"
peepmatic-fuzzing = { path = "../cranelift/peepmatic/crates/fuzzing", optional = true } peepmatic-fuzzing = { path = "../cranelift/peepmatic/crates/fuzzing", optional = true }
wasmtime = { path = "../crates/wasmtime" } wasmtime = { path = "../crates/wasmtime" }
wasmtime-fuzzing = { path = "../crates/fuzzing" } wasmtime-fuzzing = { path = "../crates/fuzzing" }