Fix segfault in microblaze linker when garbage collection removes a symbol scheduled...

	PR ld/21180
	* elf32-microblaze.c (microblaze_elf_finish_dynamic_symbol): Avoid
	generating a seg-fault when encountering a symbol that has been
	deleted by garbage collection.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1118c19e01926d2afd37ae303fc7c7ee8b60af0d..0f8d9eec6faaf0cc60631fd000e0f086f582c6fd 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2017-02-27  Nick Clifton  <nickc@redhat.com>
+
+       PR ld/21180
+       * elf32-microblaze.c (microblaze_elf_finish_dynamic_symbol): Avoid
+       generating a seg-fault when encountering a symbol that has been
+       deleted by garbage collection.
+
 2017-02-25  Alan Modra  <amodra@gmail.com>
 
        * elf32-arc.c (struct dynamic_sections): Delete.

diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c
index 70613284cd95433ca735c68df4b6b601117b7f4a..27118c1ef070a76114b7c37dfc98836baf625cca 100644 (file)
--- a/bfd/elf32-microblaze.c
+++ b/bfd/elf32-microblaze.c
@@ -3234,13 +3234,20 @@ microblaze_elf_finish_dynamic_symbol (bfd *output_bfd,
              || h->dynindx == -1))
         {
           asection *sec = h->root.u.def.section;
+         bfd_vma value;
+
+         value = h->root.u.def.value;
+         if (sec->output_section != NULL)
+           /* PR 21180: If the output section is NULL, then the symbol is no
+              longer needed, and in theory the GOT entry is redundant.  But
+              it is too late to change our minds now...  */
+           value += sec->output_section->vma + sec->output_offset;
+
           microblaze_elf_output_dynamic_relocation (output_bfd,
                                                     srela, srela->reloc_count++,
                                                     /* symindex= */ 0,
                                                     R_MICROBLAZE_REL, offset,
-                                                    h->root.u.def.value
-                                                    + sec->output_section->vma
-                                                    + sec->output_offset);
+                                                    value);
         }
       else
         {