Check the correct arch_info object's mach field: all PowerPC machines are

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

diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c
index 7a39f4778efd2b71f0dee9c2b1e4d81ee2c220b5..b1ad74486f43524ad92c7aeb229a17c3707d0dee 100644 (file)
--- a/bfd/elf32-gen.c
+++ b/bfd/elf32-gen.c
@@ -1,5 +1,6 @@
 /* Generic support for 32-bit ELF
-   Copyright 1993, 1995, 1998, 1999 Free Software Foundation, Inc.
+   Copyright 1993, 1995, 1998, 1999, 2001, 2002
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -30,21 +31,28 @@ static reloc_howto_type dummy =
         0,                     /* rightshift */
         0,                     /* size (0 = byte, 1 = short, 2 = long) */
         0,                     /* bitsize */
-        false,                 /* pc_relative */
+        FALSE,                 /* pc_relative */
         0,                     /* bitpos */
         complain_overflow_dont, /* complain_on_overflow */
         NULL,                  /* special_function */
         "UNKNOWN",             /* name */
-        false,                 /* partial_inplace */
+        FALSE,                 /* partial_inplace */
         0,                     /* src_mask */
         0,                     /* dst_mask */
-        false);                /* pcrel_offset */
+        FALSE);                /* pcrel_offset */
+
+static void elf_generic_info_to_howto
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static void elf_generic_info_to_howto_rel
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static bfd_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;
      arelent *bfd_reloc;
-     Elf32_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED;
+     Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED;
 {
   bfd_reloc->howto = &dummy;
 }
@@ -53,12 +61,12 @@ static void
 elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
      bfd *abfd ATTRIBUTE_UNUSED;
      arelent *bfd_reloc;
-     Elf32_Internal_Rel *elf_reloc ATTRIBUTE_UNUSED;
+     Elf_Internal_Rela *elf_reloc ATTRIBUTE_UNUSED;
 {
   bfd_reloc->howto = &dummy;
 }
 
-static boolean 
+static bfd_boolean
 elf32_generic_link_add_symbols (abfd, info)
      bfd *abfd;
      struct bfd_link_info *info;
@@ -72,18 +80,12 @@ 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;
+       return FALSE;
       }
 
   return bfd_elf32_bfd_link_add_symbols (abfd, info);