Rebuild with LLVM 18

Resolves: RHEL-27726
This commit is contained in:
Josh Stone 2024-05-08 17:08:00 -07:00
parent 9b68285126
commit 02558073b7
2 changed files with 30 additions and 0 deletions

View File

@ -0,0 +1,26 @@
From 9a5034a20ed8b055dc615271f9d9cf27f9e494f0 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Mon, 5 Feb 2024 07:34:48 -0500
Subject: [PATCH] Step all bootstrap cfgs forward
This also takes care of other bootstrap-related changes.
---
src/tools/coverage-dump/src/covfun.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tools/coverage-dump/src/covfun.rs b/src/tools/coverage-dump/src/covfun.rs
index 3a5866dea3e0..49e3a6ed5838 100644
--- a/src/tools/coverage-dump/src/covfun.rs
+++ b/src/tools/coverage-dump/src/covfun.rs
@@ -219,7 +219,7 @@ pub(crate) fn decode(input: u32) -> Option<Self> {
enum MappingKind {
Code(CovTerm),
Gap(CovTerm),
- Expansion(u32),
+ Expansion(#[allow(dead_code)] u32),
Skip,
// Using raw identifiers here makes the dump output a little bit nicer
// (via the derived Debug), at the expense of making this tool's source
--
2.44.0

View File

@ -161,6 +161,9 @@ Patch12: 0001-test-don-t-compress-test-registry-crates.patch
# https://github.com/rust-lang/rust-clippy/pull/12682 # https://github.com/rust-lang/rust-clippy/pull/12682
Patch13: 0001-The-multiple_unsafe_ops_per_block-test-needs-asm.patch Patch13: 0001-The-multiple_unsafe_ops_per_block-test-needs-asm.patch
# https://github.com/rust-lang/rust/pull/120676 (partial)
Patch14: 0001-Step-all-bootstrap-cfgs-forward.patch
### RHEL-specific patches below ### ### RHEL-specific patches below ###
# Simple rpm macros for rust-toolset (as opposed to full rust-packaging) # Simple rpm macros for rust-toolset (as opposed to full rust-packaging)
@ -630,6 +633,7 @@ rm -rf %{wasi_libc_dir}/dlmalloc/
%patch -P11 -p1 %patch -P11 -p1
%patch -P12 -p1 -d src/tools/cargo %patch -P12 -p1 -d src/tools/cargo
%patch -P13 -p1 -d src/tools/clippy %patch -P13 -p1 -d src/tools/clippy
%patch -P14 -p1
%if %with disabled_libssh2 %if %with disabled_libssh2
%patch -P100 -p1 %patch -P100 -p1