commit: a7abd5265a90a89fa91165edb0b225a73cff8ad9 Author: Matt Jolly <kangie <AT> gentoo <DOT> org> AuthorDate: Mon Jun 2 09:47:09 2025 +0000 Commit: Matt Jolly <kangie <AT> gentoo <DOT> org> CommitDate: Mon Jun 2 09:47:09 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=a7abd526
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.81.0-backport-bug937164.patch | 15 -------------- 1.81.0-backport-llvm-pr101761.patch | 24 ---------------------- 1.81.0-backport-llvm-pr101766.patch | 23 --------------------- 1.83.0-cross-compile-libz.patch | 19 +++++++++++++++++ ...tion.patch => 1.83.0-dwarf-llvm-assertion.patch | 7 +------ 6 files changed, 20 insertions(+), 85 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.81.0-backport-bug937164.patch b/1.81.0-backport-bug937164.patch deleted file mode 100644 index a6e887d..0000000 --- a/1.81.0-backport-bug937164.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://bugs.gentoo.org/937525 -https://bugs.gentoo.org/937164 - -Unnecessary on 19+ because 2222fddfc0a2ff02036542511597839856289094 adds -SmallVector and SmallVector is fixed by another patch. ---- a/src/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h -+++ b/src/llvm-project/llvm/lib/Target/X86/MCTargetDesc/X86MCTargetDesc.h -@@ -13,6 +13,7 @@ - #ifndef LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H - #define LLVM_LIB_TARGET_X86_MCTARGETDESC_X86MCTARGETDESC_H - -+#include <cstdint> - #include <memory> - #include <string> - diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch deleted file mode 100644 index bcc3fee..0000000 --- a/1.81.0-backport-llvm-pr101761.patch +++ /dev/null @@ -1,24 +0,0 @@ -https://bugs.gentoo.org/937525 -https://bugs.gentoo.org/937164 -https://github.com/llvm/llvm-project/commit/7e44305041d96b064c197216b931ae3917a34ac1 -https://github.com/llvm/llvm-project/pull/101761 - -From 7e44305041d96b064c197216b931ae3917a34ac1 Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Fri, 2 Aug 2024 23:07:21 +0100 -Subject: [PATCH] [ADT] Add `<cstdint>` to SmallVector (#101761) - -SmallVector uses `uint32_t`, `uint64_t` without including `<cstdint>` -which fails to build w/ GCC 15 after a change in libstdc++ [0] - -[0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3a817a4a5a6d94da9127af3be9f84a74e3076ee2 ---- a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h -+++ b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h -@@ -19,6 +19,7 @@ - #include <algorithm> - #include <cassert> - #include <cstddef> -+#include <cstdint> - #include <cstdlib> - #include <cstring> - #include <functional> diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch deleted file mode 100644 index 1bc84d0..0000000 --- a/1.81.0-backport-llvm-pr101766.patch +++ /dev/null @@ -1,23 +0,0 @@ -https://bugs.gentoo.org/937525 -https://bugs.gentoo.org/937164 -https://github.com/llvm/llvm-project/pull/101766 - -From 5b69d0cf697f0d78406a5a7ed18eaa4f57a0580a Mon Sep 17 00:00:00 2001 -From: Sam James <[email protected]> -Date: Fri, 2 Aug 2024 23:38:55 +0100 -Subject: [PATCH] [AMDGPU] Include `<cstdint>` in AMDGPUMCTargetDesc - -createAMDGPUELFObjectWriter uses `uint8_t` without including `<cstdint>` -which fails to build w/ GCC 15 after a change in libstdc++ [0]. - -[0] https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=3a817a4a5a6d94da9127af3be9f84a74e3076ee2 ---- a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h -+++ b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h -@@ -15,6 +15,7 @@ - #ifndef LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H - #define LLVM_LIB_TARGET_AMDGPU_MCTARGETDESC_AMDGPUMCTARGETDESC_H - -+#include <cstdint> - #include <memory> - - namespace llvm { 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};
