Skip to content

Commit 12677fd

Browse files
committed
Auto merge of #132526 - bjorn3:sync_cg_clif-2024-11-02, r=bjorn3
Subtree sync for rustc_codegen_cranelift The highlight this time is an update to Cranelift 0.113, r? `@ghost` `@rustbot` label +A-codegen +A-cranelift +T-compiler
2 parents 541c33e + e2a5108 commit 12677fd

21 files changed

+165
-264
lines changed

Cargo.lock

+54-76
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+7-7
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ crate-type = ["dylib"]
88

99
[dependencies]
1010
# These have to be in sync with each other
11-
cranelift-codegen = { version = "0.111.0", default-features = false, features = ["std", "unwind", "all-arch"] }
12-
cranelift-frontend = { version = "0.111.0" }
13-
cranelift-module = { version = "0.111.0" }
14-
cranelift-native = { version = "0.111.0" }
15-
cranelift-jit = { version = "0.111.0", optional = true }
16-
cranelift-object = { version = "0.111.0" }
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" }
1717
target-lexicon = "0.12.0"
18-
gimli = { version = "0.29", default-features = false, features = ["write"] }
18+
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"] }
2020

2121
indexmap = "2.0.0"

build_system/build_sysroot.rs

-9
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,6 @@ pub(crate) fn build_sysroot(
102102
.install_into_sysroot(&dist_dir);
103103
}
104104

105-
// Copy std for the host to the lib dir. This is necessary for the jit mode to find
106-
// libstd.
107-
for lib in host.libs {
108-
let filename = lib.file_name().unwrap().to_str().unwrap();
109-
if filename.contains("std-") && !filename.contains(".rlib") {
110-
try_hard_link(&lib, dist_dir.join("lib").join(lib.file_name().unwrap()));
111-
}
112-
}
113-
114105
let mut target_compiler = {
115106
let rustc_clif = dist_dir.join(wrapper_base_name.replace("____", "rustc-clif"));
116107
let rustdoc_clif = dist_dir.join(wrapper_base_name.replace("____", "rustdoc-clif"));

0 commit comments

Comments
 (0)