OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge_gnu_build_notes reloc deletion 

If moving relocs, the next reloc to look at is at the same location.

	* objcopy.c (merge_gnu_build_notes): Correct code deleting
	relocs.
This commit is contained in:
Alan Modra 2017-05-01 14:11:27 +09:30
parent 6224c85813
commit ee7e95efb9
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
binutils/ChangeLog
View File

@ -1,3 +1,8 @@
2017-05-01 Alan Modra <amodra@gmail.com>
* objcopy.c (merge_gnu_build_notes): Correct code deleting
relocs.
2017-04-28 Nick Clifton <nickc@redhat.com>
PR binutils/21439

13
binutils/objcopy.c
View File

@ -2185,15 +2185,18 @@ merge_gnu_build_notes (bfd * abfd, asection * sec, bfd_size_type size, bfd_byte
if (relcount > 0)
{
arelent ** rel;
arelent **rel = relpp;
for (rel = relpp; rel < relpp + relcount; rel ++)
if ((* rel)->howto == NULL)
while (rel < relpp + relcount)
if ((*rel)->howto != NULL)
rel++;
else
{
/* Delete eliminated relocs.
FIXME: There are better ways to do this. */
memmove (rel, rel + 1, ((relcount - (rel - relpp)) - 1) * sizeof (* rel));
relcount --;
memmove (rel, rel + 1,
((relcount - (rel - relpp)) - 1) * sizeof (*rel));
relcount--;
}
bfd_set_reloc (abfd, sec, relpp, relcount);
}