Try #2307:

wasmerio · May 13, 2021 · f8fa66f · f8fa66f
2 parents d3e2ba3 + f0a018c
commit f8fa66f
Show file tree

Hide file tree

Showing 17 changed files with 292 additions and 194 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock
diff --git a/lib/api/Cargo.toml b/lib/api/Cargo.toml
@@ -26,7 +26,7 @@ cfg-if = "0.1"
 wat = { version = "1.0", optional = true }
 thiserror = "1.0"
 more-asserts = "0.2"
-target-lexicon = { version = "0.11", default-features = false }
+target-lexicon = { version = "0.12", default-features = false }
 loupe = "0.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
@@ -66,11 +66,6 @@ cranelift = [
     "wasmer-compiler-cranelift",
     "compiler",
 ]
-# Enable Cranelift experimental x64 backend
-cranelift-experimental-x64 = [
-    "cranelift",
-    "wasmer-compiler-cranelift/experimental-x64",
-]
 llvm = [
     "wasmer-compiler-llvm",
     "compiler",

diff --git a/lib/cli/Cargo.toml b/lib/cli/Cargo.toml
@@ -103,11 +103,6 @@ cranelift = [
     "wasmer-compiler-cranelift",
     "compiler",
 ]
-# Enable Cranelift experimental x64 backend
-cranelift-experimental-x64 = [
-    "cranelift",
-    "wasmer-compiler-cranelift/experimental-x64",
-]
 llvm = [
     "wasmer-compiler-llvm",
     "compiler",

diff --git a/lib/compiler-cranelift/Cargo.toml b/lib/compiler-cranelift/Cargo.toml
@@ -15,9 +15,9 @@ edition = "2018"
 wasmer-compiler = { path = "../compiler", version = "1.0.2", features = ["translator"], default-features = false }
 wasmer-vm = { path = "../vm", version = "1.0.2" }
 wasmer-types = { path = "../types", version = "1.0.2", default-features = false, features = ["std"] }
-cranelift-entity = { version = "0.70", default-features = false }
-cranelift-codegen = { version = "0.70", default-features = false, features = ["x86", "arm64"] }
-cranelift-frontend = { version = "0.70", default-features = false }
+cranelift-entity = { version = "0.73", default-features = false }
+cranelift-codegen = { version = "0.73", default-features = false, features = ["x86", "arm64"] }
+cranelift-frontend = { version = "0.73", default-features = false }
 tracing = "0.1"
 hashbrown = { version = "0.9", optional = true }
 rayon = "1.5"
@@ -27,8 +27,8 @@ smallvec = "1.6"
 loupe = "0.1"
 
 [dev-dependencies]
-target-lexicon = { version = "0.11", default-features = false }
-cranelift-codegen = { version = "0.70", features = ["all-arch"] }
+target-lexicon = { version = "0.12", default-features = false }
+cranelift-codegen = { version = "0.73", features = ["all-arch"] }
 lazy_static = "1.4"
 
 [badges]
@@ -39,6 +39,3 @@ default = ["std", "unwind"]
 unwind = ["cranelift-codegen/unwind", "gimli"]
 std = ["cranelift-codegen/std", "cranelift-frontend/std", "wasmer-compiler/std", "wasmer-types/std"]
 core = ["hashbrown", "cranelift-codegen/core", "cranelift-frontend/core"]
-
-# Enable Cranelift experimental x64 backend
-experimental-x64 = ["cranelift-codegen/x64"]