From 874bdb00e573e6ec23dd40f138173234f749d98c Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Mon, 11 Aug 2025 16:49:50 +0100 Subject: [PATCH] Remove uneeded glibc/powerpc patch. Resolves: RHEL-100160 --- bin.ppc64.gcc.patch | 24 ------------------------ binutils.spec | 10 ++++------ 2 files changed, 4 insertions(+), 30 deletions(-) delete mode 100644 bin.ppc64.gcc.patch diff --git a/bin.ppc64.gcc.patch b/bin.ppc64.gcc.patch deleted file mode 100644 index 77ffd61..0000000 --- a/bin.ppc64.gcc.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -rup binutils.orig/ld/ldlang.c binutils-with-gold-2.44/ld/ldlang.c ---- binutils.orig/ld/ldlang.c 2025-06-25 09:37:36.524268728 +0100 -+++ binutils-with-gold-2.44/ld/ldlang.c 2025-06-25 09:37:54.787387725 +0100 -@@ -8042,6 +8042,19 @@ lang_list_remove_tail (lang_statement_li - { - union lang_statement_union **savetail; - /* Check that ORIGLIST really is an earlier state of DESTLIST. */ -+ -+ if (getenv ("LD_DEBUG_NEVER") != NULL) -+ { -+ /* FIXME: RHEL-49348: For some reason building this function for the -+ PowerPC architecture on RHEL-10 is resulting in a linker that -+ triggers the ASSERT below - because the origlist pointer is -+ corrupt. These fprintf statements, even if they will never be -+ used, are enough to cause the compiler to build the function -+ correctly, thus avoiding the problem. */ -+ fprintf (stderr, "origlist %p destlist %p\n", origlist, destlist); -+ fprintf (stderr, "heads: %p %p\n", origlist->head, destlist->head); -+ } -+ - ASSERT (origlist->head == destlist->head); - savetail = origlist->tail; - origlist->head = *(savetail); -Only in binutils-with-gold-2.44/ld: ldlang.c.orig diff --git a/binutils.spec b/binutils.spec index c40892a..46e07bc 100644 --- a/binutils.spec +++ b/binutils.spec @@ -27,7 +27,7 @@ Name: %{?scl_prefix}binutils # The variable %%{source} (see below) should be set to indicate which of these # origins is being used. Version: 2.44 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL-3.0-or-later AND (GPL-3.0-or-later WITH Bison-exception-2.2) AND (LGPL-2.0-or-later WITH GCC-exception-2.0) AND BSD-3-Clause AND GFDL-1.3-or-later AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later URL: https://sourceware.org/binutils @@ -336,11 +336,6 @@ Patch19: binutils-aarch64-small-plt0.patch #---------------------------------------------------------------------------- -# Purpose: Workaround for an unresolved bug in ppc gcc/glibc -# which generates bad code in the linker. cf RHEL-49348 -# Lifetime: TEMPORARY -Patch98: bin.ppc64.gcc.patch - # Purpose: Suppress the x86 linker's p_align-1 tests due to kernel bug on CentOS-10 # Lifetime: TEMPORARY Patch99: binutils-suppress-ld-align-tests.patch @@ -1581,6 +1576,9 @@ exit 0 #---------------------------------------------------------------------------- %changelog +* Mon Aug 11 2025 Nick Clifton - 2.44-7 +- Remove uneeded glibc/powerpc patch. (RHEL-100160) + * Wed Aug 06 2025 Nick Clifton - 2.44-6 - Rebuild with glibc fixed for CVE-2025-5702. (RHEL-100160)