commit: 35fcf75ca394e829a06fc269bc242df9e74d604c
Author: Matt Jolly <kangie <AT> gentoo <DOT> org>
AuthorDate: Sat May 31 05:54:46 2025 +0000
Commit: Matt Jolly <kangie <AT> gentoo <DOT> org>
CommitDate: Sat May 31 05:54:46 2025 +0000
URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=35fcf75c
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>
...compile-libz.patch => 1.83.0-cross-compile-libz.patch | 16 +++++++++-------
...-assertion.patch => 1.83.0-dwarf-llvm-assertion.patch | 7 +------
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/1.74.1-cross-compile-libz.patch b/1.83.0-cross-compile-libz.patch
similarity index 52%
rename from 1.74.1-cross-compile-libz.patch
rename to 1.83.0-cross-compile-libz.patch
index f2a881b..12844fd 100644
--- a/1.74.1-cross-compile-libz.patch
+++ b/1.83.0-cross-compile-libz.patch
@@ -5,15 +5,17 @@ diff --git a/compiler/rustc_llvm/build.rs
b/compiler/rustc_llvm/build.rs
index f606fa483ca..8a2e1c40e8b 100644
--- 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.
+@@ -220,12 +220,7 @@
let mut cmd = Command::new(&llvm_config);
cmd.arg(llvm_link_arg).arg("--libs");
--
-- if !is_crossed {
+
+- // 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");
-
- if (target.starts_with("arm") && !target.contains("freebsd"))
- || target.starts_with("mips-")
+
+ // 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 8c99c9a..64d00ac 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
@@ -38,8 +33,8 @@ index ac6c2fb1b83a6..0f1909486ec7e 100644
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};
