* Makefile.am (libbfd.h): Add "Extracted from.." comment.

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

diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index fcde30ec84c57221337af88c68bf4e091482028b..939eee5f48219673fea70c44786bd657845dc8d1 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, 2001 Free Software Foundation, Inc.
+   Copyright 1998, 1999, 2000, 2001, 2002 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,7 +35,7 @@ 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


@@ -92,7 +92,7 @@ boolean bfd_elf32_arm_get_bfd_for_interworking
 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
 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 ((int));
+  PARAMS ((const Elf_Internal_Rela *));

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


@@ -117,7 +117,7 @@ static enum elf_reloc_type_class elf32_arm_reloc_type_class
    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 unsigned long elf32_arm_plt0_entry [PLT_ENTRY_SIZE / 4] =
+static const bfd_vma elf32_arm_plt0_entry [PLT_ENTRY_SIZE / 4] =

   {
     0xe52de004,        /* str   lr, [sp, #-4]!     */
     0xe59fe010,        /* ldr   lr, [pc, #16]      */
   {
     0xe52de004,        /* str   lr, [sp, #-4]!     */
     0xe59fe010,        /* ldr   lr, [pc, #16]      */


@@ -127,7 +127,7 @@ static const unsigned long elf32_arm_plt0_entry [PLT_ENTRY_SIZE / 4] =
 
 /* Subsequent entries in a procedure linkage table look like
    this.  */
 
 /* Subsequent entries in a procedure linkage table look like
    this.  */

-static const unsigned long elf32_arm_plt_entry [PLT_ENTRY_SIZE / 4] =
+static const bfd_vma elf32_arm_plt_entry [PLT_ENTRY_SIZE / 4] =

  {
    0xe59fc004, /* ldr   ip, [pc, #4]       */
    0xe08fc00c, /* add   ip, pc, ip         */
  {
    0xe59fc004, /* ldr   ip, [pc, #4]       */
    0xe08fc00c, /* add   ip, pc, ip         */


@@ -184,10 +184,10 @@ struct elf32_arm_link_hash_table
     struct elf_link_hash_table root;
 
     /* The size in bytes of the section containg the Thumb-to-ARM glue.  */
     struct elf_link_hash_table root;
 
     /* The size in bytes of the section containg the Thumb-to-ARM glue.  */

-    long int thumb_glue_size;
+    bfd_size_type thumb_glue_size;

 
     /* The size in bytes of the section containg the ARM-to-Thumb glue.  */
 
     /* The size in bytes of the section containg the ARM-to-Thumb glue.  */

-    long int arm_glue_size;
+    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;


@@ -234,16 +234,16 @@ 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_malloc (amt);

   if (ret == (struct elf32_arm_link_hash_table *) NULL)
     return NULL;
 
   if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
                                      elf32_arm_link_hash_newfunc))
     {
   if (ret == (struct elf32_arm_link_hash_table *) NULL)
     return NULL;
 
   if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
                                      elf32_arm_link_hash_newfunc))
     {

-      bfd_release (abfd, ret);
+      free (ret);

       return NULL;
     }
 
       return NULL;
     }
 


@@ -270,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);
 


@@ -282,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);
 


@@ -305,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);
 


@@ -317,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);
 


@@ -383,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;


@@ -404,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;


@@ -420,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);
 


@@ -435,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);
 


@@ -455,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);
 


@@ -474,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);
 


@@ -490,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);
 


@@ -506,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);
 


@@ -521,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);
 


@@ -529,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);
 


@@ -541,31 +547,22 @@ record_thumb_to_arm_glue (link_info, h)
   return;
 }
 
   return;
 }
 

-/* Select a BFD to be used to hold the sections used by the glue code.
-   This function is called from the linker scripts in ld/emultempl/
-   {armelf/pe}.em  */
+/* Add the glue sections to ABFD.  This function is called from the
+   linker scripts in ld/emultempl/{armelf}.em.  */

 
 boolean
 
 boolean

-bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
+bfd_elf32_arm_add_glue_sections_to_bfd (abfd, info)

      bfd *abfd;
      struct bfd_link_info *info;
 {
      bfd *abfd;
      struct bfd_link_info *info;
 {

-  struct elf32_arm_link_hash_table *globals;

   flagword flags;
   asection *sec;
 
   flagword flags;
   asection *sec;
 

-  /* If we are only performing a partial link do not bother
-     getting a bfd to hold the glue.  */
+  /* If we are only performing a partial
+     link do not bother adding the glue.  */

   if (info->relocateable)
     return true;
 
   if (info->relocateable)
     return true;
 

-  globals = elf32_arm_hash_table (info);
-
-  BFD_ASSERT (globals != NULL);
-
-  if (globals->bfd_of_glue_owner != NULL)
-    return true;
-

   sec = bfd_get_section_by_name (abfd, ARM2THUMB_GLUE_SECTION_NAME);
 
   if (sec == NULL)
   sec = bfd_get_section_by_name (abfd, ARM2THUMB_GLUE_SECTION_NAME);
 
   if (sec == NULL)


@@ -603,6 +600,32 @@ bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
       sec->gc_mark = 1;
     }
 
       sec->gc_mark = 1;
     }
 

+  return true;
+}
+
+/* Select a BFD to be used to hold the sections used by the glue code.
+   This function is called from the linker scripts in ld/emultempl/
+   {armelf/pe}.em  */
+
+boolean
+bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
+     bfd *abfd;
+     struct bfd_link_info *info;
+{
+  struct elf32_arm_link_hash_table *globals;
+
+  /* If we are only performing a partial link
+     do not bother getting a bfd to hold the glue.  */
+  if (info->relocateable)
+    return true;
+
+  globals = elf32_arm_hash_table (info);
+
+  BFD_ASSERT (globals != NULL);
+
+  if (globals->bfd_of_glue_owner != NULL)
+    return true;
+

   /* Save the bfd for later use.  */
   globals->bfd_of_glue_owner = abfd;
 
   /* Save the bfd for later use.  */
   globals->bfd_of_glue_owner = abfd;
 


@@ -655,7 +678,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);
 


@@ -691,7 +714,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;
                }
            }


@@ -713,7 +736,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;
                }


@@ -846,7 +869,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;


@@ -876,12 +899,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;
        }


@@ -889,10 +912,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 =


@@ -911,7 +934,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);
     }
 


@@ -919,18 +942,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;


@@ -953,7 +975,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;


@@ -981,21 +1003,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.  */


@@ -1009,18 +1031,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;
 }


@@ -1041,7 +1062,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;


@@ -1112,6 +1133,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
       /* When generating a shared object, these relocations are copied
         into the output file to be resolved at run time.  */
       if (info->shared
       /* When generating a shared object, these relocations are copied
         into the output file to be resolved at run time.  */
       if (info->shared

+         && r_symndx != 0

          && (r_type != R_ARM_PC24
              || (h != NULL
                  && h->dynindx != -1
          && (r_type != R_ARM_PC24
              || (h != NULL
                  && h->dynindx != -1


@@ -1143,37 +1165,24 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
            }
 
          skip = false;
            }
 
          skip = false;

-
-         if (elf_section_data (input_section)->stab_info == NULL)
-           outrel.r_offset = rel->r_offset;
-         else
-           {
-             bfd_vma off;
-
-             off = (_bfd_stab_section_offset
-                    (output_bfd, &elf_hash_table (info)->stab_info,
-                     input_section,
-                     & elf_section_data (input_section)->stab_info,
-                     rel->r_offset));
-             if (off == (bfd_vma) -1)
-               skip = true;
-             outrel.r_offset = off;
-           }
-
+         relocate = false;
+
+         outrel.r_offset =
+           _bfd_elf_section_offset (output_bfd, info, input_section,
+                                    rel->r_offset);
+         if (outrel.r_offset == (bfd_vma) -1)
+           skip = true;
+         else if (outrel.r_offset == (bfd_vma) -2)
+           skip = true, relocate = true;

          outrel.r_offset += (input_section->output_section->vma
                              + input_section->output_offset);
 
          if (skip)
          outrel.r_offset += (input_section->output_section->vma
                              + input_section->output_offset);
 
          if (skip)

-           {
-             memset (&outrel, 0, sizeof outrel);
-             relocate = false;
-           }
+           memset (&outrel, 0, sizeof outrel);

          else if (r_type == R_ARM_PC24)
            {
              BFD_ASSERT (h != NULL && h->dynindx != -1);
          else if (r_type == R_ARM_PC24)
            {
              BFD_ASSERT (h != NULL && h->dynindx != -1);

-             if ((input_section->flags & SEC_ALLOC) != 0)
-               relocate = false;
-             else
+             if ((input_section->flags & SEC_ALLOC) == 0)

                relocate = true;
              outrel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_PC24);
            }
                relocate = true;
              outrel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_PC24);
            }


@@ -1190,9 +1199,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
              else
                {
                  BFD_ASSERT (h->dynindx != -1);
              else
                {
                  BFD_ASSERT (h->dynindx != -1);

-                 if ((input_section->flags & SEC_ALLOC) != 0)
-                   relocate = false;
-                 else
+                 if ((input_section->flags & SEC_ALLOC) == 0)

                    relocate = true;
                  outrel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_ABS32);
                }
                    relocate = true;
                  outrel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_ABS32);
                }


@@ -1227,10 +1234,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


@@ -1400,7 +1407,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
        boolean        overflow = false;
        bfd_vma        upper_insn = bfd_get_16 (input_bfd, hit_data);
        bfd_vma        lower_insn = bfd_get_16 (input_bfd, hit_data + 2);
        boolean        overflow = false;
        bfd_vma        upper_insn = bfd_get_16 (input_bfd, hit_data);
        bfd_vma        lower_insn = bfd_get_16 (input_bfd, hit_data + 2);

-       bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+       bfd_signed_vma reloc_signed_max = ((1 << (howto->bitsize - 1)) - 1) >> howto->rightshift;

        bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
        bfd_vma        check;
        bfd_signed_vma signed_check;
        bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
        bfd_vma        check;
        bfd_signed_vma signed_check;


@@ -1423,10 +1430,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


@@ -1481,22 +1488,19 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
        if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
          overflow = true;
 
        if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
          overflow = true;
 

-       /* Put RELOCATION back into the insn.  */
-       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))
 #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;
+         /* For a BLX instruction, make sure that the relocation is rounded up
+            to a word boundary.  This follows the semantics of the instruction
+            which specifies that bit 1 of the target address will come from bit
+            1 of the base address.  */
+         relocation = (relocation + 2) & ~ 3;

 #endif
 #endif

+       /* Put RELOCATION back into the insn.  */
+       upper_insn = (upper_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 12) & 0x7ff);
+       lower_insn = (lower_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 1) & 0x7ff);
+

        /* 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);


@@ -1505,6 +1509,47 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
       }
       break;
 
       }
       break;
 

+    case R_ARM_THM_PC11:
+      /* Thumb B (branch) instruction).  */
+      {
+       bfd_vma        relocation;
+       bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+       bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
+       bfd_vma        check;
+       bfd_signed_vma signed_check;
+
+#ifdef USE_REL
+       /* Need to refetch addend.  */
+       addend = bfd_get_16 (input_bfd, hit_data) & howto->src_mask;
+       /* ??? Need to determine shift amount from operand size.  */
+       addend >>= howto->rightshift;
+#endif
+       relocation = value + addend;
+
+       relocation -= (input_section->output_section->vma
+                      + input_section->output_offset
+                      + rel->r_offset);
+
+       check = relocation >> howto->rightshift;
+
+       /* If this is a signed value, the rightshift just
+          dropped leading 1 bits (assuming twos complement).  */
+       if ((bfd_signed_vma) relocation >= 0)
+         signed_check = check;
+       else
+         signed_check = check | ~((bfd_vma) -1 >> howto->rightshift);
+
+       relocation |= (bfd_get_16 (input_bfd, hit_data) & (~ howto->dst_mask));
+
+       bfd_put_16 (input_bfd, relocation, hit_data);
+
+       /* Assumes two's complement.  */
+       if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
+         return bfd_reloc_overflow;
+
+       return bfd_reloc_ok;
+      }
+

     case R_ARM_GNU_VTINHERIT:
     case R_ARM_GNU_VTENTRY:
       return bfd_reloc_ok;
     case R_ARM_GNU_VTINHERIT:
     case R_ARM_GNU_VTENTRY:
       return bfd_reloc_ok;


@@ -1529,6 +1574,12 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
       if (sgot == NULL)
         return bfd_reloc_notsupported;
 
       if (sgot == NULL)
         return bfd_reloc_notsupported;
 

+      /* If we are addressing a Thumb function, we need to adjust the
+        address by one, so that attempts to call the function pointer will
+        correctly interpret it as Thumb code.  */
+      if (sym_flags == STT_ARM_TFUNC)
+       value += 1;
+

       /* Note that sgot->output_offset is not involved in this
          calculation.  We always want the start of .got.  If we
          define _GLOBAL_OFFSET_TABLE in a different way, as is
       /* Note that sgot->output_offset is not involved in this
          calculation.  We always want the start of .got.  If we
          define _GLOBAL_OFFSET_TABLE in a different way, as is


@@ -1581,6 +1632,13 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
                off &= ~1;
              else
                {
                off &= ~1;
              else
                {

+                 /* If we are addressing a Thumb function, we need to
+                    adjust the address by one, so that attempts to
+                    call the function pointer will correctly
+                    interpret it as Thumb code.  */
+                 if (sym_flags == STT_ARM_TFUNC)
+                   value |= 1;
+

                  bfd_put_32 (output_bfd, value, sgot->contents + off);
                  h->got.offset |= 1;
                }
                  bfd_put_32 (output_bfd, value, sgot->contents + off);
                  h->got.offset |= 1;
                }


@@ -1722,8 +1780,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
     {


@@ -1751,7 +1809,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 ?  */
 


@@ -1786,6 +1844,11 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *           relend;
   const char *                  name;
 
   Elf_Internal_Rela *           relend;
   const char *                  name;
 

+#ifndef USE_REL
+  if (info->relocateable)
+    return true;
+#endif
+

   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
 
   symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
   sym_hashes = elf_sym_hashes (input_bfd);
 


@@ -1810,9 +1873,15 @@ 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;
 
       howto = bfd_reloc.howto;
 

+#ifdef USE_REL

       if (info->relocateable)
        {
          /* This is a relocateable link.  We don't have to change
       if (info->relocateable)
        {
          /* This is a relocateable link.  We don't have to change


@@ -1825,18 +1894,16 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
              if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
                {
                  sec = local_sections[r_symndx];
              if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
                {
                  sec = local_sections[r_symndx];

-#ifdef USE_REL

                  arm_add_to_rel (input_bfd, contents + rel->r_offset,
                  arm_add_to_rel (input_bfd, contents + rel->r_offset,

-                                 howto, sec->output_offset + sym->st_value);
-#else
-                 rel->r_addend += (sec->output_offset + sym->st_value)
-                   >> howto->rightshift;
-#endif
+                                 howto,
+                                 (bfd_signed_vma) (sec->output_offset
+                                                   + sym->st_value));

                }
            }
 
          continue;
        }
                }
            }
 
          continue;
        }

+#endif

 
       /* This is a final link.  */
       h = NULL;
 
       /* This is a final link.  */
       h = NULL;


@@ -1847,9 +1914,49 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
        {
          sym = local_syms + r_symndx;
          sec = local_sections[r_symndx];
        {
          sym = local_syms + r_symndx;
          sec = local_sections[r_symndx];

+#ifdef USE_REL

          relocation = (sec->output_section->vma
                        + sec->output_offset
                        + sym->st_value);
          relocation = (sec->output_section->vma
                        + sec->output_offset
                        + sym->st_value);

+         if ((sec->flags & SEC_MERGE)
+                  && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+           {
+             asection *msec;
+             bfd_vma addend, value;
+
+             if (howto->rightshift)
+               {
+                 (*_bfd_error_handler)
+                   (_("%s(%s+0x%lx): %s relocation against SEC_MERGE section"),
+                    bfd_archive_filename (input_bfd),
+                    bfd_get_section_name (input_bfd, input_section),
+                    (long) rel->r_offset, howto->name);
+                 return false;
+               }
+
+             value = bfd_get_32 (input_bfd, contents + rel->r_offset);
+
+             /* Get the (signed) value from the instruction.  */
+             addend = value & howto->src_mask;
+             if (addend & ((howto->src_mask + 1) >> 1))
+               {
+                 bfd_signed_vma mask;
+
+                 mask = -1;
+                 mask &= ~ howto->src_mask;
+                 addend |= mask;
+               }
+             msec = sec;
+             addend =
+               _bfd_elf_rel_local_sym (output_bfd, sym, &msec, addend)
+               - relocation;
+             addend += msec->output_section->vma + msec->output_offset;
+             value = (value & ~ howto->dst_mask) | (addend & howto->dst_mask);
+             bfd_put_32 (input_bfd, value, contents + rel->r_offset);
+           }
+#else
+         relocation = _bfd_elf_rela_local_sym (output_bfd, sym, sec, rel);
+#endif

        }
       else
        {
        }
       else
        {


@@ -1873,6 +1980,7 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                {
                case R_ARM_PC24:
                case R_ARM_ABS32:
                {
                case R_ARM_PC24:
                case R_ARM_ABS32:

+               case R_ARM_THM_PC22:

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


@@ -1913,8 +2021,10 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                  if (sec->output_section == NULL)
                    {
                      (*_bfd_error_handler)
                  if (sec->output_section == NULL)
                    {
                      (*_bfd_error_handler)

-                       (_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),
-                        bfd_get_filename (input_bfd), h->root.root.string,
+                       (_("%s: warning: unresolvable relocation %d against symbol `%s' from %s section"),
+                        bfd_archive_filename (input_bfd),
+                        r_type,
+                        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;
                    }


@@ -2027,13 +2137,13 @@ elf32_arm_set_private_flags (abfd, flags)
       if (EF_ARM_EABI_VERSION (flags) == EF_ARM_EABI_UNKNOWN)
        {
          if (flags & EF_ARM_INTERWORK)
       if (EF_ARM_EABI_VERSION (flags) == EF_ARM_EABI_UNKNOWN)
        {
          if (flags & EF_ARM_INTERWORK)

-           _bfd_error_handler (_("\
-Warning: Not setting interwork flag of %s since it has already been specified as non-interworking"),
-                               bfd_get_filename (abfd));
+           (*_bfd_error_handler) (_("\
+Warning: Not setting interworking flag of %s since it has already been specified as non-interworking"),
+                                  bfd_archive_filename (abfd));

          else
            _bfd_error_handler (_("\
          else
            _bfd_error_handler (_("\

-Warning: Clearing the interwork flag of %s due to outside request"),
-                               bfd_get_filename (abfd));
+Warning: Clearing the interworking flag of %s due to outside request"),
+                               bfd_archive_filename (abfd));

        }
     }
   else
        }
     }
   else


@@ -2080,8 +2190,9 @@ elf32_arm_copy_private_bfd_data (ibfd, obfd)
        {
          if (out_flags & EF_ARM_INTERWORK)
            _bfd_error_handler (_("\
        {
          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_get_filename (obfd), bfd_get_filename (ibfd));
+Warning: Clearing the interworking flag of %s because non-interworking code in %s has been linked with it"),
+                               bfd_get_filename (obfd),
+                               bfd_archive_filename (ibfd));

 
          in_flags &= ~EF_ARM_INTERWORK;
        }
 
          in_flags &= ~EF_ARM_INTERWORK;
        }


@@ -2174,11 +2285,11 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd)
   if (EF_ARM_EABI_VERSION (in_flags) != EF_ARM_EABI_VERSION (out_flags))
     {
       _bfd_error_handler (_("\
   if (EF_ARM_EABI_VERSION (in_flags) != EF_ARM_EABI_VERSION (out_flags))
     {
       _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);
+ERROR: %s is compiled for EABI version %d, whereas %s is compiled for version %d"),
+                         bfd_archive_filename (ibfd),
+                         (in_flags & EF_ARM_EABIMASK) >> 24,
+                         bfd_get_filename (obfd),
+                         (out_flags & EF_ARM_EABIMASK) >> 24);

       return false;
     }
 
       return false;
     }
 


@@ -2188,46 +2299,91 @@ Error: %s compiled for EABI version %d, whereas %s is compiled for version %d"),
       if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))
        {
          _bfd_error_handler (_("\
       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_get_filename (ibfd),
-                       in_flags & EF_ARM_APCS_26 ? 26 : 32,
-                       bfd_get_filename (obfd),
-                       out_flags & EF_ARM_APCS_26 ? 26 : 32);
+ERROR: %s is compiled for APCS-%d, whereas target %s uses APCS-%d"),
+                             bfd_archive_filename (ibfd),
+                             in_flags & EF_ARM_APCS_26 ? 26 : 32,
+                             bfd_get_filename (obfd),
+                             out_flags & EF_ARM_APCS_26 ? 26 : 32);

          flags_compatible = false;
        }
 
       if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
        {
          flags_compatible = false;
        }
 
       if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
        {

-         _bfd_error_handler (_("\
-Error: %s passes floats in %s registers, whereas %s passes them in %s registers"),
-                       bfd_get_filename (ibfd),
-                    in_flags & EF_ARM_APCS_FLOAT ? _("float") : _("integer"),
-                       bfd_get_filename (obfd),
-                     out_flags & EF_ARM_APCS_26 ? _("float") : _("integer"));
+         if (in_flags & EF_ARM_APCS_FLOAT)
+           _bfd_error_handler (_("\
+ERROR: %s passes floats in float registers, whereas %s passes them in integer registers"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
+         else
+           _bfd_error_handler (_("\
+ERROR: %s passes floats in integer registers, whereas %s passes them in float registers"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
+
+         flags_compatible = false;
+       }
+
+      if ((in_flags & EF_ARM_VFP_FLOAT) != (out_flags & EF_ARM_VFP_FLOAT))
+       {
+         if (in_flags & EF_ARM_VFP_FLOAT)
+           _bfd_error_handler (_("\
+ERROR: %s uses VFP instructions, whereas %s uses FPA instructions"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
+         else
+           _bfd_error_handler (_("\
+ERROR: %s uses FPA instructions, whereas %s uses VFP instructions"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
+

          flags_compatible = false;
        }
 
 #ifdef EF_ARM_SOFT_FLOAT
       if ((in_flags & EF_ARM_SOFT_FLOAT) != (out_flags & EF_ARM_SOFT_FLOAT))
        {
          flags_compatible = false;
        }
 
 #ifdef EF_ARM_SOFT_FLOAT
       if ((in_flags & EF_ARM_SOFT_FLOAT) != (out_flags & EF_ARM_SOFT_FLOAT))
        {

-         _bfd_error_handler (_ ("\
-Error: %s uses %s floating point, whereas %s uses %s floating point"),
-                             bfd_get_filename (ibfd),
-                             in_flags & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard"),
-                             bfd_get_filename (obfd),
-                             out_flags & EF_ARM_SOFT_FLOAT ? _("soft") : _("hard"));
-         flags_compatible = false;
+         /* We can allow interworking between code that is VFP format
+            layout, and uses either soft float or integer regs for
+            passing floating point arguments and results.  We already
+            know that the APCS_FLOAT flags match; similarly for VFP
+            flags.  */
+         if ((in_flags & EF_ARM_APCS_FLOAT) != 0
+             || (in_flags & EF_ARM_VFP_FLOAT) == 0)
+           {
+             if (in_flags & EF_ARM_SOFT_FLOAT)
+               _bfd_error_handler (_("\
+ERROR: %s uses software FP, whereas %s uses hardware FP"),
+                                   bfd_archive_filename (ibfd),
+                                   bfd_get_filename (obfd));
+             else
+               _bfd_error_handler (_("\
+ERROR: %s uses hardware FP, whereas %s uses software FP"),
+                                   bfd_archive_filename (ibfd),
+                                   bfd_get_filename (obfd));
+
+             flags_compatible = false;
+           }

        }
 #endif
 
       /* Interworking mismatch is only a warning.  */
       if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))
        }
 #endif
 
       /* Interworking mismatch is only a warning.  */
       if ((in_flags & EF_ARM_INTERWORK) != (out_flags & EF_ARM_INTERWORK))

-       _bfd_error_handler (_("\
-Warning: %s %s interworking, whereas %s %s"),
-                           bfd_get_filename (ibfd),
-                           in_flags & EF_ARM_INTERWORK ? _("supports") : _("does not support"),
-                           bfd_get_filename (obfd),
-                           out_flags & EF_ARM_INTERWORK ? _("does") : _("does not"));
+       {
+         if (in_flags & EF_ARM_INTERWORK)
+           {
+             _bfd_error_handler (_("\
+Warning: %s supports interworking, whereas %s does not"),
+                                 bfd_archive_filename (ibfd),
+                                 bfd_get_filename (obfd));
+           }
+         else
+           {
+             _bfd_error_handler (_("\
+Warning: %s does not support interworking, whereas %s does"),
+                                 bfd_archive_filename (ibfd),
+                                 bfd_get_filename (obfd));
+           }
+       }

     }
 
   return flags_compatible;
     }
 
   return flags_compatible;


@@ -2265,9 +2421,14 @@ elf32_arm_print_private_bfd_data (abfd, ptr)
        fprintf (file, _(" [interworking enabled]"));
 
       if (flags & EF_ARM_APCS_26)
        fprintf (file, _(" [interworking enabled]"));
 
       if (flags & EF_ARM_APCS_26)

-       fprintf (file, _(" [APCS-26]"));
+       fprintf (file, " [APCS-26]");
+      else
+       fprintf (file, " [APCS-32]");
+
+      if (flags & EF_ARM_VFP_FLOAT)
+       fprintf (file, _(" [VFP float format]"));

       else
       else

-       fprintf (file, _(" [APCS-32]"));
+       fprintf (file, _(" [FPA float format]"));

 
       if (flags & EF_ARM_APCS_FLOAT)
        fprintf (file, _(" [floats passed in float registers]"));
 
       if (flags & EF_ARM_APCS_FLOAT)
        fprintf (file, _(" [floats passed in float registers]"));


@@ -2284,8 +2445,9 @@ elf32_arm_print_private_bfd_data (abfd, ptr)
       if (flags & EF_ARM_SOFT_FLOAT)
        fprintf (file, _(" [software FP]"));
 
       if (flags & EF_ARM_SOFT_FLOAT)
        fprintf (file, _(" [software FP]"));
 

-      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);
+      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 | EF_ARM_VFP_FLOAT);

       break;
 
     case EF_ARM_EABI_VER1:
       break;
 
     case EF_ARM_EABI_VER1:


@@ -2399,14 +2561,9 @@ elf32_arm_gc_mark_hook (abfd, info, rel, h, sym)
      }
    else
      {
      }
    else
      {

-       if (!(elf_bad_symtab (abfd)
-           && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-         && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-                && sym->st_shndx != SHN_COMMON))
-          {
-            return bfd_section_from_elf_index (abfd, sym->st_shndx);
-          }
-      }
+       return bfd_section_from_elf_index (abfd, sym->st_shndx);
+     }
+

   return NULL;
 }
 
   return NULL;
 }
 


@@ -2541,10 +2698,11 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                    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;


@@ -2668,8 +2826,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;


@@ -3070,12 +3227,16 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
          asection ** spp;
 
          for (spp = &s->output_section->owner->sections;
          asection ** spp;
 
          for (spp = &s->output_section->owner->sections;

-              *spp != s->output_section;
+              *spp != NULL;

               spp = &(*spp)->next)
               spp = &(*spp)->next)

-           ;
-         *spp = s->output_section->next;
-         --s->output_section->owner->section_count;
-
+           {
+             if (*spp == s->output_section)
+               {
+                 bfd_section_list_remove (s->output_section->owner, spp);
+                 --s->output_section->owner->section_count;
+                 break;
+               }
+           }

          continue;
        }
 
          continue;
        }
 


@@ -3092,37 +3253,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;
        }
 
       if ((info->flags & DF_TEXTREL) != 0)
        {
            return false;
        }
 
       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;
 }


@@ -3141,6 +3305,9 @@ elf32_arm_discard_copies (h, ignore)
 {
   struct elf32_arm_pcrel_relocs_copied * s;
 
 {
   struct elf32_arm_pcrel_relocs_copied * s;
 

+  if (h->root.root.type == bfd_link_hash_warning)
+    h = (struct elf32_arm_link_hash_entry *) h->root.root.u.i.link;
+

   /* We only discard relocs for symbols defined in a regular object.  */
   if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
     return true;
   /* We only discard relocs for symbols defined in a regular object.  */
   if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
     return true;


@@ -3255,7 +3422,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


@@ -3441,10 +3608,10 @@ elf32_arm_post_process_headers (abfd, link_info)
 }
 
 static enum elf_reloc_type_class
 }
 
 static enum elf_reloc_type_class

-elf32_arm_reloc_type_class (type)
-     int type;
+elf32_arm_reloc_type_class (rela)
+     const Elf_Internal_Rela *rela;

 {
 {

-  switch (type)
+  switch ((int) ELF32_R_TYPE (rela->r_info))

     {
     case R_ARM_RELATIVE:
       return reloc_class_relative;
     {
     case R_ARM_RELATIVE:
       return reloc_class_relative;


@@ -3467,14 +3634,14 @@ elf32_arm_reloc_type_class (type)
 #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_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


@@ -3487,6 +3654,9 @@ elf32_arm_reloc_type_class (type)
 #define elf_backend_plt_readonly    1
 #define elf_backend_want_got_plt    1
 #define elf_backend_want_plt_sym    0
 #define elf_backend_plt_readonly    1
 #define elf_backend_want_got_plt    1
 #define elf_backend_want_plt_sym    0

+#ifndef USE_REL
+#define elf_backend_rela_normal     1
+#endif

 
 #define elf_backend_got_header_size    12
 #define elf_backend_plt_header_size    PLT_ENTRY_SIZE
 
 #define elf_backend_got_header_size    12
 #define elf_backend_plt_header_size    PLT_ENTRY_SIZE