From d4a2704f8c45a4bf7a0c1a8eabc32f8997c61ba7 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Mon, 22 Feb 2021 17:53:37 +0100 Subject: [PATCH] Update cranelift to version 0.70.0 --- Cargo.lock | 34 ++++++++++--------- lucet-module/Cargo.toml | 2 +- .../lucet-runtime-internals/Cargo.toml | 2 +- lucet-wasi/Cargo.toml | 6 ++-- lucet-wasi/generate/Cargo.toml | 4 +-- lucet-wiggle/Cargo.toml | 4 +-- lucet-wiggle/generate/Cargo.toml | 2 +- lucet-wiggle/macro/Cargo.toml | 2 +- lucetc/Cargo.toml | 14 ++++---- wasmtime | 2 +- 10 files changed, 37 insertions(+), 35 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fb131a9ba..3d651c0be 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "adler" version = "0.2.3" @@ -366,14 +368,14 @@ checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" [[package]] name = "cranelift-bforest" -version = "0.69.0" +version = "0.70.0" dependencies = [ "cranelift-entity", ] [[package]] name = "cranelift-codegen" -version = "0.69.0" +version = "0.70.0" dependencies = [ "byteorder", "cranelift-bforest", @@ -390,7 +392,7 @@ dependencies = [ [[package]] name = "cranelift-codegen-meta" -version = "0.69.0" +version = "0.70.0" dependencies = [ "cranelift-codegen-shared", "cranelift-entity", @@ -398,15 +400,15 @@ dependencies = [ [[package]] name = "cranelift-codegen-shared" -version = "0.69.0" +version = "0.70.0" [[package]] name = "cranelift-entity" -version = "0.69.0" +version = "0.70.0" [[package]] name = "cranelift-frontend" -version = "0.69.0" +version = "0.70.0" dependencies = [ "cranelift-codegen", "log", @@ -416,7 +418,7 @@ dependencies = [ [[package]] name = "cranelift-module" -version = "0.69.0" +version = "0.70.0" dependencies = [ "anyhow", "cranelift-codegen", @@ -427,7 +429,7 @@ dependencies = [ [[package]] name = "cranelift-native" -version = "0.69.0" +version = "0.70.0" dependencies = [ "cranelift-codegen", "target-lexicon", @@ -435,7 +437,7 @@ dependencies = [ [[package]] name = "cranelift-object" -version = "0.69.0" +version = "0.70.0" dependencies = [ "anyhow", "cranelift-codegen", @@ -447,7 +449,7 @@ dependencies = [ [[package]] name = "cranelift-wasm" -version = "0.69.0" +version = "0.70.0" dependencies = [ "cranelift-codegen", "cranelift-entity", @@ -2554,7 +2556,7 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" [[package]] name = "wasi-cap-std-sync" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "bitflags", @@ -2574,7 +2576,7 @@ dependencies = [ [[package]] name = "wasi-common" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "bitflags", @@ -2701,7 +2703,7 @@ dependencies = [ [[package]] name = "wiggle" -version = "0.22.0" +version = "0.23.0" dependencies = [ "bitflags", "thiserror", @@ -2712,14 +2714,14 @@ dependencies = [ [[package]] name = "wiggle-borrow" -version = "0.22.0" +version = "0.23.0" dependencies = [ "wiggle", ] [[package]] name = "wiggle-generate" -version = "0.22.0" +version = "0.23.0" dependencies = [ "anyhow", "heck", @@ -2732,7 +2734,7 @@ dependencies = [ [[package]] name = "wiggle-macro" -version = "0.22.0" +version = "0.23.0" dependencies = [ "quote 1.0.9", "syn 1.0.60", diff --git a/lucet-module/Cargo.toml b/lucet-module/Cargo.toml index ffbea12e4..b2a420d58 100644 --- a/lucet-module/Cargo.toml +++ b/lucet-module/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] anyhow = "1.0" -cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.69.0" } +cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.70.0" } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" bincode = "1.1.4" diff --git a/lucet-runtime/lucet-runtime-internals/Cargo.toml b/lucet-runtime/lucet-runtime-internals/Cargo.toml index 424766db4..5fefbf2e6 100644 --- a/lucet-runtime/lucet-runtime-internals/Cargo.toml +++ b/lucet-runtime/lucet-runtime-internals/Cargo.toml @@ -12,7 +12,7 @@ edition = "2018" [dependencies] lucet-module = { path = "../../lucet-module", version = "=0.7.0-dev" } lucet-runtime-macros = { path = "../lucet-runtime-macros", version = "=0.7.0-dev" } -wiggle = { path = "../../wasmtime/crates/wiggle", version = "0.22.0" } +wiggle = { path = "../../wasmtime/crates/wiggle", version = "0.23.0" } anyhow = "1.0" bitflags = "1.0" diff --git a/lucet-wasi/Cargo.toml b/lucet-wasi/Cargo.toml index c8094c73c..1357a31a5 100644 --- a/lucet-wasi/Cargo.toml +++ b/lucet-wasi/Cargo.toml @@ -23,9 +23,9 @@ lucet-wiggle-generate = { path = "../lucet-wiggle/generate", version = "=0.7.0-d libc = "0.2.65" nix = "0.17" rand = "0.6" -wasi-common = { path = "../wasmtime/crates/wasi-common", version = "0.22.0", default-features = false, features = ["wiggle_metadata"] } -wasi-cap-std-sync = { path = "../wasmtime/crates/wasi-common/cap-std-sync", version = "0.22.0"} -wiggle = { path = "../wasmtime/crates/wiggle", version = "0.22.0" } +wasi-common = { path = "../wasmtime/crates/wasi-common", version = "0.23.0", default-features = false, features = ["wiggle_metadata"] } +wasi-cap-std-sync = { path = "../wasmtime/crates/wasi-common/cap-std-sync", version = "0.23.0"} +wiggle = { path = "../wasmtime/crates/wiggle", version = "0.23.0" } tracing = "0.1.19" tracing-subscriber = "0.2.0" cap-std = "0.13" diff --git a/lucet-wasi/generate/Cargo.toml b/lucet-wasi/generate/Cargo.toml index ab982d1b7..48c9c53f6 100644 --- a/lucet-wasi/generate/Cargo.toml +++ b/lucet-wasi/generate/Cargo.toml @@ -13,8 +13,8 @@ proc-macro = true [dependencies] lucet-wiggle-generate = { path = "../../lucet-wiggle/generate", version = "0.7.0-dev" } -wasi-common = { path = "../../wasmtime/crates/wasi-common", version = "0.22.0", features = ["wiggle_metadata"] } -wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.22.0" } +wasi-common = { path = "../../wasmtime/crates/wasi-common", version = "0.23.0", features = ["wiggle_metadata"] } +wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.23.0" } syn = { version = "1.0", features = ["full"] } quote = "1.0" proc-macro2 = "1.0" diff --git a/lucet-wiggle/Cargo.toml b/lucet-wiggle/Cargo.toml index a92642cbe..6e1f5b697 100644 --- a/lucet-wiggle/Cargo.toml +++ b/lucet-wiggle/Cargo.toml @@ -14,8 +14,8 @@ edition = "2018" lucet-wiggle-macro = { path = "./macro", version = "0.7.0-dev" } lucet-wiggle-generate = { path = "./generate", version = "0.7.0-dev" } lucet-runtime = { path = "../lucet-runtime", version = "0.7.0-dev" } -wiggle = { path = "../wasmtime/crates/wiggle", version = "0.22.0" } -wiggle-borrow = { path = "../wasmtime/crates/wiggle/borrow", version = "0.22.0" } +wiggle = { path = "../wasmtime/crates/wiggle", version = "0.23.0" } +wiggle-borrow = { path = "../wasmtime/crates/wiggle/borrow", version = "0.23.0" } [dev-dependencies] wiggle-test = { path = "../wasmtime/crates/wiggle/test-helpers" } diff --git a/lucet-wiggle/generate/Cargo.toml b/lucet-wiggle/generate/Cargo.toml index 2e582d758..ec768fbf4 100644 --- a/lucet-wiggle/generate/Cargo.toml +++ b/lucet-wiggle/generate/Cargo.toml @@ -9,7 +9,7 @@ authors = ["Lucet team "] edition = "2018" [dependencies] -wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.22.0" } +wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.23.0" } lucet-module = { path = "../../lucet-module", version = "0.7.0-dev" } witx = { path = "../../wasmtime/crates/wasi-common/WASI/tools/witx", version = "0.8.4" } quote = "1.0" diff --git a/lucet-wiggle/macro/Cargo.toml b/lucet-wiggle/macro/Cargo.toml index 16bb058b5..10a6c2292 100644 --- a/lucet-wiggle/macro/Cargo.toml +++ b/lucet-wiggle/macro/Cargo.toml @@ -13,7 +13,7 @@ proc-macro = true [dependencies] lucet-wiggle-generate = { path = "../generate", version = "0.7.0-dev" } -wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.22.0" } +wiggle-generate = { path = "../../wasmtime/crates/wiggle/generate", version = "0.23.0" } witx = { path = "../../wasmtime/crates/wasi-common/WASI/tools/witx", version = "0.8.8" } syn = { version = "1.0", features = ["full"] } quote = "1.0" diff --git a/lucetc/Cargo.toml b/lucetc/Cargo.toml index 05e381ac9..6522f6610 100644 --- a/lucetc/Cargo.toml +++ b/lucetc/Cargo.toml @@ -16,13 +16,13 @@ path = "lucetc/main.rs" [dependencies] anyhow = "1" bincode = "1.1.4" -cranelift-codegen = { path = "../wasmtime/cranelift/codegen", version = "0.69.0", features = ["x86", "x64"] } -cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.69.0" } -cranelift-native = { path = "../wasmtime/cranelift/native", version = "0.69.0" } -cranelift-frontend = { path = "../wasmtime/cranelift/frontend", version = "0.69.0" } -cranelift-module = { path = "../wasmtime/cranelift/module", version = "0.69.0" } -cranelift-object = { path = "../wasmtime/cranelift/object", version = "0.69.0" } -cranelift-wasm = { path = "../wasmtime/cranelift/wasm", version = "0.69.0" } +cranelift-codegen = { path = "../wasmtime/cranelift/codegen", version = "0.70.0", features = ["x86", "x64"] } +cranelift-entity = { path = "../wasmtime/cranelift/entity", version = "0.70.0" } +cranelift-native = { path = "../wasmtime/cranelift/native", version = "0.70.0" } +cranelift-frontend = { path = "../wasmtime/cranelift/frontend", version = "0.70.0" } +cranelift-module = { path = "../wasmtime/cranelift/module", version = "0.70.0" } +cranelift-object = { path = "../wasmtime/cranelift/object", version = "0.70.0" } +cranelift-wasm = { path = "../wasmtime/cranelift/wasm", version = "0.70.0" } target-lexicon = "0.11" lucet-module = { path = "../lucet-module", version = "=0.7.0-dev" } lucet-wiggle-generate = { path = "../lucet-wiggle/generate", version = "=0.7.0-dev" } diff --git a/wasmtime b/wasmtime index 64002cb0e..aed6de32d 160000 --- a/wasmtime +++ b/wasmtime @@ -1 +1 @@ -Subproject commit 64002cb0e979e167572449beed6c279cb7504981 +Subproject commit aed6de32d4e5603a7f85619d84099a9a05cb7a7c