From 2bc56d66132a8d4a06520b0531b8708108197c9b Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 5 Nov 2013 22:13:04 -0500 Subject: [PATCH] * elf32-rl78.c (elf32_rl78_relax_delete_bytes): Make sure relocs are loaded before trying to use them. --- bfd/ChangeLog | 5 +++++ bfd/elf32-rl78.c | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 806519306b..948afdac41 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2013-11-05 DJ Delorie + + * elf32-rl78.c (elf32_rl78_relax_delete_bytes): Make sure relocs + are loaded before trying to use them. + 2013-11-05 H.J. Lu Bernhard Rosenkränzer diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c index 9060663490..5bdef67545 100644 --- a/bfd/elf32-rl78.c +++ b/bfd/elf32-rl78.c @@ -1481,6 +1481,12 @@ elf32_rl78_relax_delete_bytes (bfd *abfd, asection *sec, bfd_vma addr, int count toaddr = alignment_rel->r_offset; irel = elf_section_data (sec)->relocs; + if (irel == NULL) + { + _bfd_elf_link_read_relocs (sec->owner, sec, NULL, NULL, TRUE); + irel = elf_section_data (sec)->relocs; + } + irelend = irel + sec->reloc_count; /* Actually delete the bytes. */ @@ -1496,7 +1502,7 @@ elf32_rl78_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 && irel < irelend; irel++) { /* Get the new reloc address. */ if (irel->r_offset > addr -- 2.34.1