Use old cranelift backend for now so cranelift+native tests pass

wasmerio · May 12, 2021 · 7c96f54 · 7c96f54
1 parent c7df813
commit 7c96f54
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 14 deletions.
diff --git a/lib/api/Cargo.toml b/lib/api/Cargo.toml
@@ -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
@@ -16,7 +16,7 @@ wasmer-compiler = { path = "../compiler", version = "1.0.2", features = ["transl
 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.73", default-features = false }
-cranelift-codegen = { version = "0.73", default-features = false, features = ["x86", "arm64"] }
+cranelift-codegen = { version = "0.73", default-features = false, features = ["x86", "arm64", "old-x86-backend"] }
 cranelift-frontend = { version = "0.73", default-features = false }
 tracing = "0.1"
 hashbrown = { version = "0.9", optional = true }
@@ -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/experimental_x64"]
diff --git a/tests/ignores.txt b/tests/ignores.txt
@@ -12,6 +12,7 @@ llvm::spec::skip_stack_guard_page on darwin
 
 # TODO(https://github.com/wasmerio/wasmer/issues/1727): Traps in native engine
 cranelift::spec::linking on native
+cranelift::spec::bulk on native
 
 # https://github.com/wasmerio/wasmer/issues/1722
 llvm::spec::skip_stack_guard_page on native