From 1bbe42b979d624a7201fd5b1264ced205662e8e7 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Jul 26 2018 13:01:23 +0000
Subject: Merge .gnu.build.attribute sections together.

Realtes: #1608390

---

diff --git a/binutils-merge-attribute-sections.patch b/binutils-merge-attribute-sections.patch
new file mode 100644
index 0000000..019139b
--- /dev/null
+++ b/binutils-merge-attribute-sections.patch
@@ -0,0 +1,10 @@
+--- binutils.orig/ld/scripttempl/elf.sc	2018-07-26 10:07:32.307908582 +0100
++++ binutils-2.31.1/ld/scripttempl/elf.sc	2018-07-26 10:10:42.123860250 +0100
+@@ -379,6 +379,7 @@ emit_early_ro()
+   cat <<EOF
+   ${INITIAL_READONLY_SECTIONS}
+   .note.gnu.build-id : { *(.note.gnu.build-id) }
++  .gnu-.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
+ EOF
+ }
+ 
diff --git a/binutils.spec b/binutils.spec
index 19a3d7d..466a2fe 100644
--- a/binutils.spec
+++ b/binutils.spec
@@ -69,7 +69,7 @@
 Summary: A GNU collection of binary utilities
 Name: %{?cross}binutils%{?_with_debug:-debug}
 Version: 2.31.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -167,6 +167,10 @@ Patch12: binutils-gold-ignore-discarded-note-relocs.patch
 # Lifetime: Fixed in 2.32 
 Patch13: binutils-s390-partial-relro.patch
 
+# Purpose:  Merge .gnu.build.attribute sections into a single section.
+# Lifetime: Fixed in 2.32 
+Patch14: binutils-merge-attribute-sections.patch
+
 #----------------------------------------------------------------------------
 
 Provides: bundled(libiberty)
@@ -304,6 +308,7 @@ using libelf instead of BFD.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 # We cannot run autotools as there is an exact requirement of autoconf-2.59.
 
@@ -711,6 +716,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Thu Jul 26 2018 Nick Clifton  <nickc@redhat.com> - 2.31.1-4
+- Merge .gnu.build.attribute sections together.  (#1608390)
+
 * Tue Jul 24 2018 Nick Clifton  <nickc@redhat.com> - 2.31.1-3
 - Extend gold linker patch to cover subsections of .gnu.build.attributes.  (#1607054)