From fa9010df1f7a28fd538b2c78bd8527c4f2780bed Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Jul 27 2018 10:51:59 +0000
Subject: Move the .gnu.build.attributes section to after the other readonly sections.


---

diff --git a/binutils-merge-attribute-sections.patch b/binutils-merge-attribute-sections.patch
index f60243f..5479833 100644
--- a/binutils-merge-attribute-sections.patch
+++ b/binutils-merge-attribute-sections.patch
@@ -1,15 +1,6 @@
---- 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
- }
- 
---- binutils.orig/gold/layout.cc	2018-07-26 10:07:31.059922048 +0100
-+++ binutils-2.31.1/gold/layout.cc	2018-07-26 16:57:51.911028541 +0100
+diff -rup binutils.orig/gold/layout.cc binutils-2.31.1/gold/layout.cc
+--- binutils.orig/gold/layout.cc	2018-07-27 11:49:15.188939352 +0100
++++ binutils-2.31.1/gold/layout.cc	2018-07-27 11:50:03.984405949 +0100
 @@ -5429,6 +5429,7 @@ const Layout::Section_name_mapping Layou
    MAPPING_INIT(".gnu.linkonce.armextab.", ".ARM.extab"),
    MAPPING_INIT(".ARM.exidx", ".ARM.exidx"),
@@ -18,3 +9,14 @@
  };
  
  // 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}
++  .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
diff --git a/binutils.spec b/binutils.spec
index 51d7e0b..f0cb926 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: 6%{?dist}
+Release: 7%{?dist}
 License: GPLv3+
 URL: https://sourceware.org/binutils
 
@@ -716,8 +716,11 @@ exit 0
 
 #----------------------------------------------------------------------------
 %changelog
+* Fri Jul 27 2018 Nick Clifton  <nickc@redhat.com> - 2.31.1-7
+- Fix a thinko in the merge patch.
+
 * Fri Jul 27 2018 Nick Clifton  <nickc@redhat.com> - 2.31.1-6
-- Fix typo in merge patch.
+- Fix a typo in the merge patch.
 
 * Thu Jul 26 2018 Nick Clifton  <nickc@redhat.com> - 2.31.1-5
 - Merge .gnu.build.attribute sections together.  (#1608390)