commit: ad0c8b81b83660581f8f8c427aff2cd6b32d7865 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Mon Jun 2 09:22:17 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 09:22:17 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=ad0c8b81
Add patches for Rust 1.83.0-r3 Patches: - 1.78.0-musl-dynamic-linking.patch - 1.83.0-cross-compile-libz.patch - 1.67.0-doc-wasm.patch - 1.83.0-dwarf-llvm-assertion.patch Signed-off-by: Matt Jolly <kangie <AT> gentoo.org> 1.74.1-cross-compile-libz.patch | 17 ----------------- 1.83.0-cross-compile-libz.patch | 19 +++++++++++++++++++ ...sertion.patch => 1.83.0-dwarf-llvm-assertion.patch | 7 +------ 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch deleted file mode 100644 index 98cec09..0000000 --- a/1.74.1-cross-compile-libz.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://paste.sr.ht/~kchibisov/682321e0fd4a3ece4a4b7b71591896f5cd3cdb22 -https://github.com/gentoo/gentoo/pull/35246#discussion_r1484525497 - ---- a/compiler/rustc_llvm/build.rs -+++ b/compiler/rustc_llvm/build.rs -@@ -237,10 +237,7 @@ fn main() { - // of llvm-config, not the target that we're attempting to link. - let mut cmd = Command::new(&llvm_config); - cmd.arg(llvm_link_arg).arg("--libs"); -- -- if !is_crossed { -- cmd.arg("--system-libs"); -- } -+ cmd.arg("--system-libs"); - - if (target.starts_with("arm") && !target.contains("freebsd")) - || target.starts_with("mips-") diff --git a/1.83.0-cross-compile-libz.patch b/1.83.0-cross-compile-libz.patch new file mode 100644 index 0000000..1eac04b --- /dev/null +++ b/1.83.0-cross-compile-libz.patch @@ -0,0 +1,19 @@ +https://paste.sr.ht/~kchibisov/682321e0fd4a3ece4a4b7b71591896f5cd3cdb22 +https://github.com/gentoo/gentoo/pull/35246#discussion_r1484525497 + +--- a/compiler/rustc_llvm/build.rs ++++ b/compiler/rustc_llvm/build.rs +@@ -220,12 +220,7 @@ + let mut cmd = Command::new(&llvm_config); + cmd.arg(llvm_link_arg).arg("--libs"); + +- // Don't link system libs if cross-compiling unless targetting Windows. +- // On Windows system DLLs aren't linked directly, instead import libraries are used. +- // These import libraries are independent of the host. +- if !is_crossed || target.contains("windows") { +- cmd.arg("--system-libs"); +- } ++ cmd.arg("--system-libs"); + + // We need libkstat for getHostCPUName on SPARC builds. + // See also: https://github.com/llvm/llvm-project/issues/64186 diff --git a/1.82.0-dwarf-llvm-assertion.patch b/1.83.0-dwarf-llvm-assertion.patch similarity index 98% rename from 1.82.0-dwarf-llvm-assertion.patch rename to 1.83.0-dwarf-llvm-assertion.patch index b23ae2f..96bdac0 100644 --- a/1.82.0-dwarf-llvm-assertion.patch +++ b/1.83.0-dwarf-llvm-assertion.patch @@ -1,8 +1,3 @@ -https://bugs.gentoo.org/942013 -https://bugs.gentoo.org/942884 -https://github.com/rust-lang/rust/issues/131944 -https://github.com/rust-lang/rust/pull/132613 - From 1dc106121b62562ead6e7d612fa136dc4b35cd5d Mon Sep 17 00:00:00 2001 From: Kyle Huey <[email protected]> Date: Mon, 4 Nov 2024 11:38:14 -0800 @@ -26,8 +21,8 @@ Fixes #131944 use rustc_codegen_ssa::mir::debuginfo::{DebugScope, FunctionDebugContext}; use rustc_codegen_ssa::traits::*; +use rustc_data_structures::fx::FxHashMap; - use rustc_index::bit_set::BitSet; use rustc_index::Idx; + use rustc_index::bit_set::BitSet; use rustc_middle::mir::{Body, SourceScope}; use rustc_middle::ty::layout::FnAbiOf; use rustc_middle::ty::{self, Instance};
