From: Ian Lance Taylor <ian@airs.com>
Date: Mon, 23 Mar 2009 21:15:08 +0000 (+0000)
Subject: 	* merge.cc (do_add_input_section): Correct pend value.  Change
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cb010894ee1a20c856455954d294401efd4d8e74;p=binutils-gdb.git

	* merge.cc (do_add_input_section): Correct pend value.  Change
	message about last entry not being null terminated from error to
	warning.
---

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 1297e19e028..1ccb0eb969a 100644
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-23  Ian Lance Taylor  <iant@google.com>
+
+	* merge.cc (do_add_input_section): Correct pend value.  Change
+	message about last entry not being null terminated from error to
+	warning.
+
 2009-03-20  Mikolaj Zalewski  <mikolajz@google.com>
 
 	* incremental.cc: New file.
diff --git a/gold/merge.cc b/gold/merge.cc
index 1369938a557..25ecc40c0e1 100644
--- a/gold/merge.cc
+++ b/gold/merge.cc
@@ -465,7 +465,7 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
   const unsigned char* pdata = object->section_contents(shndx, &len, false);
 
   const Char_type* p = reinterpret_cast<const Char_type*>(pdata);
-  const Char_type* pend = p + len;
+  const Char_type* pend = p + len / sizeof(Char_type);
 
   if (len % sizeof(Char_type) != 0)
     {
@@ -485,8 +485,10 @@ Output_merge_string<Char_type>::do_add_input_section(Relobj* object,
 	{
 	  if (pl >= pend)
 	    {
-	      object->error(_("entry in mergeable string section "
-			      "not null terminated"));
+	      gold_warning(_("%s: last entry in mergeable string section '%s' "
+			     "not null terminated"),
+			   object->name().c_str(),
+			   object->section_name(shndx).c_str());
 	      break;
 	    }
 	}