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 1bc64e86c90ee466563fe3d3b43b23cc45139496..b81e2bef0953aeb6244c0264091bb30366fcf9a1 100644 (file)
--- 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 ff2058cfcbacdd73e1463b09361344fa0f32b744..1f955e63446a8e819ab9a70057f9722ac06f222a 100644 (file)
--- 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)
                 {