bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Merge commit '728bc27f32' into sync_cg_clif-2025-01-20

Browse source
This commit is contained in:
bjorn3 2025-01-20 15:30:04 +00:00
commit d740a3f06a
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_codegen_cranelift/rust-toolchain
View file

@ -1,4 +1,4 @@
[toolchain] [toolchain]
channel = "nightly-2025-01-10" channel = "nightly-2025-01-20"
components = ["rust-src", "rustc-dev", "llvm-tools"] components = ["rust-src", "rustc-dev", "llvm-tools"]
profile = "minimal" profile = "minimal"

5
compiler/rustc_codegen_cranelift/scripts/test_rustc_tests.sh
View file

@ -176,12 +176,11 @@ diff --git a/src/tools/run-make-support/src/rustdoc.rs b/src/tools/run-make-supp
index 9607ff02f96..b7d97caf9a2 100644 index 9607ff02f96..b7d97caf9a2 100644
--- a/src/tools/run-make-support/src/external_deps/rustdoc.rs --- a/src/tools/run-make-support/src/external_deps/rustdoc.rs
+++ b/src/tools/run-make-support/src/external_deps/rustdoc.rs +++ b/src/tools/run-make-support/src/external_deps/rustdoc.rs
@@ -34,8 +34,6 @@ pub fn bare() -> Self { @@ -34,7 +34,6 @@ pub fn bare() -> Self {
#[track_caller] #[track_caller]
pub fn new() -> Self { pub fn new() -> Self {
let mut cmd = setup_common(); let mut cmd = setup_common();
- let target_rpath_dir = env_var_os("TARGET_RPATH_DIR"); - cmd.arg("-L").arg(env_var_os("TARGET_RPATH_DIR"));
- cmd.arg(format!("-L{}", target_rpath_dir.to_string_lossy()));
Self { cmd } Self { cmd }
} }

10
compiler/rustc_codegen_cranelift/src/driver/aot.rs
View file

@ -333,9 +333,17 @@ fn make_module(sess: &Session, name: String) -> UnwindModule<ObjectModule> {
let mut builder = let mut builder =
ObjectBuilder::new(isa, name + ".o", cranelift_module::default_libcall_names()).unwrap(); ObjectBuilder::new(isa, name + ".o", cranelift_module::default_libcall_names()).unwrap();
// Disable function sections by default on MSVC as it causes significant slowdowns with link.exe.
// Maybe link.exe has exponential behavior when there are many sections with the same name? Also
// explicitly disable it on MinGW as rustc already disables it by default on MinGW and as such
// isn't tested. If rustc enables it in the future on MinGW, we can re-enable it too once it has
// been on MinGW.
let default_function_sections = sess.target.function_sections && !sess.target.is_like_windows;
builder.per_function_section( builder.per_function_section(
sess.opts.unstable_opts.function_sections.unwrap_or(sess.target.function_sections), sess.opts.unstable_opts.function_sections.unwrap_or(default_function_sections),
); );
UnwindModule::new(ObjectModule::new(builder), true) UnwindModule::new(ObjectModule::new(builder), true)
} }