Replace bfd_get_filename with bfd_archive_filename in error message.

[deliverable/binutils-gdb.git] / bfd / elf32-arm.h

diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 52dc7563c401cfb4668150aadc3687409910c755..5e818eb29528487662de58b77d9a8586f5823dc6 100644 (file)
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -1,5 +1,5 @@
 /* 32-bit ELF support for ARM
 /* 32-bit ELF support for ARM

-   Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 


@@ -35,13 +35,13 @@ static struct bfd_link_hash_table *elf32_arm_link_hash_table_create
 static bfd_reloc_status_type elf32_arm_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *,
           Elf_Internal_Rela *, bfd_vma, struct bfd_link_info *, asection *,
 static bfd_reloc_status_type elf32_arm_final_link_relocate
   PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *,
           Elf_Internal_Rela *, bfd_vma, struct bfd_link_info *, asection *,

-          const char *, unsigned char, struct elf_link_hash_entry *));
+          const char *, int, struct elf_link_hash_entry *));

 static insn32 insert_thumb_branch
   PARAMS ((insn32, int));
 static struct elf_link_hash_entry *find_thumb_glue
 static insn32 insert_thumb_branch
   PARAMS ((insn32, int));
 static struct elf_link_hash_entry *find_thumb_glue

-  PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
+  PARAMS ((struct bfd_link_info *, const char *, bfd *));

 static struct elf_link_hash_entry *find_arm_glue
 static struct elf_link_hash_entry *find_arm_glue

-  PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
+  PARAMS ((struct bfd_link_info *, const char *, bfd *));

 static void record_arm_to_thumb_glue
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 static void record_thumb_to_arm_glue
 static void record_arm_to_thumb_glue
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
 static void record_thumb_to_arm_glue


@@ -54,8 +54,47 @@ static int elf32_arm_to_thumb_stub
 static int elf32_thumb_to_arm_stub
   PARAMS ((struct bfd_link_info *, const char *, bfd *, bfd *, asection *,
           bfd_byte *, asection *, bfd_vma, bfd_signed_vma, bfd_vma));
 static int elf32_thumb_to_arm_stub
   PARAMS ((struct bfd_link_info *, const char *, bfd *, bfd *, asection *,
           bfd_byte *, asection *, bfd_vma, bfd_signed_vma, bfd_vma));

+static boolean elf32_arm_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+          Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
+static asection * elf32_arm_gc_mark_hook
+  PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Rela *,
+          struct elf_link_hash_entry *, Elf_Internal_Sym *));
+static boolean elf32_arm_gc_sweep_hook
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+          const Elf_Internal_Rela *));
+static boolean elf32_arm_check_relocs
+  PARAMS ((bfd *, struct bfd_link_info *, asection *,
+          const Elf_Internal_Rela *));
+static boolean elf32_arm_find_nearest_line
+  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
+          const char **, unsigned int *));
+static boolean elf32_arm_adjust_dynamic_symbol
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static boolean elf32_arm_size_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static boolean elf32_arm_finish_dynamic_symbol
+  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
+          Elf_Internal_Sym *));
+static boolean elf32_arm_finish_dynamic_sections
+  PARAMS ((bfd *, struct bfd_link_info *));
+static struct bfd_hash_entry * elf32_arm_link_hash_newfunc
+  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
+#ifdef USE_REL
+static void arm_add_to_rel
+  PARAMS ((bfd *, bfd_byte *, reloc_howto_type *, bfd_signed_vma));
+#endif
+
+boolean bfd_elf32_arm_allocate_interworking_sections
+  PARAMS ((struct bfd_link_info *));
+boolean bfd_elf32_arm_get_bfd_for_interworking
+  PARAMS ((bfd *, struct bfd_link_info *));
+boolean bfd_elf32_arm_process_before_allocation
+  PARAMS ((bfd *, struct bfd_link_info *, int));
+static enum elf_reloc_type_class elf32_arm_reloc_type_class
+  PARAMS ((const Elf_Internal_Rela *));

 
 

-#define INTERWORK_FLAG(abfd)   (elf_elfheader (abfd)->e_flags & EF_INTERWORK)
+#define INTERWORK_FLAG(abfd)   (elf_elfheader (abfd)->e_flags & EF_ARM_INTERWORK)

 
 /* The linker script knows the section names for placement.
    The entry_names are used to do simple name mangling on the stubs.
 
 /* The linker script knows the section names for placement.
    The entry_names are used to do simple name mangling on the stubs.


@@ -78,23 +117,23 @@ static int elf32_thumb_to_arm_stub
    this.  It is set up so that any shared library function that is
    called before the relocation has been set up calls the dynamic
    linker first.  */
    this.  It is set up so that any shared library function that is
    called before the relocation has been set up calls the dynamic
    linker first.  */

-static const bfd_byte elf32_arm_plt0_entry [PLT_ENTRY_SIZE] =
-{
-  0x04, 0xe0, 0x2d, 0xe5,      /* str   lr, [sp, #-4]!     */
-  0x10, 0xe0, 0x9f, 0xe5,      /* ldr   lr, [pc, #16]      */
-  0x0e, 0xe0, 0x8f, 0xe0,      /* adr   lr, pc, lr         */
-  0x08, 0xf0, 0xbe, 0xe5       /* ldr   pc, [lr, #8]!      */
-};
+static const bfd_vma elf32_arm_plt0_entry [PLT_ENTRY_SIZE / 4] =
+  {
+    0xe52de004,        /* str   lr, [sp, #-4]!     */
+    0xe59fe010,        /* ldr   lr, [pc, #16]      */
+    0xe08fe00e,        /* add   lr, pc, lr         */
+    0xe5bef008 /* ldr   pc, [lr, #8]!      */
+  };

 
 /* Subsequent entries in a procedure linkage table look like
    this.  */
 
 /* Subsequent entries in a procedure linkage table look like
    this.  */

-static const bfd_byte elf32_arm_plt_entry [PLT_ENTRY_SIZE] =
-{
-  0x04, 0xc0, 0x9f, 0xe5,      /* ldr   ip, [pc, #4]       */
-  0x0c, 0xc0, 0x8f, 0xe0,      /* add   ip, pc, ip         */
-  0x00, 0xf0, 0x9c, 0xe5,      /* ldr   pc, [ip]           */
-  0x00, 0x00, 0x00, 0x00        /* offset to symbol in got  */
-};
+static const bfd_vma elf32_arm_plt_entry [PLT_ENTRY_SIZE / 4] =
+ {
+   0xe59fc004, /* ldr   ip, [pc, #4]       */
+   0xe08fc00c, /* add   ip, pc, ip         */
+   0xe59cf000, /* ldr   pc, [ip]           */
+   0x00000000  /* offset to symbol in got  */
+ };

 
 /* The ARM linker needs to keep track of the number of relocs that it
    decides to copy in check_relocs for each symbol.  This is so that
 
 /* The ARM linker needs to keep track of the number of relocs that it
    decides to copy in check_relocs for each symbol.  This is so that


@@ -105,23 +144,23 @@ static const bfd_byte elf32_arm_plt_entry [PLT_ENTRY_SIZE] =
 /* This structure keeps track of the number of PC relative relocs we
    have copied for a given symbol.  */
 struct elf32_arm_pcrel_relocs_copied
 /* This structure keeps track of the number of PC relative relocs we
    have copied for a given symbol.  */
 struct elf32_arm_pcrel_relocs_copied

-{
-  /* Next section.  */
-  struct elf32_arm_pcrel_relocs_copied * next;
-  /* A section in dynobj.  */
-  asection * section;
-  /* Number of relocs copied in this section.  */
-  bfd_size_type count;
-};
+  {
+    /* Next section.  */
+    struct elf32_arm_pcrel_relocs_copied * next;
+    /* A section in dynobj.  */
+    asection * section;
+    /* Number of relocs copied in this section.  */
+    bfd_size_type count;
+  };

 
 /* Arm ELF linker hash entry.  */
 struct elf32_arm_link_hash_entry
 
 /* Arm ELF linker hash entry.  */
 struct elf32_arm_link_hash_entry

-{
-  struct elf_link_hash_entry root;
+  {
+    struct elf_link_hash_entry root;

 
 

-  /* Number of PC relative relocs copied for this symbol.  */
-  struct elf32_arm_pcrel_relocs_copied * pcrel_relocs_copied;
-};
+    /* Number of PC relative relocs copied for this symbol.  */
+    struct elf32_arm_pcrel_relocs_copied * pcrel_relocs_copied;
+  };

 
 /* Declare this now that the above structures are defined.  */
 static boolean elf32_arm_discard_copies
 
 /* Declare this now that the above structures are defined.  */
 static boolean elf32_arm_discard_copies


@@ -140,23 +179,23 @@ static boolean elf32_arm_discard_copies
 
 /* ARM ELF linker hash table.  */
 struct elf32_arm_link_hash_table
 
 /* ARM ELF linker hash table.  */
 struct elf32_arm_link_hash_table

-{
-  /* The main hash table.  */
-  struct elf_link_hash_table root;
+  {
+    /* The main hash table.  */
+    struct elf_link_hash_table root;

 
 

-  /* The size in bytes of the section containg the Thumb-to-ARM glue.  */
-  long int thumb_glue_size;
+    /* The size in bytes of the section containg the Thumb-to-ARM glue.  */
+    bfd_size_type thumb_glue_size;

 
 

-  /* The size in bytes of the section containg the ARM-to-Thumb glue.  */
-  long int arm_glue_size;
+    /* The size in bytes of the section containg the ARM-to-Thumb glue.  */
+    bfd_size_type arm_glue_size;

 
 

-  /* An arbitary input BFD chosen to hold the glue sections.  */
-  bfd * bfd_of_glue_owner;
+    /* An arbitary input BFD chosen to hold the glue sections.  */
+    bfd * bfd_of_glue_owner;

 
 

-  /* A boolean indicating whether knowledge of the ARM's pipeline
-     length should be applied by the linker.  */
-  int no_pipeline_knowledge;
-};
+    /* A boolean indicating whether knowledge of the ARM's pipeline
+       length should be applied by the linker.  */
+    int no_pipeline_knowledge;
+  };

 
 /* Create an entry in an ARM ELF linker hash table.  */
 
 
 /* Create an entry in an ARM ELF linker hash table.  */
 


@@ -195,9 +234,9 @@ elf32_arm_link_hash_table_create (abfd)
      bfd *abfd;
 {
   struct elf32_arm_link_hash_table *ret;
      bfd *abfd;
 {
   struct elf32_arm_link_hash_table *ret;

+  bfd_size_type amt = sizeof (struct elf32_arm_link_hash_table);

 
 

-  ret = ((struct elf32_arm_link_hash_table *)
-        bfd_alloc (abfd, sizeof (struct elf32_arm_link_hash_table)));
+  ret = (struct elf32_arm_link_hash_table *) bfd_alloc (abfd, amt);

   if (ret == (struct elf32_arm_link_hash_table *) NULL)
     return NULL;
 
   if (ret == (struct elf32_arm_link_hash_table *) NULL)
     return NULL;
 


@@ -221,7 +260,7 @@ elf32_arm_link_hash_table_create (abfd)
 static struct elf_link_hash_entry *
 find_thumb_glue (link_info, name, input_bfd)
      struct bfd_link_info *link_info;
 static struct elf_link_hash_entry *
 find_thumb_glue (link_info, name, input_bfd)
      struct bfd_link_info *link_info;

-     CONST char *name;
+     const char *name;

      bfd *input_bfd;
 {
   char *tmp_name;
      bfd *input_bfd;
 {
   char *tmp_name;


@@ -231,8 +270,8 @@ find_thumb_glue (link_info, name, input_bfd)
   /* We need a pointer to the armelf specific hash table.  */
   hash_table = elf32_arm_hash_table (link_info);
 
   /* We need a pointer to the armelf specific hash table.  */
   hash_table = elf32_arm_hash_table (link_info);
 

-  tmp_name = ((char *)
-       bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1));
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
+                                 + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -243,8 +282,8 @@ find_thumb_glue (link_info, name, input_bfd)
 
   if (hash == NULL)
     /* xgettext:c-format */
 
   if (hash == NULL)
     /* xgettext:c-format */

-    _bfd_error_handler (_("%s: unable to find THUMB glue '%s' for `%s'"),
-                       bfd_get_filename (input_bfd), tmp_name, name);
+    (*_bfd_error_handler) (_("%s: unable to find THUMB glue '%s' for `%s'"),
+                          bfd_archive_filename (input_bfd), tmp_name, name);

 
   free (tmp_name);
 
 
   free (tmp_name);
 


@@ -256,7 +295,7 @@ find_thumb_glue (link_info, name, input_bfd)
 static struct elf_link_hash_entry *
 find_arm_glue (link_info, name, input_bfd)
      struct bfd_link_info *link_info;
 static struct elf_link_hash_entry *
 find_arm_glue (link_info, name, input_bfd)
      struct bfd_link_info *link_info;

-     CONST char *name;
+     const char *name;

      bfd *input_bfd;
 {
   char *tmp_name;
      bfd *input_bfd;
 {
   char *tmp_name;


@@ -266,8 +305,8 @@ find_arm_glue (link_info, name, input_bfd)
   /* We need a pointer to the elfarm specific hash table.  */
   hash_table = elf32_arm_hash_table (link_info);
 
   /* We need a pointer to the elfarm specific hash table.  */
   hash_table = elf32_arm_hash_table (link_info);
 

-  tmp_name = ((char *)
-       bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1));
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
+                                 + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -278,8 +317,8 @@ find_arm_glue (link_info, name, input_bfd)
 
   if (myh == NULL)
     /* xgettext:c-format */
 
   if (myh == NULL)
     /* xgettext:c-format */

-    _bfd_error_handler (_("%s: unable to find ARM glue '%s' for `%s'"),
-                       bfd_get_filename (input_bfd), tmp_name, name);
+    (*_bfd_error_handler) (_("%s: unable to find ARM glue '%s' for `%s'"),
+                          bfd_archive_filename (input_bfd), tmp_name, name);

 
   free (tmp_name);
 
 
   free (tmp_name);
 


@@ -344,13 +383,13 @@ bfd_elf32_arm_allocate_interworking_sections (info)
     {
       BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
 
     {
       BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
 

-      s = bfd_get_section_by_name
-       (globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
+      s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
+                                  ARM2THUMB_GLUE_SECTION_NAME);

 
       BFD_ASSERT (s != NULL);
 
 
       BFD_ASSERT (s != NULL);
 

-      foo = (bfd_byte *) bfd_alloc
-       (globals->bfd_of_glue_owner, globals->arm_glue_size);
+      foo = (bfd_byte *) bfd_alloc (globals->bfd_of_glue_owner,
+                                   globals->arm_glue_size);

 
       s->_raw_size = s->_cooked_size = globals->arm_glue_size;
       s->contents = foo;
 
       s->_raw_size = s->_cooked_size = globals->arm_glue_size;
       s->contents = foo;


@@ -365,8 +404,8 @@ bfd_elf32_arm_allocate_interworking_sections (info)
 
       BFD_ASSERT (s != NULL);
 
 
       BFD_ASSERT (s != NULL);
 

-      foo = (bfd_byte *) bfd_alloc
-       (globals->bfd_of_glue_owner, globals->thumb_glue_size);
+      foo = (bfd_byte *) bfd_alloc (globals->bfd_of_glue_owner,
+                                   globals->thumb_glue_size);

 
       s->_raw_size = s->_cooked_size = globals->thumb_glue_size;
       s->contents = foo;
 
       s->_raw_size = s->_cooked_size = globals->thumb_glue_size;
       s->contents = foo;


@@ -381,10 +420,11 @@ record_arm_to_thumb_glue (link_info, h)
      struct elf_link_hash_entry * h;
 {
   const char * name = h->root.root.string;
      struct elf_link_hash_entry * h;
 {
   const char * name = h->root.root.string;

-  register asection * s;
+  asection * s;

   char * tmp_name;
   struct elf_link_hash_entry * myh;
   struct elf32_arm_link_hash_table * globals;
   char * tmp_name;
   struct elf_link_hash_entry * myh;
   struct elf32_arm_link_hash_table * globals;

+  bfd_vma val;

 
   globals = elf32_arm_hash_table (link_info);
 
 
   globals = elf32_arm_hash_table (link_info);
 


@@ -396,8 +436,8 @@ record_arm_to_thumb_glue (link_info, h)
 
   BFD_ASSERT (s != NULL);
 
 
   BFD_ASSERT (s != NULL);
 

-  tmp_name = ((char *)
-       bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1));
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
+                                 + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -416,9 +456,9 @@ record_arm_to_thumb_glue (link_info, h)
   /* The only trick here is using hash_table->arm_glue_size as the value. Even
      though the section isn't allocated yet, this is where we will be putting
      it.  */
   /* The only trick here is using hash_table->arm_glue_size as the value. Even
      though the section isn't allocated yet, this is where we will be putting
      it.  */

-  _bfd_generic_link_add_one_symbol (link_info, globals->bfd_of_glue_owner, tmp_name,
-                                   BSF_GLOBAL,
-                                   s, globals->arm_glue_size + 1,
+  val = globals->arm_glue_size + 1;
+  _bfd_generic_link_add_one_symbol (link_info, globals->bfd_of_glue_owner,
+                                   tmp_name, BSF_GLOBAL, s, val,

                                    NULL, true, false,
                                    (struct bfd_link_hash_entry **) &myh);
 
                                    NULL, true, false,
                                    (struct bfd_link_hash_entry **) &myh);
 


@@ -435,11 +475,12 @@ record_thumb_to_arm_glue (link_info, h)
      struct elf_link_hash_entry *h;
 {
   const char *name = h->root.root.string;
      struct elf_link_hash_entry *h;
 {
   const char *name = h->root.root.string;

-  register asection *s;
+  asection *s;

   char *tmp_name;
   struct elf_link_hash_entry *myh;
   struct elf32_arm_link_hash_table *hash_table;
   char bind;
   char *tmp_name;
   struct elf_link_hash_entry *myh;
   struct elf32_arm_link_hash_table *hash_table;
   char bind;

+  bfd_vma val;

 
   hash_table = elf32_arm_hash_table (link_info);
 
 
   hash_table = elf32_arm_hash_table (link_info);
 


@@ -451,7 +492,8 @@ record_thumb_to_arm_glue (link_info, h)
 
   BFD_ASSERT (s != NULL);
 
 
   BFD_ASSERT (s != NULL);
 

-  tmp_name = (char *) bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1);
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
+                                 + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -467,8 +509,9 @@ record_thumb_to_arm_glue (link_info, h)
       return;
     }
 
       return;
     }
 

-  _bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner, tmp_name,
-                            BSF_GLOBAL, s, hash_table->thumb_glue_size + 1,
+  val = hash_table->thumb_glue_size + 1;
+  _bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner,
+                                   tmp_name, BSF_GLOBAL, s, val,

                                    NULL, true, false,
                                    (struct bfd_link_hash_entry **) &myh);
 
                                    NULL, true, false,
                                    (struct bfd_link_hash_entry **) &myh);
 


@@ -482,7 +525,8 @@ record_thumb_to_arm_glue (link_info, h)
 #define BACK_FROM_ARM "__%s_back_from_arm"
 
   /* Allocate another symbol to mark where we switch to Arm mode.  */
 #define BACK_FROM_ARM "__%s_back_from_arm"
 
   /* Allocate another symbol to mark where we switch to Arm mode.  */

-  tmp_name = (char *) bfd_malloc (strlen (name) + strlen (CHANGE_TO_ARM) + 1);
+  tmp_name = (char *) bfd_malloc ((bfd_size_type) strlen (name)
+                                 + strlen (CHANGE_TO_ARM) + 1);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -490,8 +534,9 @@ record_thumb_to_arm_glue (link_info, h)
 
   myh = NULL;
 
 
   myh = NULL;
 

-  _bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner, tmp_name,
-                             BSF_LOCAL, s, hash_table->thumb_glue_size + 4,
+  val = hash_table->thumb_glue_size + 4,
+  _bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner,
+                                   tmp_name, BSF_LOCAL, s, val,

                                    NULL, true, false,
                                    (struct bfd_link_hash_entry **) &myh);
 
                                    NULL, true, false,
                                    (struct bfd_link_hash_entry **) &myh);
 


@@ -616,7 +661,7 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
 
       /* Load the relocs.  */
       irel = (_bfd_elf32_link_read_relocs (abfd, sec, (PTR) NULL,
 
       /* Load the relocs.  */
       irel = (_bfd_elf32_link_read_relocs (abfd, sec, (PTR) NULL,

-                                       (Elf_Internal_Rela *) NULL, false));
+                                          (Elf_Internal_Rela *) NULL, false));

 
       BFD_ASSERT (irel != 0);
 
 
       BFD_ASSERT (irel != 0);
 


@@ -652,7 +697,7 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
                  free_contents = contents;
 
                  if (!bfd_get_section_contents (abfd, sec, contents,
                  free_contents = contents;
 
                  if (!bfd_get_section_contents (abfd, sec, contents,

-                                             (file_ptr) 0, sec->_raw_size))
+                                                (file_ptr) 0, sec->_raw_size))

                    goto error_return;
                }
            }
                    goto error_return;
                }
            }


@@ -674,7 +719,7 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
                  free_extsyms = extsyms;
 
                  if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
                  free_extsyms = extsyms;
 
                  if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0

-                     || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd)
+                     || (bfd_bread (extsyms, symtab_hdr->sh_size, abfd)

                          != symtab_hdr->sh_size))
                    goto error_return;
                }
                          != symtab_hdr->sh_size))
                    goto error_return;
                }


@@ -807,7 +852,7 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
      bfd_vma                val;
 {
   asection * s = 0;
      bfd_vma                val;
 {
   asection * s = 0;

-  long int my_offset;
+  bfd_vma my_offset;

   unsigned long int tmp;
   long int ret_offset;
   struct elf_link_hash_entry * myh;
   unsigned long int tmp;
   long int ret_offset;
   struct elf_link_hash_entry * myh;


@@ -837,12 +882,12 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
          && sym_sec->owner != NULL
          && !INTERWORK_FLAG (sym_sec->owner))
        {
          && sym_sec->owner != NULL
          && !INTERWORK_FLAG (sym_sec->owner))
        {

-         _bfd_error_handler
+         (*_bfd_error_handler)

            (_("%s(%s): warning: interworking not enabled."),
            (_("%s(%s): warning: interworking not enabled."),

-            bfd_get_filename (sym_sec->owner), name);
-         _bfd_error_handler
+            bfd_archive_filename (sym_sec->owner), name);
+         (*_bfd_error_handler)

            (_("  first occurrence: %s: thumb call to arm"),
            (_("  first occurrence: %s: thumb call to arm"),

-            bfd_get_filename (input_bfd));
+            bfd_archive_filename (input_bfd));

 
          return false;
        }
 
          return false;
        }


@@ -850,10 +895,10 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
       --my_offset;
       myh->root.u.def.value = my_offset;
 
       --my_offset;
       myh->root.u.def.value = my_offset;
 

-      bfd_put_16 (output_bfd, t2a1_bx_pc_insn,
+      bfd_put_16 (output_bfd, (bfd_vma) t2a1_bx_pc_insn,

                  s->contents + my_offset);
 
                  s->contents + my_offset);
 

-      bfd_put_16 (output_bfd, t2a2_noop_insn,
+      bfd_put_16 (output_bfd, (bfd_vma) t2a2_noop_insn,

                  s->contents + my_offset + 2);
 
       ret_offset =
                  s->contents + my_offset + 2);
 
       ret_offset =


@@ -872,7 +917,7 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
           + 8);
 
       bfd_put_32 (output_bfd,
           + 8);
 
       bfd_put_32 (output_bfd,

-                 t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),
+                 (bfd_vma) t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),

                  s->contents + my_offset + 4);
     }
 
                  s->contents + my_offset + 4);
     }
 


@@ -880,18 +925,17 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
 
   /* Now go back and fix up the original BL insn to point
      to here.  */
 
   /* Now go back and fix up the original BL insn to point
      to here.  */

-  ret_offset =
-    s->output_offset
-    + my_offset
-    - (input_section->output_offset
-       + offset + addend)
-    - 8;
+  ret_offset = (s->output_offset
+               + my_offset
+               - (input_section->output_offset
+                  + offset + addend)
+               - 8);

 
   tmp = bfd_get_32 (input_bfd, hit_data
                    - input_section->vma);
 
   bfd_put_32 (output_bfd,
 
   tmp = bfd_get_32 (input_bfd, hit_data
                    - input_section->vma);
 
   bfd_put_32 (output_bfd,

-             insert_thumb_branch (tmp, ret_offset),
+             (bfd_vma) insert_thumb_branch (tmp, ret_offset),

              hit_data - input_section->vma);
 
   return true;
              hit_data - input_section->vma);
 
   return true;


@@ -914,7 +958,7 @@ elf32_arm_to_thumb_stub (info, name, input_bfd, output_bfd, input_section,
      bfd_vma                val;
 {
   unsigned long int tmp;
      bfd_vma                val;
 {
   unsigned long int tmp;

-  long int my_offset;
+  bfd_vma my_offset;

   asection * s;
   long int ret_offset;
   struct elf_link_hash_entry * myh;
   asection * s;
   long int ret_offset;
   struct elf_link_hash_entry * myh;


@@ -942,21 +986,21 @@ elf32_arm_to_thumb_stub (info, name, input_bfd, output_bfd, input_section,
          && sym_sec->owner != NULL
          && !INTERWORK_FLAG (sym_sec->owner))
        {
          && sym_sec->owner != NULL
          && !INTERWORK_FLAG (sym_sec->owner))
        {

-         _bfd_error_handler
+         (*_bfd_error_handler)

            (_("%s(%s): warning: interworking not enabled."),
            (_("%s(%s): warning: interworking not enabled."),

-            bfd_get_filename (sym_sec->owner), name);
-         _bfd_error_handler
+            bfd_archive_filename (sym_sec->owner), name);
+         (*_bfd_error_handler)

            (_("  first occurrence: %s: arm call to thumb"),
            (_("  first occurrence: %s: arm call to thumb"),

-            bfd_get_filename (input_bfd));
+            bfd_archive_filename (input_bfd));

        }
 
       --my_offset;
       myh->root.u.def.value = my_offset;
 
        }
 
       --my_offset;
       myh->root.u.def.value = my_offset;
 

-      bfd_put_32 (output_bfd, a2t1_ldr_insn,
+      bfd_put_32 (output_bfd, (bfd_vma) a2t1_ldr_insn,

                  s->contents + my_offset);
 
                  s->contents + my_offset);
 

-      bfd_put_32 (output_bfd, a2t2_bx_r12_insn,
+      bfd_put_32 (output_bfd, (bfd_vma) a2t2_bx_r12_insn,

                  s->contents + my_offset + 4);
 
       /* It's a thumb address.  Add the low order bit.  */
                  s->contents + my_offset + 4);
 
       /* It's a thumb address.  Add the low order bit.  */


@@ -970,18 +1014,17 @@ elf32_arm_to_thumb_stub (info, name, input_bfd, output_bfd, input_section,
   tmp = tmp & 0xFF000000;
 
   /* Somehow these are both 4 too far, so subtract 8.  */
   tmp = tmp & 0xFF000000;
 
   /* Somehow these are both 4 too far, so subtract 8.  */

-  ret_offset = s->output_offset
-    + my_offset
-    + s->output_section->vma
-    - (input_section->output_offset
-       + input_section->output_section->vma
-       + offset + addend)
-    - 8;
+  ret_offset = (s->output_offset
+               + my_offset
+               + s->output_section->vma
+               - (input_section->output_offset
+                  + input_section->output_section->vma
+                  + offset + addend)
+               - 8);

 
   tmp = tmp | ((ret_offset >> 2) & 0x00FFFFFF);
 
 
   tmp = tmp | ((ret_offset >> 2) & 0x00FFFFFF);
 

-  bfd_put_32 (output_bfd, tmp, hit_data
-             - input_section->vma);
+  bfd_put_32 (output_bfd, (bfd_vma) tmp, hit_data - input_section->vma);

 
   return true;
 }
 
   return true;
 }


@@ -1002,7 +1045,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
      struct bfd_link_info * info;
      asection *             sym_sec;
      const char *           sym_name;
      struct bfd_link_info * info;
      asection *             sym_sec;
      const char *           sym_name;

-     unsigned char          sym_flags;
+     int                   sym_flags;

      struct elf_link_hash_entry * h;
 {
   unsigned long                 r_type = howto->type;
      struct elf_link_hash_entry * h;
 {
   unsigned long                 r_type = howto->type;


@@ -1019,6 +1062,18 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
   bfd_signed_vma                signed_addend;
   struct elf32_arm_link_hash_table * globals;
 
   bfd_signed_vma                signed_addend;
   struct elf32_arm_link_hash_table * globals;
 

+  /* If the start address has been set, then set the EF_ARM_HASENTRY
+     flag.  Setting this more than once is redundant, but the cost is
+     not too high, and it keeps the code simple.
+
+     The test is done  here, rather than somewhere else, because the
+     start address is only set just before the final link commences.
+
+     Note - if the user deliberately sets a start address of 0, the
+     flag will not be set.  */
+  if (bfd_get_start_address (output_bfd) != 0)
+    elf_elfheader (output_bfd)->e_flags |= EF_ARM_HASENTRY;
+

   globals = elf32_arm_hash_table (info);
 
   dynobj = elf_hash_table (info)->dynobj;
   globals = elf32_arm_hash_table (info);
 
   dynobj = elf_hash_table (info)->dynobj;


@@ -1062,7 +1117,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
         into the output file to be resolved at run time.  */
       if (info->shared
          && (r_type != R_ARM_PC24
         into the output file to be resolved at run time.  */
       if (info->shared
          && (r_type != R_ARM_PC24

-             || (h != NULL
+             || (h != NULL

                  && h->dynindx != -1
                  && (! info->symbolic
                      || (h->elf_link_hash_flags
                  && h->dynindx != -1
                  && (! info->symbolic
                      || (h->elf_link_hash_flags


@@ -1176,10 +1231,10 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
              /* FIXME: Should we translate the instruction into a BL
                 instruction instead ?  */
              if (sym_flags != STT_ARM_TFUNC)
              /* FIXME: Should we translate the instruction into a BL
                 instruction instead ?  */
              if (sym_flags != STT_ARM_TFUNC)

-               _bfd_error_handler (_("\
+               (*_bfd_error_handler) (_("\

 %s: Warning: Arm BLX instruction targets Arm function '%s'."),
 %s: Warning: Arm BLX instruction targets Arm function '%s'."),

-                                   bfd_get_filename (input_bfd),
-                                   h ? h->root.root.string : "(local)");
+                                      bfd_archive_filename (input_bfd),
+                                      h ? h->root.root.string : "(local)");

            }
          else
 #endif
            }
          else
 #endif


@@ -1283,7 +1338,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 
        case R_ARM_REL32:
          value -= (input_section->output_section->vma
 
        case R_ARM_REL32:
          value -= (input_section->output_section->vma

-                   + input_section->output_offset);
+                   + input_section->output_offset + rel->r_offset);

          value += addend;
          break;
        }
          value += addend;
          break;
        }


@@ -1372,10 +1427,10 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
            /* FIXME: Should we translate the instruction into a BL
               instruction instead ?  */
            if (sym_flags == STT_ARM_TFUNC)
            /* FIXME: Should we translate the instruction into a BL
               instruction instead ?  */
            if (sym_flags == STT_ARM_TFUNC)

-             _bfd_error_handler (_("\
+             (*_bfd_error_handler) (_("\

 %s: Warning: Thumb BLX instruction targets thumb function '%s'."),
 %s: Warning: Thumb BLX instruction targets thumb function '%s'."),

-                                 bfd_get_filename (input_bfd),
-                                 h ? h->root.root.string : "(local)");
+                                    bfd_archive_filename (input_bfd),
+                                    h ? h->root.root.string : "(local)");

          }
        else
 #endif
          }
        else
 #endif


@@ -1434,6 +1489,18 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
        upper_insn = (upper_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 12) & 0x7ff);
        lower_insn = (lower_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 1) & 0x7ff);
 
        upper_insn = (upper_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 12) & 0x7ff);
        lower_insn = (lower_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 1) & 0x7ff);
 

+#ifndef OLD_ARM_ABI
+       if (r_type == R_ARM_THM_XPC22
+           && ((lower_insn & 0x1800) == 0x0800))
+         /* Remove bit zero of the adjusted offset.  Bit zero can only be
+            set if the upper insn is at a half-word boundary, since the
+            destination address, an ARM instruction, must always be on a
+            word boundary.  The semantics of the BLX (1) instruction, however,
+            are that bit zero in the offset must always be zero, and the
+            corresponding bit one in the target address will be set from bit
+            one of the source address.  */
+         lower_insn &= ~1;
+#endif

        /* Put the relocated value back in the object file:  */
        bfd_put_16 (input_bfd, upper_insn, hit_data);
        bfd_put_16 (input_bfd, lower_insn, hit_data + 2);
        /* Put the relocated value back in the object file:  */
        bfd_put_16 (input_bfd, upper_insn, hit_data);
        bfd_put_16 (input_bfd, lower_insn, hit_data + 2);


@@ -1473,8 +1540,8 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
          calculation.  */
       value -= sgot->output_section->vma;
       return _bfd_final_link_relocate (howto, input_bfd, input_section,
          calculation.  */
       value -= sgot->output_section->vma;
       return _bfd_final_link_relocate (howto, input_bfd, input_section,

-                                      contents, rel->r_offset, value,
-                                      (bfd_vma) 0);
+                                      contents, rel->r_offset, value,
+                                      (bfd_vma) 0);

 
     case R_ARM_GOTPC:
       /* Use global offset table as symbol value.  */
 
     case R_ARM_GOTPC:
       /* Use global offset table as symbol value.  */


@@ -1485,8 +1552,8 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 
       value = sgot->output_section->vma;
       return _bfd_final_link_relocate (howto, input_bfd, input_section,
 
       value = sgot->output_section->vma;
       return _bfd_final_link_relocate (howto, input_bfd, input_section,

-                                      contents, rel->r_offset, value,
-                                      (bfd_vma) 0);
+                                      contents, rel->r_offset, value,
+                                      (bfd_vma) 0);

 
     case R_ARM_GOT32:
       /* Relocation is to the entry for this symbol in the
 
     case R_ARM_GOT32:
       /* Relocation is to the entry for this symbol in the


@@ -1569,8 +1636,8 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
        }
 
       return _bfd_final_link_relocate (howto, input_bfd, input_section,
        }
 
       return _bfd_final_link_relocate (howto, input_bfd, input_section,

-                                      contents, rel->r_offset, value,
-                                      (bfd_vma) 0);
+                                      contents, rel->r_offset, value,
+                                      (bfd_vma) 0);

 
     case R_ARM_PLT32:
       /* Relocation is to the entry for this symbol in the
 
     case R_ARM_PLT32:
       /* Relocation is to the entry for this symbol in the


@@ -1580,8 +1647,8 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
          without using the procedure linkage table.  */
       if (h == NULL)
         return _bfd_final_link_relocate (howto, input_bfd, input_section,
          without using the procedure linkage table.  */
       if (h == NULL)
         return _bfd_final_link_relocate (howto, input_bfd, input_section,

-                                        contents, rel->r_offset, value,
-                                        (bfd_vma) 0);
+                                contents, rel->r_offset, value,
+                                (bfd_vma) 0);

 
       if (h->plt.offset == (bfd_vma) -1)
         /* We didn't make a PLT entry for this symbol.  This
 
       if (h->plt.offset == (bfd_vma) -1)
         /* We didn't make a PLT entry for this symbol.  This


@@ -1599,8 +1666,8 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
               + splt->output_offset
               + h->plt.offset);
       return _bfd_final_link_relocate (howto, input_bfd, input_section,
               + splt->output_offset
               + h->plt.offset);
       return _bfd_final_link_relocate (howto, input_bfd, input_section,

-                                      contents, rel->r_offset, value,
-                                      (bfd_vma) 0);
+                              contents, rel->r_offset, value,
+                              (bfd_vma) 0);

 
     case R_ARM_SBREL32:
       return bfd_reloc_notsupported;
 
     case R_ARM_SBREL32:
       return bfd_reloc_notsupported;


@@ -1659,8 +1726,8 @@ arm_add_to_rel (abfd, address, howto, increment)
       upper_insn = (upper_insn & 0xf800) | ((addend >> 11) & 0x7ff);
       lower_insn = (lower_insn & 0xf800) | (addend & 0x7ff);
 
       upper_insn = (upper_insn & 0xf800) | ((addend >> 11) & 0x7ff);
       lower_insn = (lower_insn & 0xf800) | (addend & 0x7ff);
 

-      bfd_put_16 (abfd, upper_insn, address);
-      bfd_put_16 (abfd, lower_insn, address + 2);
+      bfd_put_16 (abfd, (bfd_vma) upper_insn, address);
+      bfd_put_16 (abfd, (bfd_vma) lower_insn, address + 2);

     }
   else
     {
     }
   else
     {


@@ -1688,7 +1755,7 @@ arm_add_to_rel (abfd, address, howto, increment)
 
        case R_ARM_PC24:
          addend <<= howto->size;
 
        case R_ARM_PC24:
          addend <<= howto->size;

-         addend +=  increment;
+         addend += increment;

 
          /* Should we check for overflow here ?  */
 
 
          /* Should we check for overflow here ?  */
 


@@ -1747,7 +1814,12 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
           || r_type == R_ARM_GNU_VTINHERIT)
         continue;
 
           || r_type == R_ARM_GNU_VTINHERIT)
         continue;
 

+#ifdef USE_REL
+      elf32_arm_info_to_howto (input_bfd, & bfd_reloc,
+                              (Elf_Internal_Rel *) rel);
+#else

       elf32_arm_info_to_howto (input_bfd, & bfd_reloc, rel);
       elf32_arm_info_to_howto (input_bfd, & bfd_reloc, rel);

+#endif

       howto = bfd_reloc.howto;
 
       if (info->relocateable)
       howto = bfd_reloc.howto;
 
       if (info->relocateable)


@@ -1764,10 +1836,11 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                  sec = local_sections[r_symndx];
 #ifdef USE_REL
                  arm_add_to_rel (input_bfd, contents + rel->r_offset,
                  sec = local_sections[r_symndx];
 #ifdef USE_REL
                  arm_add_to_rel (input_bfd, contents + rel->r_offset,

-                                 howto, sec->output_offset + sym->st_value);
+                                 howto,
+                                 (bfd_signed_vma) (sec->output_offset
+                                                   + sym->st_value));

 #else
 #else

-                 rel->r_addend += (sec->output_offset + sym->st_value)
-                   >> howto->rightshift;
+                 rel->r_addend += (sec->output_offset + sym->st_value);

 #endif
                }
            }
 #endif
                }
            }


@@ -1812,7 +1885,7 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                case R_ARM_ABS32:
                  if (info->shared
                      && (
                case R_ARM_ABS32:
                  if (info->shared
                      && (

-                         (!info->symbolic && h->dynindx != -1)
+                 (!info->symbolic && h->dynindx != -1)

                          || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
                          )
                      && ((input_section->flags & SEC_ALLOC) != 0
                          || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
                          )
                      && ((input_section->flags & SEC_ALLOC) != 0


@@ -1851,7 +1924,7 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                    {
                      (*_bfd_error_handler)
                        (_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),
                    {
                      (*_bfd_error_handler)
                        (_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),

-                        bfd_get_filename (input_bfd), h->root.root.string,
+                        bfd_archive_filename (input_bfd), h->root.root.string,

                         bfd_get_section_name (input_bfd, input_section));
                      relocation_needed = 0;
                    }
                         bfd_get_section_name (input_bfd, input_section));
                      relocation_needed = 0;
                    }


@@ -1963,14 +2036,14 @@ elf32_arm_set_private_flags (abfd, flags)
     {
       if (EF_ARM_EABI_VERSION (flags) == EF_ARM_EABI_UNKNOWN)
        {
     {
       if (EF_ARM_EABI_VERSION (flags) == EF_ARM_EABI_UNKNOWN)
        {

-         if (flags & EF_INTERWORK)
-           _bfd_error_handler (_("\
+         if (flags & EF_ARM_INTERWORK)
+           (*_bfd_error_handler) (_("\

 Warning: Not setting interwork flag of %s since it has already been specified as non-interworking"),
 Warning: Not setting interwork flag of %s since it has already been specified as non-interworking"),

-                               bfd_get_filename (abfd));
+                                  bfd_archive_filename (abfd));

          else
            _bfd_error_handler (_("\
 Warning: Clearing the interwork flag of %s due to outside request"),
          else
            _bfd_error_handler (_("\
 Warning: Clearing the interwork flag of %s due to outside request"),

-                               bfd_get_filename (abfd));
+                               bfd_archive_filename (abfd));

        }
     }
   else
        }
     }
   else


@@ -2004,28 +2077,29 @@ elf32_arm_copy_private_bfd_data (ibfd, obfd)
       && in_flags != out_flags)
     {
       /* Cannot mix APCS26 and APCS32 code.  */
       && in_flags != out_flags)
     {
       /* Cannot mix APCS26 and APCS32 code.  */

-      if ((in_flags & EF_APCS_26) != (out_flags & EF_APCS_26))
+      if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))

        return false;
 
       /* Cannot mix float APCS and non-float APCS code.  */
        return false;
 
       /* Cannot mix float APCS and non-float APCS code.  */

-      if ((in_flags & EF_APCS_FLOAT) != (out_flags & EF_APCS_FLOAT))
+      if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))

        return false;
 
       /* If the src and dest have different interworking flags
          then turn off the interworking bit.  */
        return false;
 
       /* If the src and dest have different interworking flags
          then turn off the interworking bit.  */

-      if ((in_flags & EF_INTERWORK) != (out_flags & EF_INTERWORK))
+      if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))

        {
        {

-         if (out_flags & EF_INTERWORK)
+         if (out_flags & EF_ARM_INTERWORK)

            _bfd_error_handler (_("\
 Warning: Clearing the interwork flag in %s because non-interworking code in %s has been linked with it"),
            _bfd_error_handler (_("\
 Warning: Clearing the interwork flag in %s because non-interworking code in %s has been linked with it"),

-                         bfd_get_filename (obfd), bfd_get_filename (ibfd));
+                               bfd_archive_filename (obfd),
+                               bfd_archive_filename (ibfd));

 
 

-         in_flags &= ~EF_INTERWORK;
+         in_flags &= ~EF_ARM_INTERWORK;

        }
 
       /* Likewise for PIC, though don't warn for this case.  */
        }
 
       /* Likewise for PIC, though don't warn for this case.  */

-      if ((in_flags & EF_PIC) != (out_flags & EF_PIC))
-       in_flags &= ~EF_PIC;
+      if ((in_flags & EF_ARM_PIC) != (out_flags & EF_ARM_PIC))
+       in_flags &= ~EF_ARM_PIC;

     }
 
   elf_elfheader (obfd)->e_flags = in_flags;
     }
 
   elf_elfheader (obfd)->e_flags = in_flags;


@@ -2112,59 +2186,65 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd)
     {
       _bfd_error_handler (_("\
 Error: %s compiled for EABI version %d, whereas %s is compiled for version %d"),
     {
       _bfd_error_handler (_("\
 Error: %s compiled for EABI version %d, whereas %s is compiled for version %d"),

-                        bfd_get_filename (ibfd),
-                        (in_flags & EF_ARM_EABIMASK) >> 24,
-                        bfd_get_filename (obfd),
-                        (out_flags & EF_ARM_EABIMASK) >> 24);
+                         bfd_archive_filename (ibfd),
+                         (in_flags & EF_ARM_EABIMASK) >> 24,
+                         bfd_archive_filename (obfd),
+                         (out_flags & EF_ARM_EABIMASK) >> 24);

       return false;
     }
 
   /* Not sure what needs to be checked for EABI versions >= 1.  */
   if (EF_ARM_EABI_VERSION (in_flags) == EF_ARM_EABI_UNKNOWN)
     {
       return false;
     }
 
   /* Not sure what needs to be checked for EABI versions >= 1.  */
   if (EF_ARM_EABI_VERSION (in_flags) == EF_ARM_EABI_UNKNOWN)
     {

-      if ((in_flags & EF_APCS_26) != (out_flags & EF_APCS_26))
+      if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))

        {
          _bfd_error_handler (_("\
 Error: %s compiled for APCS-%d, whereas %s is compiled for APCS-%d"),
        {
          _bfd_error_handler (_("\
 Error: %s compiled for APCS-%d, whereas %s is compiled for APCS-%d"),

-                       bfd_get_filename (ibfd),
-                       in_flags & EF_APCS_26 ? 26 : 32,
-                       bfd_get_filename (obfd),
-                       out_flags & EF_APCS_26 ? 26 : 32);
+                             bfd_archive_filename (ibfd),
+                             in_flags & EF_ARM_APCS_26 ? 26 : 32,
+                             bfd_archive_filename (obfd),
+                             out_flags & EF_ARM_APCS_26 ? 26 : 32);

          flags_compatible = false;
        }
 
          flags_compatible = false;
        }
 

-      if ((in_flags & EF_APCS_FLOAT) != (out_flags & EF_APCS_FLOAT))
+      if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))

        {
        {

+         char *s1 = in_flags  & EF_ARM_APCS_FLOAT ? _("float") : _("integer");
+         char *s2 = out_flags & EF_ARM_APCS_FLOAT ? _("float") : _("integer");
+

          _bfd_error_handler (_("\
 Error: %s passes floats in %s registers, whereas %s passes them in %s registers"),
          _bfd_error_handler (_("\
 Error: %s passes floats in %s registers, whereas %s passes them in %s registers"),

-                       bfd_get_filename (ibfd),
-                    in_flags & EF_APCS_FLOAT ? _("float") : _("integer"),
-                       bfd_get_filename (obfd),
-                     out_flags & EF_APCS_26 ? _("float") : _("integer"));
+                             bfd_archive_filename (ibfd), s1,
+                             bfd_archive_filename (obfd), s2);

          flags_compatible = false;
        }
 
          flags_compatible = false;
        }
 

-#ifdef EF_SOFT_FLOAT
-      if ((in_flags & EF_SOFT_FLOAT) != (out_flags & EF_SOFT_FLOAT))
+#ifdef EF_ARM_SOFT_FLOAT
+      if ((in_flags & EF_ARM_SOFT_FLOAT) != (out_flags & EF_ARM_SOFT_FLOAT))

        {
        {

+         char *s1 = in_flags  & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard");
+         char *s2 = out_flags & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard");
+

          _bfd_error_handler (_ ("\
 Error: %s uses %s floating point, whereas %s uses %s floating point"),
          _bfd_error_handler (_ ("\
 Error: %s uses %s floating point, whereas %s uses %s floating point"),

-                             bfd_get_filename (ibfd),
-                             in_flags & EF_SOFT_FLOAT ? _("soft") : _("hard"),
-                             bfd_get_filename (obfd),
-                             out_flags & EF_SOFT_FLOAT ? _("soft") : _("hard"));
+                             bfd_archive_filename (ibfd), s1,
+                             bfd_archive_filename (obfd), s2);

          flags_compatible = false;
        }
 #endif
 
       /* Interworking mismatch is only a warning.  */
          flags_compatible = false;
        }
 #endif
 
       /* Interworking mismatch is only a warning.  */

-      if ((in_flags & EF_INTERWORK) != (out_flags & EF_INTERWORK))
-       _bfd_error_handler (_("\
+      if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))
+       {
+         char *s1 = (in_flags & EF_ARM_INTERWORK
+                     ? _("supports") : _("does not support"));
+         char *s2 = out_flags & EF_ARM_INTERWORK ? _("does") : _("does not");
+
+         _bfd_error_handler (_("\

 Warning: %s %s interworking, whereas %s %s"),
 Warning: %s %s interworking, whereas %s %s"),

-                         bfd_get_filename (ibfd),
-         in_flags & EF_INTERWORK ? _("supports") : _("does not support"),
-                         bfd_get_filename (obfd),
-                   out_flags & EF_INTERWORK ? _("does not") : _("does"));
+                             bfd_archive_filename (ibfd), s1,
+                             bfd_archive_filename (obfd), s2);
+       }

     }
 
   return flags_compatible;
     }
 
   return flags_compatible;


@@ -2198,31 +2278,31 @@ elf32_arm_print_private_bfd_data (abfd, ptr)
       /* The following flag bits are GNU extenstions and not part of the
         official ARM ELF extended ABI.  Hence they are only decoded if
         the EABI version is not set.  */
       /* The following flag bits are GNU extenstions and not part of the
         official ARM ELF extended ABI.  Hence they are only decoded if
         the EABI version is not set.  */

-      if (flags & EF_INTERWORK)
+      if (flags & EF_ARM_INTERWORK)

        fprintf (file, _(" [interworking enabled]"));
 
        fprintf (file, _(" [interworking enabled]"));
 

-      if (flags & EF_APCS_26)
+      if (flags & EF_ARM_APCS_26)

        fprintf (file, _(" [APCS-26]"));
       else
        fprintf (file, _(" [APCS-32]"));
 
        fprintf (file, _(" [APCS-26]"));
       else
        fprintf (file, _(" [APCS-32]"));
 

-      if (flags & EF_APCS_FLOAT)
+      if (flags & EF_ARM_APCS_FLOAT)

        fprintf (file, _(" [floats passed in float registers]"));
 
        fprintf (file, _(" [floats passed in float registers]"));
 

-      if (flags & EF_PIC)
+      if (flags & EF_ARM_PIC)

        fprintf (file, _(" [position independent]"));
 
        fprintf (file, _(" [position independent]"));
 

-      if (flags & EF_NEW_ABI)
+      if (flags & EF_ARM_NEW_ABI)

        fprintf (file, _(" [new ABI]"));
 
        fprintf (file, _(" [new ABI]"));
 

-      if (flags & EF_OLD_ABI)
+      if (flags & EF_ARM_OLD_ABI)

        fprintf (file, _(" [old ABI]"));
 
        fprintf (file, _(" [old ABI]"));
 

-      if (flags & EF_SOFT_FLOAT)
+      if (flags & EF_ARM_SOFT_FLOAT)

        fprintf (file, _(" [software FP]"));
 
        fprintf (file, _(" [software FP]"));
 

-      flags &= ~(EF_INTERWORK | EF_APCS_26 | EF_APCS_FLOAT | EF_PIC
-                | EF_NEW_ABI | EF_OLD_ABI | EF_SOFT_FLOAT);
+      flags &= ~(EF_ARM_INTERWORK | EF_ARM_APCS_26 | EF_ARM_APCS_FLOAT | EF_ARM_PIC
+                | EF_ARM_NEW_ABI | EF_ARM_OLD_ABI | EF_ARM_SOFT_FLOAT);

       break;
 
     case EF_ARM_EABI_VER1:
       break;
 
     case EF_ARM_EABI_VER1:


@@ -2236,6 +2316,24 @@ elf32_arm_print_private_bfd_data (abfd, ptr)
       flags &= ~ EF_ARM_SYMSARESORTED;
       break;
 
       flags &= ~ EF_ARM_SYMSARESORTED;
       break;
 

+    case EF_ARM_EABI_VER2:
+      fprintf (file, _(" [Version2 EABI]"));
+
+      if (flags & EF_ARM_SYMSARESORTED)
+       fprintf (file, _(" [sorted symbol table]"));
+      else
+       fprintf (file, _(" [unsorted symbol table]"));
+
+      if (flags & EF_ARM_DYNSYMSUSESEGIDX)
+       fprintf (file, _(" [dynamic symbols use segment index]"));
+
+      if (flags & EF_ARM_MAPSYMSFIRST)
+       fprintf (file, _(" [mapping symbols precede others]"));
+
+      flags &= ~(EF_ARM_SYMSARESORTED | EF_ARM_DYNSYMSUSESEGIDX
+                | EF_ARM_MAPSYMSFIRST);
+      break;
+

     default:
       fprintf (file, _(" <EABI version unrecognised>"));
       break;
     default:
       fprintf (file, _(" <EABI version unrecognised>"));
       break;


@@ -2428,7 +2526,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                    srelgot = bfd_make_section (dynobj, ".rel.got");
                    if (srelgot == NULL
                        || ! bfd_set_section_flags (dynobj, srelgot,
                    srelgot = bfd_make_section (dynobj, ".rel.got");
                    if (srelgot == NULL
                        || ! bfd_set_section_flags (dynobj, srelgot,

-                                                   (SEC_ALLOC
+                                                   (SEC_ALLOC

                                                     | SEC_LOAD
                                                     | SEC_HAS_CONTENTS
                                                     | SEC_IN_MEMORY
                                                     | SEC_LOAD
                                                     | SEC_HAS_CONTENTS
                                                     | SEC_IN_MEMORY


@@ -2456,14 +2554,15 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
              }
            else
              {
              }
            else
              {

-               /* This is a global offset table entry for a local
+               /* This is a global offset table entry for a local

                    symbol.  */
                if (local_got_offsets == NULL)
                  {
                    symbol.  */
                if (local_got_offsets == NULL)
                  {

-                   size_t size;
-                   register unsigned int i;
+                   bfd_size_type size;
+                   unsigned int i;

 
 

-                   size = symtab_hdr->sh_info * sizeof (bfd_vma);
+                   size = symtab_hdr->sh_info;
+                   size *= sizeof (bfd_vma);

                    local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
                    if (local_got_offsets == NULL)
                      return false;
                    local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
                    if (local_got_offsets == NULL)
                      return false;


@@ -2488,7 +2587,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
            sgot->_raw_size += 4;
            break;
 
            sgot->_raw_size += 4;
            break;
 

-         case R_ARM_PLT32:
+         case R_ARM_PLT32:

            /* This symbol requires a procedure linkage table entry.  We
                actually build the entry in adjust_dynamic_symbol,
                because this might be a case of linking PIC code which is
            /* This symbol requires a procedure linkage table entry.  We
                actually build the entry in adjust_dynamic_symbol,
                because this might be a case of linking PIC code which is


@@ -2541,7 +2640,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                      return false;
 
                    BFD_ASSERT (strncmp (name, ".rel", 4) == 0
                      return false;
 
                    BFD_ASSERT (strncmp (name, ".rel", 4) == 0

-                               && strcmp (bfd_get_section_name (abfd, sec),
+                               && strcmp (bfd_get_section_name (abfd, sec),

                                           name + 4) == 0);
 
                    sreloc = bfd_get_section_by_name (dynobj, name);
                                           name + 4) == 0);
 
                    sreloc = bfd_get_section_by_name (dynobj, name);


@@ -2559,6 +2658,8 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                            || ! bfd_set_section_alignment (dynobj, sreloc, 2))
                          return false;
                      }
                            || ! bfd_set_section_alignment (dynobj, sreloc, 2))
                          return false;
                      }

+                 if (sec->flags & SEC_READONLY)
+                   info->flags |= DF_TEXTREL;

                  }
 
                sreloc->_raw_size += sizeof (Elf32_External_Rel);
                  }
 
                sreloc->_raw_size += sizeof (Elf32_External_Rel);


@@ -2585,8 +2686,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                    if (p == NULL)
                      {
                        p = ((struct elf32_arm_pcrel_relocs_copied *)
                    if (p == NULL)
                      {
                        p = ((struct elf32_arm_pcrel_relocs_copied *)

-                            bfd_alloc (dynobj, sizeof * p));
-
+                            bfd_alloc (dynobj, (bfd_size_type) sizeof * p));

                        if (p == NULL)
                          return false;
                        p->next = eh->pcrel_relocs_copied;
                        if (p == NULL)
                          return false;
                        p->next = eh->pcrel_relocs_copied;


@@ -2630,8 +2730,8 @@ elf32_arm_find_nearest_line
      asection *     section;
      asymbol **     symbols;
      bfd_vma        offset;
      asection *     section;
      asymbol **     symbols;
      bfd_vma        offset;

-     CONST char **  filename_ptr;
-     CONST char **  functionname_ptr;
+     const char **  filename_ptr;
+     const char **  functionname_ptr;

      unsigned int * line_ptr;
 {
   boolean      found;
      unsigned int * line_ptr;
 {
   boolean      found;


@@ -2642,7 +2742,8 @@ elf32_arm_find_nearest_line
 
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
                                     filename_ptr, functionname_ptr,
 
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
                                     filename_ptr, functionname_ptr,

-                                    line_ptr, 0))
+                                    line_ptr, 0,
+                                    &elf_tdata (abfd)->dwarf2_find_line_info))

     return true;
 
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
     return true;
 
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,


@@ -2872,14 +2973,13 @@ elf32_arm_adjust_dynamic_symbol (info, h)
 
 static boolean
 elf32_arm_size_dynamic_sections (output_bfd, info)
 
 static boolean
 elf32_arm_size_dynamic_sections (output_bfd, info)

-     bfd * output_bfd;
+     bfd * output_bfd ATTRIBUTE_UNUSED;

      struct bfd_link_info * info;
 {
   bfd * dynobj;
   asection * s;
   boolean plt;
   boolean relocs;
      struct bfd_link_info * info;
 {
   bfd * dynobj;
   asection * s;
   boolean plt;
   boolean relocs;

-  boolean reltext;

 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);
 
   dynobj = elf_hash_table (info)->dynobj;
   BFD_ASSERT (dynobj != NULL);


@@ -2921,7 +3021,6 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
      memory for them.  */
   plt = false;
   relocs = false;
      memory for them.  */
   plt = false;
   relocs = false;

-  reltext = false;

   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char * name;
   for (s = dynobj->sections; s != NULL; s = s->next)
     {
       const char * name;


@@ -2967,30 +3066,10 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
            }
          else
            {
            }
          else
            {

-             asection * target;
-

              /* Remember whether there are any reloc sections other
                  than .rel.plt.  */
              if (strcmp (name, ".rel.plt") != 0)
              /* Remember whether there are any reloc sections other
                  than .rel.plt.  */
              if (strcmp (name, ".rel.plt") != 0)

-               {
-                 const char *outname;
-
-                 relocs = true;
-
-                 /* If this relocation section applies to a read only
-                    section, then we probably need a DT_TEXTREL
-                    entry.  The entries in the .rel.plt section
-                    really apply to the .got section, which we
-                    created ourselves and so know is not readonly.  */
-                 outname = bfd_get_section_name (output_bfd,
-                                                 s->output_section);
-                 target = bfd_get_section_by_name (output_bfd, outname + 4);
-
-                 if (target != NULL
-                     && (target->flags & SEC_READONLY) != 0
-                     && (target->flags & SEC_ALLOC) != 0)
-                   reltext = true;
-               }
+               relocs = true;

 
              /* We use the reloc_count field as a counter if we need
                 to copy relocs into the output file.  */
 
              /* We use the reloc_count field as a counter if we need
                 to copy relocs into the output file.  */


@@ -3030,37 +3109,40 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
         must add the entries now so that we get the correct size for
         the .dynamic section.  The DT_DEBUG entry is filled in by the
         dynamic linker and used by the debugger.  */
         must add the entries now so that we get the correct size for
         the .dynamic section.  The DT_DEBUG entry is filled in by the
         dynamic linker and used by the debugger.  */

-      if (! info->shared)
+#define add_dynamic_entry(TAG, VAL) \
+  bfd_elf32_add_dynamic_entry (info, (bfd_vma) (TAG), (bfd_vma) (VAL))
+
+      if (!info->shared)

        {
        {

-         if (! bfd_elf32_add_dynamic_entry (info, DT_DEBUG, 0))
+         if (!add_dynamic_entry (DT_DEBUG, 0))

            return false;
        }
 
       if (plt)
        {
            return false;
        }
 
       if (plt)
        {

-         if (   ! bfd_elf32_add_dynamic_entry (info, DT_PLTGOT, 0)
-             || ! bfd_elf32_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-             || ! bfd_elf32_add_dynamic_entry (info, DT_PLTREL, DT_REL)
-             || ! bfd_elf32_add_dynamic_entry (info, DT_JMPREL, 0))
+         if (   !add_dynamic_entry (DT_PLTGOT, 0)
+             || !add_dynamic_entry (DT_PLTRELSZ, 0)
+             || !add_dynamic_entry (DT_PLTREL, DT_REL)
+             || !add_dynamic_entry (DT_JMPREL, 0))

            return false;
        }
 
       if (relocs)
        {
            return false;
        }
 
       if (relocs)
        {

-         if (   ! bfd_elf32_add_dynamic_entry (info, DT_REL, 0)
-             || ! bfd_elf32_add_dynamic_entry (info, DT_RELSZ, 0)
-             || ! bfd_elf32_add_dynamic_entry (info, DT_RELENT,
-                                               sizeof (Elf32_External_Rel)))
+         if (   !add_dynamic_entry (DT_REL, 0)
+             || !add_dynamic_entry (DT_RELSZ, 0)
+             || !add_dynamic_entry (DT_RELENT, sizeof (Elf32_External_Rel)))

            return false;
        }
 
            return false;
        }
 

-      if (reltext)
+      if ((info->flags & DF_TEXTREL) != 0)

        {
        {

-         if (! bfd_elf32_add_dynamic_entry (info, DT_TEXTREL, 0))
+         if (!add_dynamic_entry (DT_TEXTREL, 0))

            return false;
          info->flags |= DF_TEXTREL;
        }
     }
            return false;
          info->flags |= DF_TEXTREL;
        }
     }

+#undef add_synamic_entry

 
   return true;
 }
 
   return true;
 }


@@ -3134,9 +3216,12 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
       got_offset = (plt_index + 3) * 4;
 
       /* Fill in the entry in the procedure linkage table.  */
       got_offset = (plt_index + 3) * 4;
 
       /* Fill in the entry in the procedure linkage table.  */

-      memcpy (splt->contents + h->plt.offset,
-              elf32_arm_plt_entry,
-             PLT_ENTRY_SIZE);
+      bfd_put_32 (output_bfd, elf32_arm_plt_entry[0],
+                 splt->contents + h->plt.offset + 0);
+      bfd_put_32 (output_bfd, elf32_arm_plt_entry[1],
+                 splt->contents + h->plt.offset + 4);
+      bfd_put_32 (output_bfd, elf32_arm_plt_entry[2],
+                 splt->contents + h->plt.offset + 8);

       bfd_put_32 (output_bfd,
                      (sgot->output_section->vma
                       + sgot->output_offset
       bfd_put_32 (output_bfd,
                      (sgot->output_section->vma
                       + sgot->output_offset


@@ -3166,6 +3251,13 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
          /* Mark the symbol as undefined, rather than as defined in
             the .plt section.  Leave the value alone.  */
          sym->st_shndx = SHN_UNDEF;
          /* Mark the symbol as undefined, rather than as defined in
             the .plt section.  Leave the value alone.  */
          sym->st_shndx = SHN_UNDEF;

+         /* If the symbol is weak, we do need to clear the value.
+            Otherwise, the PLT entry would provide a definition for
+            the symbol even if the symbol wasn't defined anywhere,
+            and so the symbol would never be NULL.  */
+         if ((h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR_NONWEAK)
+             == 0)
+           sym->st_value = 0;

        }
     }
 
        }
     }
 


@@ -3183,7 +3275,7 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
 
       rel.r_offset = (sgot->output_section->vma
                      + sgot->output_offset
 
       rel.r_offset = (sgot->output_section->vma
                      + sgot->output_offset

-                     + (h->got.offset &~ 1));
+                     + (h->got.offset &~ (bfd_vma) 1));

 
       /* If this is a -Bsymbolic link, and the symbol is defined
         locally, we just want to emit a RELATIVE reloc.  The entry in
 
       /* If this is a -Bsymbolic link, and the symbol is defined
         locally, we just want to emit a RELATIVE reloc.  The entry in


@@ -3325,7 +3417,12 @@ elf32_arm_finish_dynamic_sections (output_bfd, info)
 
       /* Fill in the first entry in the procedure linkage table.  */
       if (splt->_raw_size > 0)
 
       /* Fill in the first entry in the procedure linkage table.  */
       if (splt->_raw_size > 0)

-       memcpy (splt->contents, elf32_arm_plt0_entry, PLT_ENTRY_SIZE);
+       {
+         bfd_put_32 (output_bfd, elf32_arm_plt0_entry[0], splt->contents +  0);
+         bfd_put_32 (output_bfd, elf32_arm_plt0_entry[1], splt->contents +  4);
+         bfd_put_32 (output_bfd, elf32_arm_plt0_entry[2], splt->contents +  8);
+         bfd_put_32 (output_bfd, elf32_arm_plt0_entry[3], splt->contents + 12);
+       }

 
       /* UnixWare sets the entsize of .plt to 4, although that doesn't
         really seem like the right value.  */
 
       /* UnixWare sets the entsize of .plt to 4, although that doesn't
         really seem like the right value.  */


@@ -3363,29 +3460,48 @@ elf32_arm_post_process_headers (abfd, link_info)
   i_ehdrp->e_ident[EI_ABIVERSION] = ARM_ELF_ABI_VERSION;
 }
 
   i_ehdrp->e_ident[EI_ABIVERSION] = ARM_ELF_ABI_VERSION;
 }
 

+static enum elf_reloc_type_class
+elf32_arm_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;
+{
+  switch ((int) ELF32_R_TYPE (rela->r_info))
+    {
+    case R_ARM_RELATIVE:
+      return reloc_class_relative;
+    case R_ARM_JUMP_SLOT:
+      return reloc_class_plt;
+    case R_ARM_COPY:
+      return reloc_class_copy;
+    default:
+      return reloc_class_normal;
+    }
+}
+
+

 #define ELF_ARCH                       bfd_arch_arm
 #define ELF_MACHINE_CODE               EM_ARM
 #define ELF_MAXPAGESIZE                        0x8000
 
 #define ELF_ARCH                       bfd_arch_arm
 #define ELF_MACHINE_CODE               EM_ARM
 #define ELF_MAXPAGESIZE                        0x8000
 

-#define bfd_elf32_bfd_copy_private_bfd_data    elf32_arm_copy_private_bfd_data
-#define bfd_elf32_bfd_merge_private_bfd_data   elf32_arm_merge_private_bfd_data
+#define bfd_elf32_bfd_copy_private_bfd_data    elf32_arm_copy_private_bfd_data
+#define bfd_elf32_bfd_merge_private_bfd_data   elf32_arm_merge_private_bfd_data

 #define bfd_elf32_bfd_set_private_flags                elf32_arm_set_private_flags
 #define bfd_elf32_bfd_print_private_bfd_data   elf32_arm_print_private_bfd_data
 #define bfd_elf32_bfd_link_hash_table_create    elf32_arm_link_hash_table_create
 #define bfd_elf32_bfd_set_private_flags                elf32_arm_set_private_flags
 #define bfd_elf32_bfd_print_private_bfd_data   elf32_arm_print_private_bfd_data
 #define bfd_elf32_bfd_link_hash_table_create    elf32_arm_link_hash_table_create

-#define bfd_elf32_bfd_reloc_type_lookup        elf32_arm_reloc_type_lookup
+#define bfd_elf32_bfd_reloc_type_lookup                elf32_arm_reloc_type_lookup

 #define bfd_elf32_find_nearest_line            elf32_arm_find_nearest_line
 
 #define elf_backend_get_symbol_type             elf32_arm_get_symbol_type
 #define elf_backend_gc_mark_hook                elf32_arm_gc_mark_hook
 #define elf_backend_gc_sweep_hook               elf32_arm_gc_sweep_hook
 #define elf_backend_check_relocs                elf32_arm_check_relocs
 #define bfd_elf32_find_nearest_line            elf32_arm_find_nearest_line
 
 #define elf_backend_get_symbol_type             elf32_arm_get_symbol_type
 #define elf_backend_gc_mark_hook                elf32_arm_gc_mark_hook
 #define elf_backend_gc_sweep_hook               elf32_arm_gc_sweep_hook
 #define elf_backend_check_relocs                elf32_arm_check_relocs

-#define elf_backend_relocate_section           elf32_arm_relocate_section
+#define elf_backend_relocate_section           elf32_arm_relocate_section

 #define elf_backend_adjust_dynamic_symbol      elf32_arm_adjust_dynamic_symbol
 #define elf_backend_create_dynamic_sections    _bfd_elf_create_dynamic_sections
 #define elf_backend_finish_dynamic_symbol      elf32_arm_finish_dynamic_symbol
 #define elf_backend_finish_dynamic_sections    elf32_arm_finish_dynamic_sections
 #define elf_backend_size_dynamic_sections      elf32_arm_size_dynamic_sections
 #define elf_backend_post_process_headers       elf32_arm_post_process_headers
 #define elf_backend_adjust_dynamic_symbol      elf32_arm_adjust_dynamic_symbol
 #define elf_backend_create_dynamic_sections    _bfd_elf_create_dynamic_sections
 #define elf_backend_finish_dynamic_symbol      elf32_arm_finish_dynamic_symbol
 #define elf_backend_finish_dynamic_sections    elf32_arm_finish_dynamic_sections
 #define elf_backend_size_dynamic_sections      elf32_arm_size_dynamic_sections
 #define elf_backend_post_process_headers       elf32_arm_post_process_headers

+#define elf_backend_reloc_type_class           elf32_arm_reloc_type_class

 
 #define elf_backend_can_gc_sections 1
 #define elf_backend_plt_readonly    1
 
 #define elf_backend_can_gc_sections 1
 #define elf_backend_plt_readonly    1