提交: 2bc56d66132a8d4a06520b0531b8708108197c9b - binutils_os216 (git)

GNU Binutils with patches for OS216

Commit MetaInfo

• 修订版: 2bc56d66132a8d4a06520b0531b8708108197c9b (tree)
• 时间: 2013-11-06 12:13:04
• 作者: DJ Delorie <dj@redh...>
• Commiter: DJ Delorie

Log Message

* elf32-rl78.c (elf32_rl78_relax_delete_bytes): Make sure relocs
are loaded before trying to use them.

更改概述

• modified: bfd/ChangeLog
• modified: bfd/elf32-rl78.c

差异

--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
[phone]  DJ Delorie  <[e-mail]>
+
+	* elf32-rl78.c (elf32_rl78_relax_delete_bytes): Make sure relocs
+	are loaded before trying to use them.
+
 2013-11-05  H.J. Lu  <[e-mail]>
 	    Bernhard Rosenkränzer <[e-mail]>
 

--- 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