* elf32-i386 (elf_i386_adjust_dynamic_symbol): Do not replace PLT32

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

diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c
index bbef97a0c0fdff71ad212f902525c040b2904e2d..58b5fc6273caee252234a7022ac1e6df99aaee1b 100644 (file)
--- a/bfd/elf32-gen.c
+++ b/bfd/elf32-gen.c
@@ -65,7 +65,7 @@ elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
   bfd_reloc->howto = &dummy;
 }
 
-static boolean 
+static boolean
 elf32_generic_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -79,15 +79,9 @@ elf32_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;