From d2eff8f756f7c5e6753f9a2e63bfd0c384dc2e89 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Thu, 19 Jan 2023 16:28:22 +0000
Subject: [PATCH] Ensure that x76_64 and i686 versions of bfd_stdint.h are the
 same. Resolves: #2162328

---
 binutils-no-comment-in-bfd-stdint.patch | 30 +++++++++++++++++++++++++
 binutils.spec                           |  9 +++++++-
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 binutils-no-comment-in-bfd-stdint.patch

diff --git a/binutils-no-comment-in-bfd-stdint.patch b/binutils-no-comment-in-bfd-stdint.patch
new file mode 100644
index 0000000..c0e8214
--- /dev/null
+++ b/binutils-no-comment-in-bfd-stdint.patch
@@ -0,0 +1,30 @@
+diff -rup binutils.orig/bfd/configure binutils-2.35.2/bfd/configure
+--- binutils.orig/bfd/configure	2023-01-19 12:17:21.293513059 +0000
++++ binutils-2.35.2/bfd/configure	2023-01-19 12:27:25.783974084 +0000
+@@ -18921,11 +18921,6 @@ _LT_EOF
+       esac
+     done ;;
+     "bfd_stdint.h":C)
+-if test "$GCC" = yes; then
+-  echo "/* generated for " `$CC --version | sed 1q` "*/" > tmp-stdint.h
+-else
+-  echo "/* generated for $CC */" > tmp-stdint.h
+-fi
+ 
+ sed 's/^ *//' >> tmp-stdint.h <<EOF
+ 
+diff -rup binutils.orig/config/stdint.m4 binutils-2.35.2/config/stdint.m4
+--- binutils.orig/config/stdint.m4	2023-01-19 12:17:20.169515897 +0000
++++ binutils-2.35.2/config/stdint.m4	2023-01-19 12:27:02.920032688 +0000
+@@ -192,11 +192,6 @@ fi
+ 
+ # ----------------- done all checks, emit header -------------
+ AC_CONFIG_COMMANDS(_GCC_STDINT_H, [
+-if test "$GCC" = yes; then
+-  echo "/* generated for " `$CC --version | sed 1q` "*/" > tmp-stdint.h
+-else
+-  echo "/* generated for $CC */" > tmp-stdint.h
+-fi
+ 
+ sed 's/^ *//' >> tmp-stdint.h <<EOF
+ 
diff --git a/binutils.spec b/binutils.spec
index 8177640..ebe2225 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: 35%{?dist}
+Release: 36%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -420,6 +420,10 @@ Patch60: binutils-autoconf-version.patch
 # 	    PR23460 test which may have more than 16 file descriptors open
 # Lifetime: Fixed in 2.39
 Patch61: binutils-increase-the-max-number-of-open-fi.patch
+
+# Purpose:  Remove a comment from bfd_stdint.h, indicating how the file was generated.
+# Lifetime: Fixed in 2.39 ?
+Patch62: binutils-no-comment-in-bfd-stdint.patch
 #----------------------------------------------------------------------------
 
 Provides: bundled(libiberty)
@@ -1256,6 +1260,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Thu Jan 19 2023 Nick Clifton  <nickc@redhat.com> - 2.35.2-36
+- Ensure that x76_64 and i686 versions of bfd_stdint.h are the same.  (#2162328)
+
 * Tue Jan 10 2023 Nick Clifton  <nickc@redhat.com> - 2.35.2-35
 - Extend fix handling symbol versioning with LTO plugins.  (#2148469)