From b97225ea487eb501cadb17a6cbc9d1844179e07e Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 30 Jul 2018 11:42:41 +0100
Subject: [PATCH]  Move the .gnu.build.attributes section to after the .comment
 section.

---
 binutils-merge-attribute-sections.patch | 19 ++++++++++---------
 binutils.spec                           |  5 ++++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/binutils-merge-attribute-sections.patch b/binutils-merge-attribute-sections.patch
index 5479833..5dcd5e4 100644
--- a/binutils-merge-attribute-sections.patch
+++ b/binutils-merge-attribute-sections.patch
@@ -10,13 +10,14 @@ diff -rup binutils.orig/gold/layout.cc binutils-2.31.1/gold/layout.cc
  
  // Mapping for ".text" section prefixes with -z,keep-text-section-prefix.
 diff -rup binutils.orig/ld/scripttempl/elf.sc binutils-2.31.1/ld/scripttempl/elf.sc
---- binutils.orig/ld/scripttempl/elf.sc	2018-07-27 11:49:16.418925906 +0100
-+++ binutils-2.31.1/ld/scripttempl/elf.sc	2018-07-27 11:49:44.991613567 +0100
-@@ -564,6 +564,7 @@ cat <<EOF
-   ${CREATE_SHLIB-${SDATA2}}
-   ${CREATE_SHLIB-${SBSS2}}
-   ${OTHER_READONLY_SECTIONS}
+--- binutils.orig/ld/scripttempl/elf.sc	2018-07-30 10:48:58.409509857 +0100
++++ binutils-2.31.1/ld/scripttempl/elf.sc	2018-07-30 10:49:09.267393364 +0100
+@@ -692,6 +692,8 @@ cat <<EOF
+ 
+   .comment       0 : { *(.comment) }
+ 
 +  .gnu.build.attributes : { *(.gnu.build.attributes .gnu.build.attributes.*) }
-   .eh_frame_hdr : { *(.eh_frame_hdr) ${RELOCATING+*(.eh_frame_entry .eh_frame_entry.*)} }
-   .eh_frame     ${RELOCATING-0} : ONLY_IF_RO { KEEP (*(.eh_frame)) ${RELOCATING+*(.eh_frame.*)} }
-   .gcc_except_table ${RELOCATING-0} : ONLY_IF_RO { *(.gcc_except_table
++
+ EOF
+ 
+ . $srcdir/scripttempl/DWARF.sc
diff --git a/binutils.spec b/binutils.spec
index f0cb926..dcc9a41 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: 7%{?dist}
+Release: 8%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -716,6 +716,9 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Mon Jul 30 2018 Nick Clifton  <nickc@redhat.com> - 2.31.1-8
+- Move the .gnu.build.attributes section to after the .comment section.
+
 * Fri Jul 27 2018 Nick Clifton  <nickc@redhat.com> - 2.31.1-7
 - Fix a thinko in the merge patch.