* elflink.h (elf_bfd_discard_info): Fix segfault when dynobj NULL.

[deliverable/binutils-gdb.git] / bfd / elf64-gen.c

diff --git a/bfd/elf64-gen.c b/bfd/elf64-gen.c
index c3bfa9c714091a91f26205fbf297f8d180e299e2..a58f6ac60c741b291d52efccda1197bd39f01381 100644 (file)
--- a/bfd/elf64-gen.c
+++ b/bfd/elf64-gen.c
@@ -79,15 +79,9 @@ elf64_generic_link_add_symbols (abfd, info)
        Elf_Internal_Ehdr *ehdrp;
 
        ehdrp = elf_elfheader (abfd);
-       if (abfd->my_archive)
-         (*_bfd_error_handler) (_("%s(%s): Relocations in generic ELF (EM: %d)"),
-                                bfd_get_filename (abfd->my_archive),
-                                bfd_get_filename (abfd),
-                                ehdrp->e_machine);
-       else
-         (*_bfd_error_handler) (_("%s: Relocations in generic ELF (EM: %d)"),
-                                bfd_get_filename (abfd),
-                                ehdrp->e_machine);
+       (*_bfd_error_handler) (_("%s: Relocations in generic ELF (EM: %d)"),
+                              bfd_archive_filename (abfd),
+                              ehdrp->e_machine);
 
        bfd_set_error (bfd_error_wrong_format);
        return false;