Changeset 609 for branches/GNU/src/binutils/bfd/elf32-arc.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-arc.c (modified) (11 diffs, 1 prop)

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

@@ -1 +1 @@
 /* ARC-specific support for 32-bit ELF
-   Copyright 1994, 1995, 1997, 1999, 2001 Free Software Foundation, Inc.
+   Copyright 1994, 1995, 1997, 1999, 2001, 2002
+   Free Software Foundation, Inc.
    Contributed by Doug Evans (dje@cygnus.com).
 
@@ -24 +25 @@
 #include "elf-bfd.h"
 #include "elf/arc.h"
+#include "libiberty.h"
 
 static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
   PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
 static void arc_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
-static boolean arc_elf_object_p
+  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
+static bfd_boolean arc_elf_object_p
   PARAMS ((bfd *));
 static void arc_elf_final_write_processing
-  PARAMS ((bfd *, boolean));
+  PARAMS ((bfd *, bfd_boolean));
+static bfd_reloc_status_type arc_elf_b22_pcrel
+  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
 
 /* Try to minimize the amount of space occupied by relocation tables
    on the ROM (not that the ROM won't be swamped by other ELF overhead).  */
 
-#define USE_REL
+#define USE_REL 1
 
 static reloc_howto_type elf_arc_howto_table[] =
@@ -46 +50 @@
          2,                     /* size (0 = byte, 1 = short, 2 = long)  */
          32,                    /* bitsize  */
-         false,                 /* pc_relative  */
+         FALSE,                 /* pc_relative  */
          0,                     /* bitpos  */
          complain_overflow_bitfield, /* complain_on_overflow  */
          bfd_elf_generic_reloc, /* special_function  */
          "R_ARC_NONE",          /* name  */
-         false,                 /* partial_inplace  */
+         TRUE,                  /* partial_inplace  */
          0,                     /* src_mask  */
          0,                     /* dst_mask  */
-         false),                /* pcrel_offset  */
+         FALSE),                /* pcrel_offset  */
 
   /* A standard 32 bit relocation.  */
@@ -61 +65 @@
          2,                     /* size (0 = byte, 1 = short, 2 = long)  */
          32,                    /* bitsize  */
-         false,                 /* pc_relative  */
+         FALSE,                 /* pc_relative  */
          0,                     /* bitpos  */
          complain_overflow_bitfield, /* complain_on_overflow  */
          bfd_elf_generic_reloc, /* special_function  */
          "R_ARC_32",            /* name  */
-         false,                 /* partial_inplace  */
+         TRUE,                  /* partial_inplace  */
          0xffffffff,            /* src_mask  */
          0xffffffff,            /* dst_mask  */
-         false),                /* pcrel_offset  */
+         FALSE),                /* pcrel_offset  */
 
   /* A 26 bit absolute branch, right shifted by 2.  */
@@ -76 +80 @@
          2,                     /* size (0 = byte, 1 = short, 2 = long)  */
          26,                    /* bitsize  */
-         false,                 /* pc_relative  */
+         FALSE,                 /* pc_relative  */
          0,                     /* bitpos  */
          complain_overflow_bitfield, /* complain_on_overflow  */
          bfd_elf_generic_reloc, /* special_function  */
          "R_ARC_B26",           /* name  */
-         false,                 /* partial_inplace  */
+         TRUE,                  /* partial_inplace  */
          0x00ffffff,            /* src_mask  */
          0x00ffffff,            /* dst_mask  */
-         false),                /* pcrel_offset  */
+         FALSE),                /* pcrel_offset  */
 
   /* A relative 22 bit branch; bits 21-2 are stored in bits 26-7.  */
@@ -91 +95 @@
          2,                     /* size (0 = byte, 1 = short, 2 = long)  */
          22,                    /* bitsize  */
-         true,                  /* pc_relative  */
+         TRUE,                  /* pc_relative  */
          7,                     /* bitpos  */
          complain_overflow_signed, /* complain_on_overflow  */
-         bfd_elf_generic_reloc, /* special_function  */
+         arc_elf_b22_pcrel,     /* special_function  */
          "R_ARC_B22_PCREL",     /* name  */
-         false,                 /* partial_inplace  */
+         TRUE,                  /* partial_inplace  */
          0x07ffff80,            /* src_mask  */
          0x07ffff80,            /* dst_mask  */
-         true),                 /* pcrel_offset  */
-
+         FALSE),                /* pcrel_offset  */
 };
 
@@ -127 +130 @@
   unsigned int i;
 
-  for (i = 0; i < sizeof (arc_reloc_map) / sizeof (struct arc_reloc_map); i++)
-    {
-      if (arc_reloc_map[i].bfd_reloc_val == code)
-        return &elf_arc_howto_table[arc_reloc_map[i].elf_reloc_val];
-    }
+  for (i = ARRAY_SIZE (arc_reloc_map); i--;)
+    if (arc_reloc_map[i].bfd_reloc_val == code)
+      return elf_arc_howto_table + arc_reloc_map[i].elf_reloc_val;
+
   return NULL;
 }
@@ -141 +143 @@
      bfd *abfd ATTRIBUTE_UNUSED;
      arelent *cache_ptr;
-     Elf32_Internal_Rel *dst;
+     Elf_Internal_Rela *dst;
 {
   unsigned int r_type;
@@ -152 +154 @@
 /* Set the right machine number for an ARC ELF file.  */
 
-static boolean
+static bfd_boolean
 arc_elf_object_p (abfd)
      bfd *abfd;
 {
-  int mach = bfd_mach_arc_6;
+  unsigned int mach = bfd_mach_arc_6;
 
   if (elf_elfheader(abfd)->e_machine == EM_ARC)
@@ -188 +190 @@
 arc_elf_final_write_processing (abfd, linker)
      bfd *abfd;
-     boolean linker ATTRIBUTE_UNUSED;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
 {
   unsigned long val;
@@ -208 +210 @@
       break;
     }
-  elf_elfheader (abfd)->e_machine = EM_ARC;
   elf_elfheader (abfd)->e_flags &=~ EF_ARC_MACH;
   elf_elfheader (abfd)->e_flags |= val;
+}
+
+bfd_reloc_status_type
+arc_elf_b22_pcrel (abfd, reloc_entry, symbol, data, input_section,
+                   output_bfd, error_message)
+     bfd * abfd;
+     arelent * reloc_entry;
+     asymbol * symbol;
+     PTR data;
+     asection * input_section;
+     bfd * output_bfd;
+     char ** error_message;
+{
+  /* If linking, back up the final symbol address by the address of the
+     reloc.  This cannot be accomplished by setting the pcrel_offset
+     field to TRUE, as bfd_install_relocation will detect this and refuse
+     to install the offset in the first place, but bfd_perform_relocation
+     will still insist on removing it.  */
+  if (output_bfd == (bfd *) NULL)
+    reloc_entry->addend -= reloc_entry->address;
+
+  /* Fall through to the default elf reloc handler.  */
+  return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
+                                input_section, output_bfd, error_message);
 }