From 5fc2d827b71d67db6eeb592b518cb81cc674f63e Mon Sep 17 00:00:00 2001 From: Yury Delendik Date: Tue, 6 Aug 2019 14:49:28 -0500 Subject: [PATCH] Update cranelift requirement from 0.37.0 to 0.38.0 (#254) closes #248, closes #249, closes #250, closes #251, closes #252 --- Cargo.toml | 4 ++-- cranelift-version.sh | 24 ++++++++++++++++++++++++ fuzz/Cargo.toml | 6 +++--- wasmtime-debug/Cargo.toml | 6 +++--- wasmtime-environ/Cargo.toml | 6 +++--- wasmtime-jit/Cargo.toml | 8 ++++---- wasmtime-obj/Cargo.toml | 6 +++--- wasmtime-runtime/Cargo.toml | 6 +++--- wasmtime-wasi-c/Cargo.toml | 6 +++--- wasmtime-wasi/Cargo.toml | 6 +++--- wasmtime-wast/Cargo.toml | 6 +++--- 11 files changed, 54 insertions(+), 30 deletions(-) create mode 100755 cranelift-version.sh diff --git a/Cargo.toml b/Cargo.toml index 216ee8c360..a459727865 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,8 +22,8 @@ name = "wasm2obj" path = "src/wasm2obj.rs" [dependencies] -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-native = "0.37.0" +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-native = "0.38.0" wasmtime-debug = { path = "wasmtime-debug" } wasmtime-environ = { path = "wasmtime-environ" } wasmtime-runtime = { path = "wasmtime-runtime" } diff --git a/cranelift-version.sh b/cranelift-version.sh new file mode 100755 index 0000000000..730c6b888f --- /dev/null +++ b/cranelift-version.sh @@ -0,0 +1,24 @@ +#!/bin/bash +set -euo pipefail + +# This is a convenience script for maintainers changing a cranelift +# dependencies versions. To use, bump the version number below, run the +# script. + +topdir=$(dirname "$0") +cd "$topdir" + +# All the cranelift-* crates have the same version number +version="0.38.0" + +# Update all of the Cargo.toml files. +echo "Updating crate versions to $version" +for crate in . wasmtime-* fuzz; do + # Update the version number of this crate to $version. + sed -i.bk -e "/^cranelift-/s/\"[^\"]*\"/\"$version\"/" \ + "$crate/Cargo.toml" + + # Update the required version number of any cranelift* dependencies. + sed -i.bk -e "/^cranelift-/s/version = \"[^\"]*\"/version = \"$version\"/" \ + "$crate/Cargo.toml" +done diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml index ad3e02d78b..b6142c4246 100644 --- a/fuzz/Cargo.toml +++ b/fuzz/Cargo.toml @@ -11,9 +11,9 @@ cargo-fuzz = true [dependencies] wasmtime-environ = { path = "../wasmtime-environ" } wasmtime-jit = { path = "../wasmtime-jit" } -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.37.0", features = ["enable-serde"] } -cranelift-native = "0.37.0" +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-wasm = { version = "0.38.0", features = ["enable-serde"] } +cranelift-native = "0.38.0" libfuzzer-sys = { git = "https://github.com/rust-fuzz/libfuzzer-sys.git" } wasmparser = { version = "0.32.1", default-features = false } binaryen = "0.5.0" diff --git a/wasmtime-debug/Cargo.toml b/wasmtime-debug/Cargo.toml index 4e7bab0248..6bf3758a93 100644 --- a/wasmtime-debug/Cargo.toml +++ b/wasmtime-debug/Cargo.toml @@ -14,9 +14,9 @@ edition = "2018" [dependencies] gimli = "0.19.0" wasmparser = { version = "0.35.1" } -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.37.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.37.0", features = ["enable-serde"] } +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-entity = { version = "0.38.0", features = ["enable-serde"] } +cranelift-wasm = { version = "0.38.0", features = ["enable-serde"] } faerie = "0.10.1" wasmtime-environ = { path = "../wasmtime-environ", default-features = false } target-lexicon = { version = "0.4.0", default-features = false } diff --git a/wasmtime-environ/Cargo.toml b/wasmtime-environ/Cargo.toml index 14c6a52360..87364eef0d 100644 --- a/wasmtime-environ/Cargo.toml +++ b/wasmtime-environ/Cargo.toml @@ -12,9 +12,9 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.37.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.37.0", features = ["enable-serde"] } +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-entity = { version = "0.38.0", features = ["enable-serde"] } +cranelift-wasm = { version = "0.38.0", features = ["enable-serde"] } lightbeam = { path = "../lightbeam", optional = true } failure = { version = "0.1.3", default-features = false } failure_derive = { version = "0.1.3", default-features = false } diff --git a/wasmtime-jit/Cargo.toml b/wasmtime-jit/Cargo.toml index 8a9901de3a..5885d7485e 100644 --- a/wasmtime-jit/Cargo.toml +++ b/wasmtime-jit/Cargo.toml @@ -12,10 +12,10 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.37.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.37.0", features = ["enable-serde"] } -cranelift-frontend = "0.37.0" +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-entity = { version = "0.38.0", features = ["enable-serde"] } +cranelift-wasm = { version = "0.38.0", features = ["enable-serde"] } +cranelift-frontend = "0.38.0" wasmtime-environ = { path = "../wasmtime-environ", default-features = false } wasmtime-runtime = { path = "../wasmtime-runtime", default-features = false } wasmtime-debug = { path = "../wasmtime-debug", default-features = false } diff --git a/wasmtime-obj/Cargo.toml b/wasmtime-obj/Cargo.toml index e89ed179cf..cc0988cded 100644 --- a/wasmtime-obj/Cargo.toml +++ b/wasmtime-obj/Cargo.toml @@ -12,8 +12,8 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.37.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.37.0", features = ["enable-serde"] } +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-entity = { version = "0.38.0", features = ["enable-serde"] } +cranelift-wasm = { version = "0.38.0", features = ["enable-serde"] } wasmtime-environ = { path = "../wasmtime-environ" } faerie = "0.10.1" diff --git a/wasmtime-runtime/Cargo.toml b/wasmtime-runtime/Cargo.toml index fc4b0e0757..995120581c 100644 --- a/wasmtime-runtime/Cargo.toml +++ b/wasmtime-runtime/Cargo.toml @@ -12,9 +12,9 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.37.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.37.0", features = ["enable-serde"] } +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-entity = { version = "0.38.0", features = ["enable-serde"] } +cranelift-wasm = { version = "0.38.0", features = ["enable-serde"] } wasmtime-environ = { path = "../wasmtime-environ", default-features = false } region = "2.0.0" lazy_static = "1.2.0" diff --git a/wasmtime-wasi-c/Cargo.toml b/wasmtime-wasi-c/Cargo.toml index 850e9914cd..01b28c41a6 100644 --- a/wasmtime-wasi-c/Cargo.toml +++ b/wasmtime-wasi-c/Cargo.toml @@ -13,9 +13,9 @@ readme = "README.md" wasmtime-runtime = { path = "../wasmtime-runtime" } wasmtime-environ = { path = "../wasmtime-environ" } wasmtime-jit = { path = "../wasmtime-jit" } -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.37.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.37.0", features = ["enable-serde"] } +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-entity = { version = "0.38.0", features = ["enable-serde"] } +cranelift-wasm = { version = "0.38.0", features = ["enable-serde"] } target-lexicon = "0.4.0" log = { version = "0.4.8", default-features = false } libc = "0.2.60" diff --git a/wasmtime-wasi/Cargo.toml b/wasmtime-wasi/Cargo.toml index bff598bec9..9a6a70ac76 100644 --- a/wasmtime-wasi/Cargo.toml +++ b/wasmtime-wasi/Cargo.toml @@ -14,9 +14,9 @@ wasmtime-runtime = { path = "../wasmtime-runtime" } wasmtime-environ = { path = "../wasmtime-environ" } wasmtime-jit = { path = "../wasmtime-jit" } wasi-common = { git = "https://github.com/CraneStation/wasi-common", rev = "c3994bf57b5d2f1f973b0e4e37bc385695aa4ed2"} -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.37.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.37.0", features = ["enable-serde"] } +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-entity = { version = "0.38.0", features = ["enable-serde"] } +cranelift-wasm = { version = "0.38.0", features = ["enable-serde"] } target-lexicon = "0.4.0" log = { version = "0.4.8", default-features = false } diff --git a/wasmtime-wast/Cargo.toml b/wasmtime-wast/Cargo.toml index 2ea7fd0aac..96eae6b6bf 100644 --- a/wasmtime-wast/Cargo.toml +++ b/wasmtime-wast/Cargo.toml @@ -12,9 +12,9 @@ readme = "README.md" edition = "2018" [dependencies] -cranelift-codegen = { version = "0.37.0", features = ["enable-serde"] } -cranelift-wasm = { version = "0.37.0", features = ["enable-serde"] } -cranelift-entity = { version = "0.37.0", features = ["enable-serde"] } +cranelift-codegen = { version = "0.38.0", features = ["enable-serde"] } +cranelift-wasm = { version = "0.38.0", features = ["enable-serde"] } +cranelift-entity = { version = "0.38.0", features = ["enable-serde"] } wasmtime-jit = { path = "../wasmtime-jit" } wasmtime-runtime = { path = "../wasmtime-runtime" } wasmtime-environ = { path = "../wasmtime-environ" }