2003-06-11 Jeff Johnston <jjohnstn@redhat.com>

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

diff --git a/bfd/elf32-i960.c b/bfd/elf32-i960.c
index 839fc3d892af0a1f7508fd5c8135f98bc3b52290..4a1e931f29337fd5d6f52086c8ac0355610f5ab5 100644 (file)
--- a/bfd/elf32-i960.c
+++ b/bfd/elf32-i960.c
@@ -1,5 +1,5 @@
 /* Intel 860 specific support for 32-bit ELF
-   Copyright 1999 Free Software Foundation, Inc.
+   Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -27,6 +27,10 @@ static bfd_reloc_status_type elf32_i960_relocate
   PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 static reloc_howto_type *elf32_i960_reloc_type_lookup
   PARAMS ((bfd *, bfd_reloc_code_real_type));
+static void elf32_i960_info_to_howto
+  PARAMS ((bfd *, arelent *cache_ptr, Elf_Internal_Rela *));
+static void elf32_i960_info_to_howto_rel
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
 
 #define USE_REL 1
 
@@ -36,16 +40,16 @@ static reloc_howto_type *elf32_i960_reloc_type_lookup
 
 static reloc_howto_type elf_howto_table[]=
 {
-  HOWTO(R_960_NONE, 0, 0, 0, false, 0, complain_overflow_bitfield,
-       elf32_i960_relocate, "R_960_NONE", true,
-       0x00000000, 0x00000000, false),
+  HOWTO(R_960_NONE, 0, 0, 0, FALSE, 0, complain_overflow_bitfield,
+       elf32_i960_relocate, "R_960_NONE", TRUE,
+       0x00000000, 0x00000000, FALSE),
   EMPTY_HOWTO (1),
-  HOWTO (R_960_32, 0, 2, 32, false, 0, complain_overflow_bitfield,
-       elf32_i960_relocate, "R_960_32", true,
-       0xffffffff, 0xffffffff, false),
-  HOWTO (R_960_IP24, 0, 2, 24, true, 0, complain_overflow_signed,
-       elf32_i960_relocate, "R_960_IP24 ", true,
-       0x00ffffff, 0x00ffffff, false),
+  HOWTO (R_960_32, 0, 2, 32, FALSE, 0, complain_overflow_bitfield,
+       elf32_i960_relocate, "R_960_32", TRUE,
+       0xffffffff, 0xffffffff, FALSE),
+  HOWTO (R_960_IP24, 0, 2, 24, TRUE, 0, complain_overflow_signed,
+       elf32_i960_relocate, "R_960_IP24 ", TRUE,
+       0x00ffffff, 0x00ffffff, FALSE),
   EMPTY_HOWTO (4),
   EMPTY_HOWTO (5),
   EMPTY_HOWTO (6),
@@ -73,7 +77,7 @@ static void
 elf32_i960_info_to_howto (abfd, cache_ptr, dst)
      bfd               *abfd ATTRIBUTE_UNUSED;
      arelent           *cache_ptr ATTRIBUTE_UNUSED;
-     Elf32_Internal_Rela *dst ATTRIBUTE_UNUSED;
+     Elf_Internal_Rela *dst ATTRIBUTE_UNUSED;
 {
   abort ();
 }
@@ -82,7 +86,7 @@ static void
 elf32_i960_info_to_howto_rel (abfd, cache_ptr, dst)
      bfd *abfd ATTRIBUTE_UNUSED;
      arelent *cache_ptr;
-     Elf32_Internal_Rel *dst;
+     Elf_Internal_Rela *dst;
 {
   enum elf_i960_reloc_type type;
 
@@ -102,7 +106,6 @@ elf32_i960_info_to_howto_rel (abfd, cache_ptr, dst)
    function.  It just short circuits the reloc if producing
    relocateable output against an external symbol.  */
 
-/*ARGSUSED*/
 bfd_reloc_status_type
 elf32_i960_relocate (abfd,
                       reloc_entry,
@@ -129,7 +132,7 @@ elf32_i960_relocate (abfd,
     {
       reloc_entry->addend -= symbol->value;
     }
-  /* This is more dubious. */
+  /* This is more dubious.  */
   else if (output_bfd != (bfd *) NULL
           && (symbol->flags & BSF_SECTION_SYM) != 0)
     {