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 37A111580E0 for ; Mon, 02 Jun 2025 09:28:22 +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 22C9C3431A7 for ; Mon, 02 Jun 2025 09:28:22 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4862C110517; Mon, 02 Jun 2025 09:25:24 +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 400C8110517 for ; Mon, 02 Jun 2025 09:25:24 +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 F3253342FDE for ; Mon, 02 Jun 2025 09:25:23 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9AA8028EE for ; Mon, 02 Jun 2025 09:25:22 +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: <1748856137.ad0c8b81b83660581f8f8c427aff2cd6b32d7865.kangie@gentoo> Subject: [gentoo-commits] proj/rust-patches:1.88 commit in: / X-VCS-Repository: proj/rust-patches X-VCS-Files: 1.74.1-cross-compile-libz.patch 1.82.0-dwarf-llvm-assertion.patch 1.83.0-cross-compile-libz.patch 1.83.0-dwarf-llvm-assertion.patch X-VCS-Directories: / X-VCS-Committer: kangie X-VCS-Committer-Name: Matt Jolly X-VCS-Revision: ad0c8b81b83660581f8f8c427aff2cd6b32d7865 X-VCS-Branch: 1.88 Date: Mon, 02 Jun 2025 09:25:22 +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: 7179dd6b-b039-4325-949c-874c59b0da3d X-Archives-Hash: b0a88ca4244be7ea3e0b11c297b200ff Message-ID: <20250602092522.QVlFgtXU4HDRXf3--qAFBKvdsYfiiccw-L49HyumCK0@z> commit: ad0c8b81b83660581f8f8c427aff2cd6b32d7865 Author: Matt Jolly gentoo org> AuthorDate: Mon Jun 2 09:22:17 2025 +0000 Commit: Matt Jolly gentoo org> CommitDate: Mon Jun 2 09:22:17 2025 +0000 URL: https://gitweb.gentoo.org/proj/rust-patches.git/commit/?id=ad0c8b81 Add patches for Rust 1.83.0-r3 Patches: - 1.78.0-musl-dynamic-linking.patch - 1.83.0-cross-compile-libz.patch - 1.67.0-doc-wasm.patch - 1.83.0-dwarf-llvm-assertion.patch Signed-off-by: Matt Jolly gentoo.org> 1.74.1-cross-compile-libz.patch | 17 ----------------- 1.83.0-cross-compile-libz.patch | 19 +++++++++++++++++++ ...sertion.patch => 1.83.0-dwarf-llvm-assertion.patch | 7 +------ 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/1.74.1-cross-compile-libz.patch b/1.74.1-cross-compile-libz.patch deleted file mode 100644 index 98cec09..0000000 --- a/1.74.1-cross-compile-libz.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://paste.sr.ht/~kchibisov/682321e0fd4a3ece4a4b7b71591896f5cd3cdb22 -https://github.com/gentoo/gentoo/pull/35246#discussion_r1484525497 - ---- a/compiler/rustc_llvm/build.rs -+++ b/compiler/rustc_llvm/build.rs -@@ -237,10 +237,7 @@ fn main() { - // of llvm-config, not the target that we're attempting to link. - let mut cmd = Command::new(&llvm_config); - cmd.arg(llvm_link_arg).arg("--libs"); -- -- if !is_crossed { -- cmd.arg("--system-libs"); -- } -+ cmd.arg("--system-libs"); - - if (target.starts_with("arm") && !target.contains("freebsd")) - || target.starts_with("mips-") diff --git a/1.83.0-cross-compile-libz.patch b/1.83.0-cross-compile-libz.patch new file mode 100644 index 0000000..1eac04b --- /dev/null +++ b/1.83.0-cross-compile-libz.patch @@ -0,0 +1,19 @@ +https://paste.sr.ht/~kchibisov/682321e0fd4a3ece4a4b7b71591896f5cd3cdb22 +https://github.com/gentoo/gentoo/pull/35246#discussion_r1484525497 + +--- a/compiler/rustc_llvm/build.rs ++++ b/compiler/rustc_llvm/build.rs +@@ -220,12 +220,7 @@ + let mut cmd = Command::new(&llvm_config); + cmd.arg(llvm_link_arg).arg("--libs"); + +- // Don't link system libs if cross-compiling unless targetting Windows. +- // On Windows system DLLs aren't linked directly, instead import libraries are used. +- // These import libraries are independent of the host. +- if !is_crossed || target.contains("windows") { +- cmd.arg("--system-libs"); +- } ++ cmd.arg("--system-libs"); + + // We need libkstat for getHostCPUName on SPARC builds. + // See also: https://github.com/llvm/llvm-project/issues/64186 diff --git a/1.82.0-dwarf-llvm-assertion.patch b/1.83.0-dwarf-llvm-assertion.patch similarity index 98% rename from 1.82.0-dwarf-llvm-assertion.patch rename to 1.83.0-dwarf-llvm-assertion.patch index b23ae2f..96bdac0 100644 --- a/1.82.0-dwarf-llvm-assertion.patch +++ b/1.83.0-dwarf-llvm-assertion.patch @@ -1,8 +1,3 @@ -https://bugs.gentoo.org/942013 -https://bugs.gentoo.org/942884 -https://github.com/rust-lang/rust/issues/131944 -https://github.com/rust-lang/rust/pull/132613 - From 1dc106121b62562ead6e7d612fa136dc4b35cd5d Mon Sep 17 00:00:00 2001 From: Kyle Huey Date: Mon, 4 Nov 2024 11:38:14 -0800 @@ -26,8 +21,8 @@ Fixes #131944 use rustc_codegen_ssa::mir::debuginfo::{DebugScope, FunctionDebugContext}; use rustc_codegen_ssa::traits::*; +use rustc_data_structures::fx::FxHashMap; - use rustc_index::bit_set::BitSet; use rustc_index::Idx; + use rustc_index::bit_set::BitSet; use rustc_middle::mir::{Body, SourceScope}; use rustc_middle::ty::layout::FnAbiOf; use rustc_middle::ty::{self, Instance};