Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 728065d

Browse files
committedNov 3, 2024
Auto merge of rust-lang#132546 - workingjubilee:rollup-r9mkkhd, r=workingjubilee
Rollup of 12 pull requests Successful merges: - rust-lang#132393 (Docs: added brief colon explanation) - rust-lang#132419 (PassWrapper: adapt for llvm/llvm-project@b01e2a8b5620466c3b) - rust-lang#132437 (coverage: Regression test for inlining into an uninstrumented crate) - rust-lang#132458 (get rid of a whole bunch of unnecessary rustc_const_unstable attributes) - rust-lang#132499 (unicode_data.rs: show command for generating file) - rust-lang#132503 (better test for const HashMap; remove const_hash leftovers) - rust-lang#132514 (Port most of `--print=target-cpus` to Rust) - rust-lang#132520 (NFC add known bug nr to test) - rust-lang#132522 (make codegen help output more consistent) - rust-lang#132523 (Added regression test for generics index out of bounds) - rust-lang#132526 (Subtree sync for rustc_codegen_cranelift) - rust-lang#132528 (Use `*_opt` typeck results fns to not ICE in fallback suggestion) - rust-lang#132540 (Do not format generic consts) Failed merges: - rust-lang#132511 (stabilize const_arguments_as_str) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 8ccb78e + 5516671 commit 728065d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+502
-497
lines changed
 

‎compiler/rustc_codegen_cranelift/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"

‎compiler/rustc_codegen_cranelift/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"));
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.