From d43bbe0fb572887e1b7825f3b9afa8c9081b01b9 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 25 Jan 2024 09:43:00 +0000
Subject: [PATCH] Suppress the x86 linker's p_align-1 tests in order to cope
 with a CentOS-10 kernel bug.  (RHEL-22466)

---
 binutils-suppress-ld-align-tests.patch | 13 +++++++++++++
 binutils.spec                          |  9 ++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 binutils-suppress-ld-align-tests.patch

diff --git a/binutils-suppress-ld-align-tests.patch b/binutils-suppress-ld-align-tests.patch
new file mode 100644
index 0000000..40164d7
--- /dev/null
+++ b/binutils-suppress-ld-align-tests.patch
@@ -0,0 +1,13 @@
+--- binutils.orig/ld/testsuite/ld-elf/linux-x86.exp	2024-01-24 11:52:35.288014542 +0000
++++ binutils-2.41/ld/testsuite/ld-elf/linux-x86.exp	2024-01-24 17:31:39.356167357 +0000
+@@ -225,6 +225,10 @@ if { [check_ifunc_attribute_available] }
+ # Old gcc silently ignores __attribute__ ((aligned())) with too big alignment.
+ proc compiler_honours_aligned { } {
+     global CC_FOR_TARGET READELF srcdir subdir
++
++    # Temporary fix for CentOS-10 kernel issue.  (RHEL-22466)
++    return 0 
++    
+     ld_compile $CC_FOR_TARGET $srcdir/$subdir/p_align-1.c tmpdir/p_align-1.o
+     set output [run_host_cmd "$READELF" "-SW tmpdir/p_align-1.o"]
+     if { [regexp { [.]data *PROGBITS .* 8388608[\n]} $output] } {
diff --git a/binutils.spec b/binutils.spec
index f1c193e..dddf2b8 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -2,7 +2,7 @@
 Summary: A GNU collection of binary utilities
 Name: binutils%{?_with_debug:-debug}
 Version: 2.41
-Release: 31%{?dist}
+Release: 32%{?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
 
@@ -319,6 +319,10 @@ Patch35: binutils-demangler-updates.patch
 # Lifetime: Fixed in 2.42
 Patch36: binutils-Intel-APX-part-1.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
+
 #----------------------------------------------------------------------------
 
 Provides: bundled(libiberty)
@@ -1354,6 +1358,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Wed Jan 24 2024 Nick Clifton  <nickc@redhat.com> - 2.41-32
+- Suppress the x86 linker's p_align-1 tests in order to cope with a CentOS-10 kernel bug.  (RHEL-22466)
+
 * Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.41-31
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild