From 7d8a31665739412395f6dd370d2279acd322e78e Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 30 Jul 2018 09:34:40 +0100
Subject: [PATCH] Combine ,gnu.build.attributes.* sections into one
 .gnu.build.attributes section during linking.

gold	* layout.cc (section_name_mapping): Add an entry for
	.gnu.build.attributes.

ld	* scripttempl/elf.sc: Place .gnu.build.attributes sections with
	other read-only sections.
---
 gold/ChangeLog        | 5 +++++
 gold/layout.cc        | 1 +
 ld/ChangeLog          | 5 +++++
 ld/scripttempl/elf.sc | 1 +
 4 files changed, 12 insertions(+)

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 93efd29d1cf..d5cc02b14bd 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-30  Nick Clifton  <nickc@redhat.com>
+
+	* layout.cc (section_name_mapping): Add an entry for
+	.gnu.build.attributes.
+
 2018-07-18  Nick Clifton  <nickc@redhat.com>
 
 	* po/fr.po: Updated French translation.
diff --git a/gold/layout.cc b/gold/layout.cc
index 0df7ed37f02..66162a253d4 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -5429,6 +5429,7 @@ const Layout::Section_name_mapping Layout::section_name_mapping[] =
   MAPPING_INIT(".gnu.linkonce.armextab.", ".ARM.extab"),
   MAPPING_INIT(".ARM.exidx", ".ARM.exidx"),
   MAPPING_INIT(".gnu.linkonce.armexidx.", ".ARM.exidx"),
+  MAPPING_INIT(".gnu.build.attributes.", ".gnu.build.attributes"),
 };
 
 // Mapping for ".text" section prefixes with -z,keep-text-section-prefix.
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 61e2c6d643c..0f3906bd175 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2018-07-30  Nick Clifton  <nickc@redhat.com>
+
+	* scripttempl/elf.sc: Place .gnu.build.attributes sections with
+	other read-only sections.
+
 2018-07-27  John Darrington  <john@darrington.wattle.id.au>
 
 	* scripttempl/elfm9s12z.sc: Put input sections called .common
diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index 444aef29423..6bf6936362d 100644
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
@@ -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
-- 
2.30.2