Skip to content

Commit ebacaee

Browse files
committed
Update to Cranelift 0.114
1 parent 9d1de63 commit ebacaee

File tree

3 files changed

+65
-34
lines changed

3 files changed

+65
-34
lines changed

Cargo.lock

Lines changed: 49 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ crate-type = ["dylib"]
88

99
[dependencies]
1010
# These have to be in sync with each other
11-
cranelift-codegen = { version = "0.113.0", default-features = false, features = ["std", "unwind", "all-native-arch"] }
12-
cranelift-frontend = { version = "0.113.0" }
13-
cranelift-module = { version = "0.113.0" }
14-
cranelift-native = { version = "0.113.0" }
15-
cranelift-jit = { version = "0.113.0", optional = true }
16-
cranelift-object = { version = "0.113.0" }
11+
cranelift-codegen = { version = "0.114.0", default-features = false, features = ["std", "unwind", "all-native-arch"] }
12+
cranelift-frontend = { version = "0.114.0" }
13+
cranelift-module = { version = "0.114.0" }
14+
cranelift-native = { version = "0.114.0" }
15+
cranelift-jit = { version = "0.114.0", optional = true }
16+
cranelift-object = { version = "0.114.0" }
1717
target-lexicon = "0.12.0"
1818
gimli = { version = "0.31", default-features = false, features = ["write"] }
1919
object = { version = "0.36", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }

src/lib.rs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,16 @@ fn build_isa(sess: &Session, backend_config: &BackendConfig) -> Arc<dyn TargetIs
301301
}
302302
}
303303

304+
if let target_lexicon::OperatingSystem::Windows = target_triple.operating_system {
305+
// FIXME remove dependency on this from the Rust ABI. cc bytecodealliance/wasmtime#9510
306+
flags_builder.enable("enable_multi_ret_implicit_sret").unwrap();
307+
}
308+
309+
if let target_lexicon::Architecture::S390x = target_triple.architecture {
310+
// FIXME remove dependency on this from the Rust ABI. cc bytecodealliance/wasmtime#9510
311+
flags_builder.enable("enable_multi_ret_implicit_sret").unwrap();
312+
}
313+
304314
if let target_lexicon::Architecture::Aarch64(_)
305315
| target_lexicon::Architecture::Riscv64(_)
306316
| target_lexicon::Architecture::X86_64 = target_triple.architecture

0 commit comments

Comments
 (0)