From 274bed029a5e68529d2aa02a3bc8833bdf4a3732 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 27 Jun 2024 13:18:34 +0100
Subject: [PATCH] Prune messages from gcc's lto-wrapper which can confure
 testsuite tests. Resolves: RHEL-45264

---
 binutils-prune-lto-messages.patch | 16 ++++++++++++++++
 binutils.spec                     |  9 ++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 binutils-prune-lto-messages.patch

diff --git a/binutils-prune-lto-messages.patch b/binutils-prune-lto-messages.patch
new file mode 100644
index 0000000..c07458c
--- /dev/null
+++ b/binutils-prune-lto-messages.patch
@@ -0,0 +1,16 @@
+--- binutils.orig/binutils/testsuite/lib/binutils-common.exp	2024-06-27 12:43:48.892438898 +0100
++++ binutils-2.35.2/binutils/testsuite/lib/binutils-common.exp	2024-06-27 12:45:12.134877825 +0100
+@@ -523,8 +523,13 @@ proc prune_warnings_extra { text } {
+ 	# The "\\1" is to try to preserve a "\n" but only if necessary.
+ 	regsub -all "(^|\n)(\[^\n\]*: warning:\[^\n\]*unsupported GNU_PROPERTY_TYPE\[^\n\]*\n?)+" $text "\\1" text
+     }
++
+     # PR binutils/23898: It is OK to have gaps in build notes.
+     regsub -all "(^|\n)(\[^\n\]*: Warning: Gap in build notes detected from\[^\n\]*\n?)+" $text "\\1" text
++
++    # Ignore LTO warnings triggered by configuring with --enable-pgo-build=lto.
++    regsub -all "(^|\n)(\[^\n\]*lto-wrapper: warning: using serial compilation of \[0-9\]+ LTRANS jobs\[^\n\]*\n?)+" $text "\\1" text
++
+     return $text
+ }
+ 
diff --git a/binutils.spec b/binutils.spec
index 331e9f4..e26fbff 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.35.2
-Release: 46%{?dist}
+Release: 47%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -453,6 +453,10 @@ Patch68: binutils-objcopy-pe-section-align.patch
 # Lifetime: Fixed in 2.37
 Patch69: binutils-gnu.debuglto_.patch
 
+# Purpose:  Remove messages from gcc lto-wrapper which can confuse testsuite results.
+# Lifetime: Fixed in 2.37
+Patch70: binutils-prune-lto-messages.patch
+
 #----------------------------------------------------------------------------
 
 Provides: bundled(libiberty)
@@ -1293,6 +1297,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Thu Jun 27 2024 Nick Clifton  <nickc@redhat.com> - 2.35.2-47
+- Prune messages from gcc's lto-wrapper which can confure testsuite tests.  (RHEL-45264)
+
 * Thu Jun 20 2024 Nick Clifton  <nickc@redhat.com> - 2.35.2-46
 - Fix handling of .gnu.debuglto_.debug_* sections.  (RHEL-43758)