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 F0D4E1580E0 for ; Mon, 02 Jun 2025 09:38:28 +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 CB0803430E0 for ; Mon, 02 Jun 2025 09:38:28 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 1AFD2110533; Mon, 02 Jun 2025 09:34:37 +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 0A87611052F for ; Mon, 02 Jun 2025 09:34:37 +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 ABBF3343164 for ; Mon, 02 Jun 2025 09:34:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3E0FE2921 for ; Mon, 02 Jun 2025 09:34:33 +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: <1748856138.ac5c16d8316a7332fc7adc87f617de45005af9ca.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.88.0_beta20250526 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.85.0-musl-dynamic-linking.patch 1.88.0-musl-dynamic-linking.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: ac5c16d8316a7332fc7adc87f617de45005af9ca X-VCS-Branch: 1.88.0_beta20250526 Date: Mon, 02 Jun 2025 09:34:33 +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: c961e327-6691-4891-9a87-9b4c1ed573a4 X-Archives-Hash: bb75819b5968901cfbc379e431c28cb6 Message-ID: <20250602093433.SEryd9eucR9trQjP02dAoZ32WsU3-fuYdNeD7PwEw4M@z> commit: ac5c16d8316a7332fc7adc87f617de45005af9ca Author: Matt Jolly gentoo org> AuthorDate: Mon Jun 2 09:22:18 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Mon Jun 2 09:22:18 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=ac5c16d8 Add patches for Rust 1.88.0_beta20250526 Patches: - 1.85.0-cross-compile-libz.patch - 1.67.0-doc-wasm.patch - 1.87.0-znver.patch - 1.88.0-musl-dynamic-linking.patch Signed-off-by: Matt Jolly gentoo.org> ...king.patch => 1.88.0-musl-dynamic-linking.patch | 32 +++++++++++----------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/1.85.0-musl-dynamic-linking.patch b/1.88.0-musl-dynamic-linking.patch similarity index 92% rename from 1.85.0-musl-dynamic-linking.patch rename to 1.88.0-musl-dynamic-linking.patch index e54cadf..c3bdb27 100644 --- a/1.85.0-musl-dynamic-linking.patch +++ b/1.88.0-musl-dynamic-linking.patch @@ -1,6 +1,6 @@ -From be965af5421e55c0032a989b220bc0da005d2272 Mon Sep 17 00:00:00 2001 -From: Michal Rostecki -Date: Tue, 25 Feb 2025 16:24:21 +0100 +From 685e099f117f199aff854d4c69c4e18cfcb79657 Mon Sep 17 00:00:00 2001 +From: Matt Jolly +Date: Fri, 30 May 2025 23:44:06 +1000 Subject: [PATCH] Enable dynamic linking by default for musl --- a/compiler/rustc_target/src/spec/targets/aarch64_unknown_linux_musl.rs @@ -14,7 +14,7 @@ Subject: [PATCH] Enable dynamic linking by default for musl - Target { llvm_target: "aarch64-unknown-linux-musl".into(), - metadata: crate::spec::TargetMetadata { + metadata: TargetMetadata { --- a/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabi.rs +++ b/compiler/rustc_target/src/spec/targets/arm_unknown_linux_musleabi.rs @@ -20,8 +20,7 @@ pub(crate) fn target() -> Target { @@ -77,8 +77,8 @@ Subject: [PATCH] Enable dynamic linking by default for musl } --- a/compiler/rustc_target/src/spec/targets/i586_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/i586_unknown_linux_musl.rs -@@ -4,7 +4,5 @@ pub(crate) fn target() -> Target { - let mut base = super::i686_unknown_linux_musl::target(); +@@ -5,7 +5,5 @@ pub(crate) fn target() -> Target { + base.rustc_abi = None; // overwrite the SSE2 ABI set by the base target base.cpu = "pentium".into(); base.llvm_target = "i586-unknown-linux-musl".into(); - // FIXME(compiler-team#422): musl targets should be dynamically linked by default. @@ -87,7 +87,7 @@ Subject: [PATCH] Enable dynamic linking by default for musl } --- a/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/i686_unknown_linux_musl.rs -@@ -6,8 +6,6 @@ pub(crate) fn target() -> Target { +@@ -11,8 +11,6 @@ pub(crate) fn target() -> Target { base.max_atomic_width = Some(64); base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32", "-Wl,-melf_i386"]); base.stack_probes = StackProbeType::Inline; @@ -98,16 +98,16 @@ Subject: [PATCH] Enable dynamic linking by default for musl // implementation, apparently relies on frame pointers existing... somehow. --- a/compiler/rustc_target/src/spec/targets/mips64_unknown_linux_muslabi64.rs +++ b/compiler/rustc_target/src/spec/targets/mips64_unknown_linux_muslabi64.rs -@@ -22,8 +22,7 @@ pub(crate) fn target() -> Target { +@@ -23,8 +23,7 @@ pub(crate) fn target() -> Target { abi: "abi64".into(), endian: Endian::Big, mcount: "_mcount".into(), - // FIXME(compiler-team#422): musl targets should be dynamically linked by default. - crt_static_default: true, + crt_static_default: false, + llvm_abiname: "n64".into(), ..base }, - } --- a/compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs +++ b/compiler/rustc_target/src/spec/targets/mips64el_unknown_linux_muslabi64.rs @@ -5,8 +5,6 @@ pub(crate) fn target() -> Target { @@ -121,7 +121,7 @@ Subject: [PATCH] Enable dynamic linking by default for musl llvm_target: "mips64el-unknown-linux-musl".into(), --- a/compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/powerpc64_unknown_linux_musl.rs -@@ -7,8 +7,6 @@ pub(crate) fn target() -> Target { +@@ -10,8 +10,6 @@ pub(crate) fn target() -> Target { base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]); base.max_atomic_width = Some(64); base.stack_probes = StackProbeType::Inline; @@ -132,7 +132,7 @@ Subject: [PATCH] Enable dynamic linking by default for musl llvm_target: "powerpc64-unknown-linux-musl".into(), --- a/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/powerpc64le_unknown_linux_musl.rs -@@ -6,8 +6,6 @@ pub(crate) fn target() -> Target { +@@ -8,8 +8,6 @@ pub(crate) fn target() -> Target { base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m64"]); base.max_atomic_width = Some(64); base.stack_probes = StackProbeType::Inline; @@ -143,7 +143,7 @@ Subject: [PATCH] Enable dynamic linking by default for musl llvm_target: "powerpc64le-unknown-linux-musl".into(), --- a/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_musl.rs -@@ -6,8 +6,6 @@ pub(crate) fn target() -> Target { +@@ -9,8 +9,6 @@ pub(crate) fn target() -> Target { base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-m32"]); base.max_atomic_width = Some(32); base.stack_probes = StackProbeType::Inline; @@ -154,7 +154,7 @@ Subject: [PATCH] Enable dynamic linking by default for musl llvm_target: "powerpc-unknown-linux-musl".into(), --- a/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_muslspe.rs +++ b/compiler/rustc_target/src/spec/targets/powerpc_unknown_linux_muslspe.rs -@@ -6,8 +6,6 @@ pub(crate) fn target() -> Target { +@@ -9,8 +9,6 @@ pub(crate) fn target() -> Target { base.add_pre_link_args(LinkerFlavor::Gnu(Cc::Yes, Lld::No), &["-mspe"]); base.max_atomic_width = Some(32); base.stack_probes = StackProbeType::Inline; @@ -177,7 +177,7 @@ Subject: [PATCH] Enable dynamic linking by default for musl } --- a/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/s390x_unknown_linux_musl.rs -@@ -12,8 +12,6 @@ pub(crate) fn target() -> Target { +@@ -13,8 +13,6 @@ pub(crate) fn target() -> Target { base.stack_probes = StackProbeType::Inline; base.supported_sanitizers = SanitizerSet::ADDRESS | SanitizerSet::LEAK | SanitizerSet::MEMORY | SanitizerSet::THREAD; @@ -200,7 +200,7 @@ Subject: [PATCH] Enable dynamic linking by default for musl } --- a/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs +++ b/compiler/rustc_target/src/spec/targets/x86_64_unknown_linux_musl.rs -@@ -14,8 +14,6 @@ pub(crate) fn target() -> Target { +@@ -16,8 +16,6 @@ pub(crate) fn target() -> Target { | SanitizerSet::MEMORY | SanitizerSet::THREAD; base.supports_xray = true; @@ -210,5 +210,5 @@ Subject: [PATCH] Enable dynamic linking by default for musl Target { llvm_target: "x86_64-unknown-linux-musl".into(), -- -2.45.3 +2.49.0