2004-05-28 H.J. Lu <hongjiu.lu@intel.com>

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

diff --git a/bfd/elf32-i960.c b/bfd/elf32-i960.c
index 2cab7c02b5ec5a602defe29534435503c45cb210..99e5585fdd9bfb404b3882fd762e5ee3e3b38be8 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, 2000 Free Software Foundation, Inc.
+/* Intel 960 specific support for 32-bit ELF
+   Copyright 1999, 2000, 2001, 2002, 2003 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;
 
@@ -92,7 +96,7 @@ elf32_i960_info_to_howto_rel (abfd, cache_ptr, dst)
   cache_ptr->howto = &elf_howto_table[(int) type];
 }
 
-/* ELF relocs are against symbols.  If we are producing relocateable
+/* ELF relocs are against symbols.  If we are producing relocatable
    output, and the reloc is against an external symbol, and nothing
    has given us any additional addend, the resulting reloc will also
    be against the same symbol.  In such a case, we don't want to
@@ -100,16 +104,11 @@ elf32_i960_info_to_howto_rel (abfd, cache_ptr, dst)
    all be done at final link time.  Rather than put special case code
    into bfd_perform_relocation, all the reloc types use this howto
    function.  It just short circuits the reloc if producing
-   relocateable output against an external symbol.  */
+   relocatable output against an external symbol.  */
 
 bfd_reloc_status_type
-elf32_i960_relocate (abfd,
-                      reloc_entry,
-                      symbol,
-                      data,
-                      input_section,
-                      output_bfd,
-                      error_message)
+elf32_i960_relocate (abfd, reloc_entry, symbol, data, input_section,
+                    output_bfd, error_message)
      bfd *abfd ATTRIBUTE_UNUSED;
      arelent *reloc_entry;
      asymbol *symbol;