From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 522B61580E0 for ; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 31DAF34308D for ; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 25B091102CD; Tue, 03 Jun 2025 04:33:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 1AA691102CD for ; Tue, 03 Jun 2025 04:33:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B71FD342FA0 for ; Tue, 03 Jun 2025 04:33:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 34BCF28F0 for ; Tue, 03 Jun 2025 04:33:10 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.74 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.74 Date: Tue, 03 Jun 2025 04:33:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b751c88-710f-4f5f-aabe-1229513ccd18 X-Archives-Hash: 273ef55211b895c37bd5b4175995d8f6 commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D28021580E0 for ; Tue, 03 Jun 2025 04:33:17 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B9C2C3430B6 for ; Tue, 03 Jun 2025 04:33:17 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6A18D1103DD; Tue, 03 Jun 2025 04:33:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 600711103DD for ; Tue, 03 Jun 2025 04:33:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 09ED53430AC for ; Tue, 03 Jun 2025 04:33:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 698B728F2 for ; Tue, 03 Jun 2025 04:33:10 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.75 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.75 Date: Tue, 03 Jun 2025 04:33:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1b103221-a14f-4d95-ae7e-32cce7733671 X-Archives-Hash: 2cb55b3299067215b6c4246cf3193def Message-ID: <20250603043310.dYUMUTt1JaUL-VjakvUUDJ4_1L87Ms2GpCgQq7kR7z0@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 62E3E1580E0 for ; Tue, 03 Jun 2025 04:33:23 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 4FB603430EC for ; Tue, 03 Jun 2025 04:33:23 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id BAC21110497; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id AFA36110480 for ; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 57A4734308D for ; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BBB0D28FB for ; Tue, 03 Jun 2025 04:33:10 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.76 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.76 Date: Tue, 03 Jun 2025 04:33:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6f597d16-d893-453c-b91f-bfc42dfcfdb2 X-Archives-Hash: 01d8ff72a941ece3bce5437c99283a6c Message-ID: <20250603043310.ubMLrmFVrgTGeaSEY9pRAAOneWF6DZVORCILSbefU00@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F3521580E0 for ; Tue, 03 Jun 2025 04:33:32 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 397DD343138 for ; Tue, 03 Jun 2025 04:33:32 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E98741104A8; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E2E3B1104A8 for ; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8B39B3430B5 for ; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3666828FF for ; Tue, 03 Jun 2025 04:33:11 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.77 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.77 Date: Tue, 03 Jun 2025 04:33:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a3c75e18-cdaf-408b-a0a9-0660c069bdd5 X-Archives-Hash: 399d28cf67aae5e7d02fafe9b9edf8a0 Message-ID: <20250603043311.U85_fzvRpCHsS3V7NZqIZRT4ACP9zFRtK4LXdHyfSK0@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DDA191580E0 for ; Tue, 03 Jun 2025 04:33:52 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id C9BA8343144 for ; Tue, 03 Jun 2025 04:33:52 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 81ADA1104BE; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 708931104BE for ; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F2049343095 for ; Tue, 03 Jun 2025 04:33:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BD5A72916 for ; Tue, 03 Jun 2025 04:33:11 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.78 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.78 Date: Tue, 03 Jun 2025 04:33:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: db22a6d1-72fa-4b0c-b3c3-cf05f26279cb X-Archives-Hash: 369162f40835ef2b80f7016d5c91c62c Message-ID: <20250603043311.51jNb_lgThtGGQKHeALIPJRQq_GpAxB86Qqz0mvDuSA@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EEAD31580E0 for ; Tue, 03 Jun 2025 04:33:57 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D930A34315A for ; Tue, 03 Jun 2025 04:33:57 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8A7EE1104C4; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7BF301104BE for ; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 27A8734308D for ; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6280528F2 for ; Tue, 03 Jun 2025 04:33:12 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.79 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.79 Date: Tue, 03 Jun 2025 04:33:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d8d0c213-1edc-462b-9311-bf725fcf1d0b X-Archives-Hash: c9588f1f8d0686e8be18565a86c3a487 Message-ID: <20250603043312.Lycz0Ybq_rMYedsXfBSEAS8GF2l_fG0SmuFTar5Zndg@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C05921580E0 for ; Tue, 03 Jun 2025 04:34:06 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id ABC6E3430B6 for ; Tue, 03 Jun 2025 04:34:06 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id A94B21104C2; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 9D9081104C2 for ; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 49FEC342FA0 for ; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 064D62940 for ; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.80 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.80 Date: Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 01e6ee08-f619-4350-aeb7-a03be22a9b0a X-Archives-Hash: bdd1d2e917c0de9ee0de9f9486422f1d Message-ID: <20250603043313.wRCwPC5jxoHcK3ThnS4hY8fFqfviXByiaA6iaoz9rTk@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B2621580E0 for ; Tue, 03 Jun 2025 04:34:16 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 36E83343138 for ; Tue, 03 Jun 2025 04:34:16 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id F37711104CD; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E93E41104CD for ; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9498B3430BE for ; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B941328F8 for ; Tue, 03 Jun 2025 04:33:13 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.81 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.81 Date: Tue, 03 Jun 2025 04:33:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7ba7e1ae-22fd-4c9f-968e-4feaf0dea1e5 X-Archives-Hash: 9063109fd804ea59a825a5ec9868999d Message-ID: <20250603043313.0GyuzEb9csc2Oucp9V1eTVEVqWMrFGonRGjiuEF7bMI@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8A9291580E0 for ; Tue, 03 Jun 2025 04:34:34 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 74FF734315A for ; Tue, 03 Jun 2025 04:34:34 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 2AB4B1104D4; Tue, 03 Jun 2025 04:33:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 1CE2E1104D5 for ; Tue, 03 Jun 2025 04:33:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B9A8D3430AC for ; Tue, 03 Jun 2025 04:33:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 773B02903 for ; Tue, 03 Jun 2025 04:33:14 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.82 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.82 Date: Tue, 03 Jun 2025 04:33:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d0d1f222-8490-4dc4-ae72-7302d25801b3 X-Archives-Hash: 44b32a8246e187c53617d5ef369c0fd6 Message-ID: <20250603043314.smB_B-PpVNNJ-8KPz2wX-6E6uek-pSA_s4M0MVCR9FA@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 59EA31580E0 for ; Tue, 03 Jun 2025 04:34:47 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 467D0343193 for ; Tue, 03 Jun 2025 04:34:47 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4FD4F1104DC; Tue, 03 Jun 2025 04:33:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 472131104DC for ; Tue, 03 Jun 2025 04:33:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E5781343109 for ; Tue, 03 Jun 2025 04:33:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4EE7F28F0 for ; Tue, 03 Jun 2025 04:33:15 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.83 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.83 Date: Tue, 03 Jun 2025 04:33:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 50ecb3eb-930b-41a9-8010-cf9d32c69298 X-Archives-Hash: f48aa33f6961639e7120b277fa9b6aaf Message-ID: <20250603043315.B3dvnY2nhNCaGIHhUP452Dx74H9dTNyyjJH3wD3kpwM@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D4BBC1580E0 for ; Tue, 03 Jun 2025 04:35:02 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id B6188342FE4 for ; Tue, 03 Jun 2025 04:35:02 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9BB941104E4; Tue, 03 Jun 2025 04:33:18 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 897AA1104E2 for ; Tue, 03 Jun 2025 04:33:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3C0063430B6 for ; Tue, 03 Jun 2025 04:33:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 46BB9291F for ; Tue, 03 Jun 2025 04:33:16 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.84 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.84 Date: Tue, 03 Jun 2025 04:33:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d3fc6aa1-13c2-4462-b9ea-91c4f3adf619 X-Archives-Hash: c09ed94942a5b81d5917a9b89334c6ca Message-ID: <20250603043316.WfUesMnmWPCgbT3YUdf9K5GTKBlVy9W95nNEtnJ5w-U@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0BD831580E0 for ; Tue, 03 Jun 2025 04:35:23 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id ED5CB342FF2 for ; Tue, 03 Jun 2025 04:35:22 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 3E3001104EE; Tue, 03 Jun 2025 04:33:19 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 31D2A1104EE for ; Tue, 03 Jun 2025 04:33:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D39833430D5 for ; Tue, 03 Jun 2025 04:33:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 74F0928FF for ; Tue, 03 Jun 2025 04:33:17 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.85 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.85 Date: Tue, 03 Jun 2025 04:33:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4f686702-d21b-4e2f-ac56-6be60d1e9d77 X-Archives-Hash: 2013cd1d80b103553a31b37c2e8c6278 Message-ID: <20250603043317.xNalN9H9h39tiKQ5i7xHB5QODClchp4dXU-E8N6oyEI@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 50DE51580E0 for ; Tue, 03 Jun 2025 04:35:44 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 3D1D83431F1 for ; Tue, 03 Jun 2025 04:35:44 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6C58C1104FA; Tue, 03 Jun 2025 04:33:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 6387F1104FA for ; Tue, 03 Jun 2025 04:33:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 11B94343100 for ; Tue, 03 Jun 2025 04:33:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id ADAD728FB for ; Tue, 03 Jun 2025 04:33:18 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.86 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.86 Date: Tue, 03 Jun 2025 04:33:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d67aff51-145c-4ee0-a666-e04de2b6a2c3 X-Archives-Hash: 6be70dd43eea46169dd4cec49f6070ac Message-ID: <20250603043318.VLYiPyAJJ_mmDJ8zjFjm26ypm4DNlYdUlIkECmqUrtU@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 40E231580E0 for ; Tue, 03 Jun 2025 04:36:07 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2D7273431A8 for ; Tue, 03 Jun 2025 04:36:07 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id C4C6E110505; Tue, 03 Jun 2025 04:33:21 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id BB8BB110505 for ; Tue, 03 Jun 2025 04:33:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6A8D83430B2 for ; Tue, 03 Jun 2025 04:33:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0E7DC2921 for ; Tue, 03 Jun 2025 04:33:20 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.87 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.87 Date: Tue, 03 Jun 2025 04:33:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2029999c-19aa-490a-a24a-63ccb624ee3b X-Archives-Hash: e2f82d2cb8c3fce1e67bd318bb2c36b5 Message-ID: <20250603043320.INdYhIPeQ8FrwxN7xxfiZS7mjOshg12RP9KjnKcDiJI@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BADAC1580E0 for ; Tue, 03 Jun 2025 04:36:32 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A704334322A for ; Tue, 03 Jun 2025 04:36:32 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 47D77110513; Tue, 03 Jun 2025 04:33:23 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 3F42C110513 for ; Tue, 03 Jun 2025 04:33:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DF3E4342FA0 for ; Tue, 03 Jun 2025 04:33:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 81FFA28F3 for ; Tue, 03 Jun 2025 04:33:21 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.88 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.88 Date: Tue, 03 Jun 2025 04:33:21 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2b3af778-8e69-43dd-94ae-cfc36b08fa37 X-Archives-Hash: 76f9c456c240122c6124bf0bcc0ad0db Message-ID: <20250603043321.GIpKBAunnFEj0TDCIC69b9ZSPtcrxHXp9XnXtYaNSZs@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6A3F41580E0 for ; Tue, 03 Jun 2025 04:37:09 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 56F6134322C for ; Tue, 03 Jun 2025 04:37:09 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 547F311049F; Tue, 03 Jun 2025 04:33:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 4B17E11049F for ; Tue, 03 Jun 2025 04:33:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EC725343136 for ; Tue, 03 Jun 2025 04:33:41 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8FD8528F0 for ; Tue, 03 Jun 2025 04:33:40 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.74.1-r101 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.74.1-r101 Date: Tue, 03 Jun 2025 04:33:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e88a7ba8-637b-46f4-b53c-bca2f767bb0e X-Archives-Hash: a54067477f25420da90d6b1bf507b0c8 Message-ID: <20250603043340.61wS9y3zmgdVsdVJFlOQp_GGC_fORl6g-L1Hgq2gq9Q@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14A661580E0 for ; Tue, 03 Jun 2025 04:37:15 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id F1938343280 for ; Tue, 03 Jun 2025 04:37:14 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 81D941104AE; Tue, 03 Jun 2025 04:33:42 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 782881104AE for ; Tue, 03 Jun 2025 04:33:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2F3DF343142 for ; Tue, 03 Jun 2025 04:33:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C585628F2 for ; Tue, 03 Jun 2025 04:33:40 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.75.0-r101 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.75.0-r101 Date: Tue, 03 Jun 2025 04:33:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6293f438-81a2-4d1e-b9e5-84ebbd4aa448 X-Archives-Hash: 458f81c83874f6569d785efe848cdd26 Message-ID: <20250603043340.fVp1QTwhxQ76iRH_d7Z9ZTsLY_v2-LJ7BhmWbskRQsg@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF5CF1580E0 for ; Tue, 03 Jun 2025 04:37:19 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id CD0C3343281 for ; Tue, 03 Jun 2025 04:37:19 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E476E1104B7; Tue, 03 Jun 2025 04:33:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id DE20B1104B7 for ; Tue, 03 Jun 2025 04:33:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BEC83430E8 for ; Tue, 03 Jun 2025 04:33:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 214BE28FB for ; Tue, 03 Jun 2025 04:33:41 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.76.0-r101 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.76.0-r101 Date: Tue, 03 Jun 2025 04:33:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4f298c60-3c60-43d4-852c-09bcd4e2c9bd X-Archives-Hash: a37e529f08f4574a970f98b5f84c2e98 Message-ID: <20250603043341.0NCvE_h_PXGyczUIKIGROtpv6AfYptvp3v_VCbdhds8@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 40BC91580E0 for ; Tue, 03 Jun 2025 04:37:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 2CFA134325F for ; Tue, 03 Jun 2025 04:37:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1468B110525; Tue, 03 Jun 2025 04:33:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 04E911104B8 for ; Tue, 03 Jun 2025 04:33:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ABE5B343157 for ; Tue, 03 Jun 2025 04:33:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8AF3E28FF for ; Tue, 03 Jun 2025 04:33:41 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.77.1-r101 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.77.1-r101 Date: Tue, 03 Jun 2025 04:33:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 55781155-b8db-47d5-9a5f-6d3233e8d8d8 X-Archives-Hash: 0c2d694b9db78f39c73eb54e56d20ddd Message-ID: <20250603043341.Jbq3t19_5QCT1q_YE3cqzkp9LxOhhwWDBV202VmMu28@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5C4701580E0 for ; Tue, 03 Jun 2025 04:37:36 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 4567A3432A5 for ; Tue, 03 Jun 2025 04:37:36 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 7983711052A; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 7259311052A for ; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2982C343152 for ; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1C0E92916 for ; Tue, 03 Jun 2025 04:33:42 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.78.0-r101 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.78.0-r101 Date: Tue, 03 Jun 2025 04:33:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3fcd5030-a91c-4784-8a51-7897a3e72b9d X-Archives-Hash: fed105d71f7f645295930aa6e740d758 Message-ID: <20250603043342.l4s69SF_MCHdP-nEdnDF1rAp3Zv005EMYYv2iPlOb0w@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 277391580E0 for ; Tue, 03 Jun 2025 04:37:54 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 123A9343124 for ; Tue, 03 Jun 2025 04:37:54 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id B9FC6110534; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id A7FC2110531 for ; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 48C52343143 for ; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BA8EA28F3 for ; Tue, 03 Jun 2025 04:33:42 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.79.0-r101 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.79.0-r101 Date: Tue, 03 Jun 2025 04:33:42 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 41a6e2e5-5bda-48ce-85b0-71d6fbd61d3a X-Archives-Hash: 65a14d917209dcc3fa913266d016a650 Message-ID: <20250603043342.lwPt0uOpWW8DIn-FYHTgKJZLOnBjxOdyRnpPYzonMOc@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EF9CC1580E0 for ; Tue, 03 Jun 2025 04:38:05 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D1B40343172 for ; Tue, 03 Jun 2025 04:38:05 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id CFD02110539; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id BD5BF110536 for ; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6ACAA3430F3 for ; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6B6842940 for ; Tue, 03 Jun 2025 04:33:43 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.80.1-r101 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.80.1-r101 Date: Tue, 03 Jun 2025 04:33:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3f9aea2c-ecee-491b-b0ae-9224bbb768af X-Archives-Hash: 757f2e04295893ceba1e9d4bb8d0d7f2 Message-ID: <20250603043343.cayBvQ1nwJaOh9zwWvTg7x0TmqzUCV9KcJDznl642EM@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B45021580E0 for ; Tue, 03 Jun 2025 04:38:11 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 95EAB343130 for ; Tue, 03 Jun 2025 04:38:11 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E2DBD110532; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D6C48110532 for ; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8F931343152 for ; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3392128FD for ; Tue, 03 Jun 2025 04:33:44 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.81.0-r101 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.81.0-r101 Date: Tue, 03 Jun 2025 04:33:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 01bb29fb-af89-4ec4-b429-bd1ed8a18c61 X-Archives-Hash: 01ccd8e5b9b73704391c2032ad568988 Message-ID: <20250603043344.tfSeddko_TU_ILCLPoiWoAtyUS74hKKaXuCGQTRXI0k@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E87A41580E0 for ; Tue, 03 Jun 2025 04:38:27 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id D6FFE34323A for ; Tue, 03 Jun 2025 04:38:27 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 56875110547; Tue, 03 Jun 2025 04:33:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 463E7110543 for ; Tue, 03 Jun 2025 04:33:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DCB25343158 for ; Tue, 03 Jun 2025 04:33:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F26FE297B for ; Tue, 03 Jun 2025 04:33:44 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.82.0-r103 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.82.0-r103 Date: Tue, 03 Jun 2025 04:33:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9dfbba1e-7375-41a5-a3ab-ad4c9672760f X-Archives-Hash: 501202d1692619b99fcb6b760fd6921b Message-ID: <20250603043344.yEbTd58t65pMQ_8ZnB_sJOjaQu4n5rqthSYs2LDXiXc@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB8591580E0 for ; Tue, 03 Jun 2025 04:38:38 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A6AE5343279 for ; Tue, 03 Jun 2025 04:38:38 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 965C211054A; Tue, 03 Jun 2025 04:33:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 8BEB311054A for ; Tue, 03 Jun 2025 04:33:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3AC6B3430AC for ; Tue, 03 Jun 2025 04:33:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D8DA728F2 for ; Tue, 03 Jun 2025 04:33:45 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.83.0-r3 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.83.0-r3 Date: Tue, 03 Jun 2025 04:33:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e14ce652-94fe-4361-b1e5-6486cd6e44d7 X-Archives-Hash: 457d27b9db6bef4f06965f5d7c463f10 Message-ID: <20250603043345.nyVOme4uWr8TZwEbT5Zus7U4gvAXpFfaBUx6SUwQWFw@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2D4E91580E0 for ; Tue, 03 Jun 2025 04:38:58 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 1AA3234321C for ; Tue, 03 Jun 2025 04:38:58 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id DCE6E110556; Tue, 03 Jun 2025 04:33:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id CE75D110550 for ; Tue, 03 Jun 2025 04:33:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 77B0134315C for ; Tue, 03 Jun 2025 04:33:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3A882921 for ; Tue, 03 Jun 2025 04:33:46 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.84.0-r2 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.84.0-r2 Date: Tue, 03 Jun 2025 04:33:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dde84007-8a08-4355-96c7-a28ac05bf7fa X-Archives-Hash: 490629ed22558089389915177c31883c Message-ID: <20250603043346.BpxIPVnvZXxYAyrVE67THfSBsUBPnxs_l1tKjaFigPI@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B50C71580E0 for ; Tue, 03 Jun 2025 04:39:11 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id A068F343312 for ; Tue, 03 Jun 2025 04:39:11 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 9C11011055D; Tue, 03 Jun 2025 04:33:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 96EFE11055D for ; Tue, 03 Jun 2025 04:33:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4D598343138 for ; Tue, 03 Jun 2025 04:33:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA49528FB for ; Tue, 03 Jun 2025 04:33:47 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.84.1-r2 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.84.1-r2 Date: Tue, 03 Jun 2025 04:33:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c8f9eab1-ce53-46b4-9453-db9ff07dc4e6 X-Archives-Hash: 666920c1edcfcfcd238e7004d786528f Message-ID: <20250603043347.vGAWRg_OXhZn3_8_DB9mO4C741TlAZk_GA4uBO54dzM@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 66E031580E0 for ; Tue, 03 Jun 2025 04:39:31 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 53AF534325C for ; Tue, 03 Jun 2025 04:39:31 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id DF0F3110567; Tue, 03 Jun 2025 04:33:50 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D8DAB110567 for ; Tue, 03 Jun 2025 04:33:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8FA3A343152 for ; Tue, 03 Jun 2025 04:33:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 31C7F28F1 for ; Tue, 03 Jun 2025 04:33:49 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.85.0-r2 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.85.0-r2 Date: Tue, 03 Jun 2025 04:33:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 846aa35b-c4ef-4fdf-960d-e276262870a0 X-Archives-Hash: 3524377d3b0964d43c17002d20f4094e Message-ID: <20250603043349.8jRsTM3oxWpJjhoEmD1-utS5-4M6tF39k0IHEg_lPBE@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2A1EA1580E0 for ; Tue, 03 Jun 2025 04:39:53 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 1786C342F9C for ; Tue, 03 Jun 2025 04:39:53 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 3009E110572; Tue, 03 Jun 2025 04:33:52 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 27D59110572 for ; Tue, 03 Jun 2025 04:33:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CCA693430D5 for ; Tue, 03 Jun 2025 04:33:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 72959290D for ; Tue, 03 Jun 2025 04:33:50 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.85.1-r1 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.85.1-r1 Date: Tue, 03 Jun 2025 04:33:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: fe379f50-89bd-4748-aba3-7f7ef10a27ef X-Archives-Hash: edd8f418eb707613fd4f2ef4d69a4d6d Message-ID: <20250603043350.nUCmzmpCjvBdAmEhXsuilTkMPRns8V0FiDlxT3VprNw@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 51EC61580E0 for ; Tue, 03 Jun 2025 04:40:19 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id AF93B343195 for ; Tue, 03 Jun 2025 04:40:17 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 6BE6C11057D; Tue, 03 Jun 2025 04:33:53 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 6371711057D for ; Tue, 03 Jun 2025 04:33:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1CB8434312F for ; Tue, 03 Jun 2025 04:33:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B571728FE for ; Tue, 03 Jun 2025 04:33:51 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.86.0-r2 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.86.0-r2 Date: Tue, 03 Jun 2025 04:33:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: aa8af2fd-5075-41fa-8ce2-5dbe859f6eb9 X-Archives-Hash: 177df6b612ae7b207f8f5163d12d0c1b Message-ID: <20250603043351.PURxX6dRz9ZTDGyhGuKcXcj47VF4qSfDPuJY0kqJs3A@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2372D1580E0 for ; Tue, 03 Jun 2025 04:40:43 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0390F343339 for ; Tue, 03 Jun 2025 04:40:43 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D73D01104BE; Tue, 03 Jun 2025 04:33:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id CE2CC1104BE for ; Tue, 03 Jun 2025 04:33:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 865A834312C for ; Tue, 03 Jun 2025 04:33:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2829828FB for ; Tue, 03 Jun 2025 04:33:53 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.87.0-r1 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.87.0-r1 Date: Tue, 03 Jun 2025 04:33:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: df0b0384-52d6-4208-887b-e8500ad4a8eb X-Archives-Hash: 8181ca296dd5219a9b7fa120a948b7c5 Message-ID: <20250603043353.bSBNKwWEBenNEhRUOFdjCcOhz9tdv9E_f3Xti4kMZeI@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3BCBE1580E0 for ; Tue, 03 Jun 2025 04:41:09 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 26259343396 for ; Tue, 03 Jun 2025 04:41:09 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4D794110597; Tue, 03 Jun 2025 04:33:56 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 490A7110597 for ; Tue, 03 Jun 2025 04:33:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F25DB343177 for ; Tue, 03 Jun 2025 04:33:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 942E828F2 for ; Tue, 03 Jun 2025 04:33:54 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.88.0_beta20250526 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: 1.88.0_beta20250526 Date: Tue, 03 Jun 2025 04:33:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5018b038-2eb5-4294-8201-3290ca009bfa X-Archives-Hash: 48fbc36c04295078a00a3f99a405ce92 Message-ID: <20250603043354.dA0J-mhudJy_2WXvFSwd0PFHculH3e4cQwwbP0nfWBU@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5BDE81580E0 for ; Tue, 03 Jun 2025 04:41:34 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 494633433B7 for ; Tue, 03 Jun 2025 04:41:34 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 781591102CD; Tue, 03 Jun 2025 04:34:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 70D801102CD for ; Tue, 03 Jun 2025 04:34:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2695634317A for ; Tue, 03 Jun 2025 04:34:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE42519AA for ; Tue, 03 Jun 2025 04:34:34 +0000 (UTC) From: "Matt Jolly" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Jolly" Message-ID: <1748925098.090ff7966c33e0ef08b2fb43dc245d98ccd04be6.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:master commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.62.1-musl-dynamic-linking.patch 1.67.0-doc-wasm.patch 1.70.0-ignore-broken-and-non-applicable-tests.patch 1.74.1-cross-compile-libz.patch 1.81.0-backport-bug937164.patch 1.81.0-backport-llvm-pr101761.patch 1.81.0-backport-llvm-pr101766.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 X-VCS-Branch: master Date: Tue, 03 Jun 2025 04:34:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ae3331d0-c7c9-454d-947d-955a1e0b331f X-Archives-Hash: b1c1e508ef686a6e1f1e49d856b1e62f Message-ID: <20250603043434.UFZ8xTfmJ2e5nvK42AoXjIZUallDRqr6yQsd_FbML48@z> commit: 090ff7966c33e0ef08b2fb43dc245d98ccd04be6 Author: Matt Jolly gentoo org> AuthorDate: Tue Jun 3 04:31:38 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Tue Jun 3 04:31:38 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=090ff796 Add patches for Rust 1.74.1-r101 Patches: - 1.62.1-musl-dynamic-linking.patch - 1.67.0-doc-wasm.patch - 1.70.0-ignore-broken-and-non-applicable-tests.patch - 1.74.1-cross-compile-libz.patch - 1.81.0-backport-bug937164.patch - 1.81.0-backport-llvm-pr101761.patch - 1.81.0-backport-llvm-pr101766.patch Signed-off-by: Matt Jolly gentoo.org> 1.62.1-musl-dynamic-linking.patch | 25 ++++++++++++++++ 1.67.0-doc-wasm.patch | 34 ++++++++++++++++++++++ ....0-ignore-broken-and-non-applicable-tests.patch | 30 +++++++++++++++++++ 1.74.1-cross-compile-libz.patch | 17 +++++++++++ 1.81.0-backport-bug937164.patch | 15 ++++++++++ 1.81.0-backport-llvm-pr101761.patch | 30 +++++++++++++++++++ 1.81.0-backport-llvm-pr101766.patch | 29 ++++++++++++++++++ 7 files changed, 180 insertions(+) diff --git a/1.62.1-musl-dynamic-linking.patch b/1.62.1-musl-dynamic-linking.patch new file mode 100644 index 0000000..fd56396 --- /dev/null +++ b/1.62.1-musl-dynamic-linking.patch @@ -0,0 +1,25 @@ +From e42709c46647dab342b826d30324f3e6e5590e00 Mon Sep 17 00:00:00 2001 +From: Jory Pratt +Date: Tue, 2 Aug 2022 18:32:53 -0500 +Subject: [PATCH] Enable dynamic linking by default for musl + +Signed-off-by: Jory Pratt +--- + compiler/rustc_target/src/spec/linux_musl_base.rs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/compiler/rustc_target/src/spec/linux_musl_base.rs b/compiler/rustc_target/src/spec/linux_musl_base.rs +index 207a87ab0..8a5a43363 100644 +--- a/compiler/rustc_target/src/spec/linux_musl_base.rs ++++ b/compiler/rustc_target/src/spec/linux_musl_base.rs +@@ -10,7 +10,7 @@ pub fn opts() -> TargetOptions { + base.crt_objects_fallback = Some(CrtObjectsFallback::Musl); + + // These targets statically link libc by default +- base.crt_static_default = true; ++ base.crt_static_default = false; + + base + } +-- +2.35.1 diff --git a/1.67.0-doc-wasm.patch b/1.67.0-doc-wasm.patch new file mode 100644 index 0000000..06011de --- /dev/null +++ b/1.67.0-doc-wasm.patch @@ -0,0 +1,34 @@ +From 92aa5f6b272bcdc020a34f8d90f9ef851b5b4504 Mon Sep 17 00:00:00 2001 +From: John Millikin +Date: Mon, 9 Jan 2023 13:54:21 +0900 +Subject: [PATCH] Disable `linux_ext` in wasm32 and fortanix rustdoc builds. + +The `std::os::unix` module is stubbed out when building docs for these +target platforms. The introduction of Linux-specific extension traits +caused `std::os::net` to depend on sub-modules of `std::os::unix`, +which broke rustdoc for the `wasm32-unknown-unknown` target. + +Adding an additional `#[cfg]` guard solves that rustdoc failure by +not declaring `linux_ext` on targets with a stubbed `std::os::unix`. +--- + library/std/src/os/net/mod.rs | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/library/std/src/os/net/mod.rs b/library/std/src/os/net/mod.rs +index 5ec267c41e97c..b7046dd7c598c 100644 +--- a/library/std/src/os/net/mod.rs ++++ b/library/std/src/os/net/mod.rs +@@ -1,4 +1,13 @@ + //! OS-specific networking functionality. + ++// See cfg macros in `library/std/src/os/mod.rs` for why these platforms must ++// be special-cased during rustdoc generation. ++#[cfg(not(all( ++ doc, ++ any( ++ all(target_arch = "wasm32", not(target_os = "wasi")), ++ all(target_vendor = "fortanix", target_env = "sgx") ++ ) ++)))] + #[cfg(any(target_os = "linux", target_os = "android", doc))] + pub(super) mod linux_ext; diff --git a/1.70.0-ignore-broken-and-non-applicable-tests.patch b/1.70.0-ignore-broken-and-non-applicable-tests.patch new file mode 100644 index 0000000..2e12c78 --- /dev/null +++ b/1.70.0-ignore-broken-and-non-applicable-tests.patch @@ -0,0 +1,30 @@ +From 1879d1d1a284bf51c752e47db284ce22701ed5d0 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 16 Sep 2018 16:38:48 +0000 +Subject: [PATCH 12/15] Ignore broken and non-applicable tests + +c-link-to-rust-va-list-fn: unstable feature, broken on aarch64, #56475 +env-funky-keys: can't handle LD_PRELOAD (e.g. sandbox) +long-linker-command-lines: takes >10 minutes to run (but still passes) +simd-intrinsic-generic-bitmask.rs: broken on BE, #59356 +sparc-struct-abi: no sparc target +sysroot-crates-are-unstable: can't run rustc without RPATH +--- + test/ui/env-funky-keys.rs | 1 + + 6 files changed, 10 insertions(+) + +diff --git a/tests/ui/env-funky-keys.rs b/tests/ui/env-funky-keys.rs +index c5c824ac58d..f3fe047a79c 100644 +--- a/tests/ui/env-funky-keys.rs ++++ b/tests/ui/env-funky-keys.rs +@@ -1,6 +1,7 @@ + // run-pass + // Ignore this test on Android, because it segfaults there. + ++// ignore-test + // ignore-android + // ignore-windows + // ignore-cloudabi no execve +-- +2.24.1 + diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch new file mode 100644 index 0000000..98cec09 --- /dev/null +++ b/1.74.1-cross-compile-libz.patch @@ -0,0 +1,17 @@ +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 new file mode 100644 index 0000000..a6e887d --- /dev/null +++ b/1.81.0-backport-bug937164.patch @@ -0,0 +1,15 @@ +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 + #include + #include + diff --git a/1.81.0-backport-llvm-pr101761.patch b/1.81.0-backport-llvm-pr101761.patch new file mode 100644 index 0000000..fccb22d --- /dev/null +++ b/1.81.0-backport-llvm-pr101761.patch @@ -0,0 +1,30 @@ +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 +Date: Fri, 2 Aug 2024 23:07:21 +0100 +Subject: [PATCH] [ADT] Add `` to SmallVector (#101761) + +SmallVector uses `uint32_t`, `uint64_t` without including `` +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 +--- + src/llvm-project/llvm/include/llvm/ADT/SmallVector.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h b/src/llvm-project/llvm/include/llvm/ADT/SmallVector.h +index 09676d792dfebd..17444147b102a9 100644 +--- 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 + #include + #include ++#include + #include + #include + #include diff --git a/1.81.0-backport-llvm-pr101766.patch b/1.81.0-backport-llvm-pr101766.patch new file mode 100644 index 0000000..fdecdaf --- /dev/null +++ b/1.81.0-backport-llvm-pr101766.patch @@ -0,0 +1,29 @@ +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 +Date: Fri, 2 Aug 2024 23:38:55 +0100 +Subject: [PATCH] [AMDGPU] Include `` in AMDGPUMCTargetDesc + +createAMDGPUELFObjectWriter uses `uint8_t` without including `` +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 +--- + src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h b/src/llvm-project/llvm/lib/Target/AMDGPU/MCTargetDesc/AMDGPUMCTargetDesc.h +index 3ef00f75735b0d..879dbe1b279b18 100644 +--- 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 + #include + + namespace llvm {