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

Fixes a problem with the RX port trying to perform linker relaxation when -no-keep-memory has been enabled. 

* elf32-rx.c (elf32_rx_relax_delete_bytes): If the relocs are not
	stored in the elf_section_data structure then load them as
	necessary.
This commit is contained in:
Nick Clifton 2015-03-16 11:14:07 +00:00
parent ba14f9419d
commit 9c761a5541
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bfd/ChangeLog
View File

@ -1,3 +1,9 @@
2015-03-16 Nick Clifton <nickc@redhat.com>
* elf32-rx.c (elf32_rx_relax_delete_bytes): If the relocs are not
stored in the elf_section_data structure then load them as
necessary.
2015-03-14 Andreas Krebbel <krebbel@linux.vnet.ibm.com>
* elf-s390-common.c (elf_s390_elf_sort_relocs_p): Don't sort

14
bfd/elf32-rx.c
View File

@ -1561,6 +1561,18 @@ elf32_rx_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count,
irel = elf_section_data (sec)->relocs;
irelend = irel + sec->reloc_count;
if (irel == NULL && sec->reloc_count > 0)
{
/* If the relocs have not been kept in the section data
structure (because -no-keep-memory was used) then
reread them now. */
irel = (_bfd_elf_link_read_relocs
(abfd, sec, NULL, (Elf_Internal_Rela *) NULL, FALSE));
if (irel == NULL)
/* FIXME: Return FALSE instead ? */
irelend = irel;
}
/* Actually delete the bytes. */
memmove (contents + addr, contents + addr + count,
(size_t) (toaddr - addr - count));
@ -1574,7 +1586,7 @@ elf32_rx_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count,
memset (contents + toaddr - count, 0x03, count);
/* Adjust all the relocs. */
for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
for (; irel < irelend; irel++)
{
/* Get the new reloc address. */
if (irel->r_offset > addr