From: Sriraman Tallam <tmsriram@google.com>
Date: Wed, 10 Mar 2010 01:26:57 +0000 (+0000)
Subject: 2010-03-09  Sriraman Tallam  <tmsriram@google.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d62d0f5fc2156db337ac3cbbc3c05ca76565dbd3;p=binutils-gdb.git

2010-03-09  Sriraman Tallam  <tmsriram@google.com>

	* icf.cc (get_section_contents): Add '@' marker after processing the
	merge reloc.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1bc64e86c90..b81e2bef095 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-09  Sriraman Tallam  <tmsriram@google.com>
+
+	* icf.cc (get_section_contents): Add '@' marker after processing the
+	merge reloc.
+
 2010-03-08  Doug Kwan  <dougkwan@google.com>
 
 	* gold/arm.cc (Arm_exidx_fixup::update_offset_map): Fix build breakage
diff --git a/gold/icf.cc b/gold/icf.cc
index ff2058cfcba..1f955e63446 100644
--- a/gold/icf.cc
+++ b/gold/icf.cc
@@ -389,6 +389,7 @@ get_section_contents(bool first_iteration,
                                                      char*>(str_contents),
                                     entsize);
                     }
+		  buffer.append("@");
                 }
               else if ((*it_s) != NULL)
                 {