This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb] Fixes a problem with the RX port trying to perform linker relaxation when -no-keep-memory has been e
- From: Nick Clifton <nickc at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 16 Mar 2015 11:14:59 -0000
- Subject: [binutils-gdb] Fixes a problem with the RX port trying to perform linker relaxation when -no-keep-memory has been e
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=9c761a554184c2ded303c4929a7023b972b2fb9f
commit 9c761a554184c2ded303c4929a7023b972b2fb9f
Author: Nick Clifton <nickc@redhat.com>
Date: Mon Mar 16 11:14:07 2015 +0000
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.
Diff:
---
bfd/ChangeLog | 6 ++++++
bfd/elf32-rx.c | 14 +++++++++++++-
2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 06f13b2..b24c72d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -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
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 5d35d2a..b8c632e 100644
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -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