From: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Thu, 19 Mar 2009 19:39:32 +0000 (+0000)
Subject: 2009-03-19  Paul Pluzhnikov  <ppluzhnikov@google.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4110593748137da1416f0822b3771fddcd4f8970;p=binutils-gdb.git

2009-03-19  Paul Pluzhnikov  <ppluzhnikov@google.com>

	* layout.cc (Layout::output_section_name): Preserve names
	of '.note.' sections.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 96abf8ac132..a736dcbb680 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-19  Paul Pluzhnikov  <ppluzhnikov@google.com>
+
+	* layout.cc (Layout::output_section_name): Preserve names
+	of '.note.' sections.
+	
 2009-03-19  Ian Lance Taylor  <iant@google.com>
 
 	* descriptors.cc (Descriptors::open): Check that the options are
diff --git a/gold/layout.cc b/gold/layout.cc
index b59caea6166..108111a260e 100644
--- a/gold/layout.cc
+++ b/gold/layout.cc
@@ -2899,6 +2899,9 @@ Layout::output_section_name(const char* name, size_t* plen)
   // initial '.', we use the name unchanged (i.e., "mysection" and
   // ".text" are unchanged).
 
+  // If the name starts with '.note', we keep it unchanged (e.g. to
+  // avoid truncating '.note.ABI-tag' to '.note').
+
   // If the name starts with ".data.rel.ro.local" we use
   // ".data.rel.ro.local".
 
@@ -2914,6 +2917,8 @@ Layout::output_section_name(const char* name, size_t* plen)
   const char* sdot = strchr(s, '.');
   if (sdot == NULL)
     return name;
+  if (strncmp(name, ".note.", 6) == 0)
+    return name;
 
   const char* const data_rel_ro_local = ".data.rel.ro.local";
   if (strncmp(name, data_rel_ro_local, strlen(data_rel_ro_local)) == 0)