darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
message about last entry not being null terminated from error to
	warning.
This commit is contained in:
Ian Lance Taylor 2009-03-23 21:15:08 +00:00
parent 9c482037a9
commit cb010894ee
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gold/ChangeLog
View file

@ -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.

8
gold/merge.cc
View file

@ -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;
}
}