Update to Cranelift 0.114

rust-lang · Nov 7, 2024 · 6ead850 · 6ead850
1 parent b5966e4
commit 6ead850
Show file tree

Hide file tree

Showing 3 changed files with 65 additions and 48 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,12 +8,12 @@ crate-type = ["dylib"]
 
 [dependencies]
 # These have to be in sync with each other
-cranelift-codegen = { version = "0.113.0", default-features = false, features = ["std", "unwind", "all-native-arch"] }
-cranelift-frontend = { version = "0.113.0" }
-cranelift-module = { version = "0.113.0" }
-cranelift-native = { version = "0.113.0" }
-cranelift-jit = { version = "0.113.0", optional = true }
-cranelift-object = { version = "0.113.0" }
+cranelift-codegen = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0", default-features = false, features = ["std", "unwind", "all-native-arch"] }
+cranelift-frontend = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0" }
+cranelift-module = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0" }
+cranelift-native = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0" }
+cranelift-jit = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0", optional = true }
+cranelift-object = { git = "https://github.com/bytecodealliance/wasmtime.git", branch = "release-27.0.0", version = "0.114.0" }
 target-lexicon = "0.12.0"
 gimli = { version = "0.31", default-features = false, features = ["write"] }
 object = { version = "0.36", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }

diff --git a/src/lib.rs b/src/lib.rs
@@ -311,6 +311,16 @@ fn build_isa(sess: &Session, backend_config: &BackendConfig) -> Arc<dyn TargetIs
         }
     }
 
+    if let target_lexicon::OperatingSystem::Windows = target_triple.operating_system {
+        // FIXME remove dependency on this from the Rust ABI. cc bytecodealliance/wasmtime#9510
+        flags_builder.enable("enable_multi_ret_implicit_sret").unwrap();
+    }
+
+    if let target_lexicon::Architecture::S390x = target_triple.architecture {
+        // FIXME remove dependency on this from the Rust ABI. cc bytecodealliance/wasmtime#9510
+        flags_builder.enable("enable_multi_ret_implicit_sret").unwrap();
+    }
+
     if let target_lexicon::Architecture::Aarch64(_)
     | target_lexicon::Architecture::Riscv64(_)
     | target_lexicon::Architecture::X86_64 = target_triple.architecture