* elflink.h (elf_link_output_extsym): Don't output symbols from

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

diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c
index 7a39f4778efd2b71f0dee9c2b1e4d81ee2c220b5..58b5fc6273caee252234a7022ac1e6df99aaee1b 100644 (file)
--- a/bfd/elf32-gen.c
+++ b/bfd/elf32-gen.c
@@ -1,5 +1,5 @@
 /* Generic support for 32-bit ELF
-   Copyright 1993, 1995, 1998, 1999 Free Software Foundation, Inc.
+   Copyright 1993, 1995, 1998, 1999, 2001 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -40,6 +40,13 @@ static reloc_howto_type dummy =
         0,                     /* dst_mask */
         false);                /* pcrel_offset */
 
+static void elf_generic_info_to_howto
+  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
+static void elf_generic_info_to_howto_rel
+  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
+static boolean elf32_generic_link_add_symbols
+  PARAMS ((bfd *, struct bfd_link_info *));
+
 static void
 elf_generic_info_to_howto (abfd, bfd_reloc, elf_reloc)
      bfd *abfd ATTRIBUTE_UNUSED;
@@ -58,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;
@@ -72,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;