Changeset 609 for branches/GNU/src/binutils/bfd/elf32-gen.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/elf32-gen.c (modified) (5 diffs, 1 prop)

branches/GNU/src/binutils/bfd/elf32-gen.c

@@ -1 +1 @@
 /* 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.
@@ -31 +32 @@
          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
@@ -45 +53 @@
      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;
@@ -54 +62 @@
      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;
@@ -73 +81 @@
 
         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;
       }