* merge.cc (do_add_input_section): Correct pend value. Change

message about last entry not being null terminated from error to warning.
xdje42 · Mar 23, 2009 · cb01089 · cb01089
1 parent 9c48203
commit cb01089
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/gold/ChangeLog b/gold/ChangeLog
@@ -1,3 +1,9 @@
+2009-03-23  Ian Lance Taylor  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* incremental.cc: New file.

diff --git 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;
 	    }
 	}