* elf32-rl78.c (elf32_rl78_relax_delete_bytes): Make sure relocs

are loaded before trying to use them.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 806519306bc441aa49b461a5dac0884cb3963766..948afdac414c57a30df981a558eb9f54219710ce 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-05  DJ Delorie  <dj@redhat.com>
+
+       * elf32-rl78.c (elf32_rl78_relax_delete_bytes): Make sure relocs
+       are loaded before trying to use them.
+
 2013-11-05  H.J. Lu  <hongjiu.lu@intel.com>
            Bernhard Rosenkränzer <bernhard.rosenkranzer@linaro.org>
 

diff --git a/bfd/elf32-rl78.c b/bfd/elf32-rl78.c
index 9060663490c83ddded38c6b5615fc8662d936722..5bdef6754538b96824e2037994efbed6777b9968 100644 (file)
--- 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