2003-10-17 Jeff Johnston <jjohnstn@redhat.com>

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

diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index 838c24ff5564142a61b5629b568766bcdefd366d..a28c558f1db8d479926be97db86472375dde0191 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, 2003 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.
 


@@ -17,16 +17,20 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 

+#ifndef USE_REL
+#define USE_REL        0
+#endif
+

 typedef unsigned long int insn32;
 typedef unsigned short int insn16;
 
 typedef unsigned long int insn32;
 typedef unsigned short int insn16;
 

-static boolean elf32_arm_set_private_flags
+static bfd_boolean elf32_arm_set_private_flags

   PARAMS ((bfd *, flagword));
   PARAMS ((bfd *, flagword));

-static boolean elf32_arm_copy_private_bfd_data
+static bfd_boolean elf32_arm_copy_private_bfd_data

   PARAMS ((bfd *, bfd *));
   PARAMS ((bfd *, bfd *));

-static boolean elf32_arm_merge_private_bfd_data
+static bfd_boolean elf32_arm_merge_private_bfd_data

   PARAMS ((bfd *, bfd *));
   PARAMS ((bfd *, bfd *));

-static boolean elf32_arm_print_private_bfd_data
+static bfd_boolean elf32_arm_print_private_bfd_data

   PARAMS ((bfd *, PTR));
 static int elf32_arm_get_symbol_type
   PARAMS (( Elf_Internal_Sym *, int));
   PARAMS ((bfd *, PTR));
 static int elf32_arm_get_symbol_type
   PARAMS (( Elf_Internal_Sym *, int));


@@ -42,10 +46,6 @@ static struct elf_link_hash_entry *find_thumb_glue
   PARAMS ((struct bfd_link_info *, const char *, bfd *));
 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 struct elf_link_hash_entry *find_arm_glue
   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
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));

 static void elf32_arm_post_process_headers
   PARAMS ((bfd *, struct bfd_link_info *));
 static int elf32_arm_to_thumb_stub
 static void elf32_arm_post_process_headers
   PARAMS ((bfd *, struct bfd_link_info *));
 static int elf32_arm_to_thumb_stub


@@ -54,45 +54,54 @@ 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
+static bfd_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 *, 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 *,
+  PARAMS ((asection *, struct bfd_link_info *, Elf_Internal_Rela *,

           struct elf_link_hash_entry *, Elf_Internal_Sym *));
           struct elf_link_hash_entry *, Elf_Internal_Sym *));

-static boolean elf32_arm_gc_sweep_hook
+static bfd_boolean elf32_arm_gc_sweep_hook

   PARAMS ((bfd *, struct bfd_link_info *, asection *,
           const Elf_Internal_Rela *));
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
           const Elf_Internal_Rela *));

-static boolean elf32_arm_check_relocs
+static bfd_boolean elf32_arm_check_relocs

   PARAMS ((bfd *, struct bfd_link_info *, asection *,
           const Elf_Internal_Rela *));
   PARAMS ((bfd *, struct bfd_link_info *, asection *,
           const Elf_Internal_Rela *));

-static boolean elf32_arm_find_nearest_line
+static bfd_boolean elf32_arm_find_nearest_line

   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
           const char **, unsigned int *));
   PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
           const char **, unsigned int *));

-static boolean elf32_arm_adjust_dynamic_symbol
+static bfd_boolean elf32_arm_adjust_dynamic_symbol

   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
   PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));

-static boolean elf32_arm_size_dynamic_sections
+static bfd_boolean elf32_arm_size_dynamic_sections

   PARAMS ((bfd *, struct bfd_link_info *));
   PARAMS ((bfd *, struct bfd_link_info *));

-static boolean elf32_arm_finish_dynamic_symbol
+static bfd_boolean elf32_arm_finish_dynamic_symbol

   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
           Elf_Internal_Sym *));
   PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
           Elf_Internal_Sym *));

-static boolean elf32_arm_finish_dynamic_sections
+static bfd_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 *));
   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
+#if USE_REL

 static void arm_add_to_rel
   PARAMS ((bfd *, bfd_byte *, reloc_howto_type *, bfd_signed_vma));
 #endif
 static void arm_add_to_rel
   PARAMS ((bfd *, bfd_byte *, reloc_howto_type *, bfd_signed_vma));
 #endif

+static enum elf_reloc_type_class elf32_arm_reloc_type_class
+  PARAMS ((const Elf_Internal_Rela *));
+static bfd_boolean elf32_arm_object_p
+  PARAMS ((bfd *));

 
 

-boolean bfd_elf32_arm_allocate_interworking_sections
+#ifndef ELFARM_NABI_C_INCLUDED
+static void record_arm_to_thumb_glue
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+static void record_thumb_to_arm_glue
+  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
+bfd_boolean bfd_elf32_arm_allocate_interworking_sections

   PARAMS ((struct bfd_link_info *));
   PARAMS ((struct bfd_link_info *));

-boolean bfd_elf32_arm_get_bfd_for_interworking
+bfd_boolean bfd_elf32_arm_get_bfd_for_interworking

   PARAMS ((bfd *, struct bfd_link_info *));
   PARAMS ((bfd *, struct bfd_link_info *));

-boolean bfd_elf32_arm_process_before_allocation
+bfd_boolean bfd_elf32_arm_process_before_allocation

   PARAMS ((bfd *, struct bfd_link_info *, int));
   PARAMS ((bfd *, struct bfd_link_info *, int));

-static enum elf_reloc_type_class elf32_arm_reloc_type_class
-  PARAMS ((const Elf_Internal_Rela *));
+#endif
+

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


@@ -163,14 +172,14 @@ struct elf32_arm_link_hash_entry
   };
 
 /* Declare this now that the above structures are defined.  */
   };
 
 /* Declare this now that the above structures are defined.  */

-static boolean elf32_arm_discard_copies
+static bfd_boolean elf32_arm_discard_copies

   PARAMS ((struct elf32_arm_link_hash_entry *, PTR));
 
 /* Traverse an arm ELF linker hash table.  */
 #define elf32_arm_link_hash_traverse(table, func, info)                        \
   (elf_link_hash_traverse                                              \
    (&(table)->root,                                                    \
   PARAMS ((struct elf32_arm_link_hash_entry *, PTR));
 
 /* Traverse an arm ELF linker hash table.  */
 #define elf32_arm_link_hash_traverse(table, func, info)                        \
   (elf_link_hash_traverse                                              \
    (&(table)->root,                                                    \

-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \
+    (bfd_boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func), \

     (info)))
 
 /* Get the ARM elf linker hash table from a link_info structure.  */
     (info)))
 
 /* Get the ARM elf linker hash table from a link_info structure.  */


@@ -236,14 +245,14 @@ elf32_arm_link_hash_table_create (abfd)
   struct elf32_arm_link_hash_table *ret;
   bfd_size_type amt = sizeof (struct elf32_arm_link_hash_table);
 
   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, amt);
+  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;
     }
 


@@ -278,7 +287,7 @@ find_thumb_glue (link_info, name, input_bfd)
   sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
 
   hash = elf_link_hash_lookup
   sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
 
   hash = elf_link_hash_lookup

-    (&(hash_table)->root, tmp_name, false, false, true);
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);

 
   if (hash == NULL)
     /* xgettext:c-format */
 
   if (hash == NULL)
     /* xgettext:c-format */


@@ -313,7 +322,7 @@ find_arm_glue (link_info, name, input_bfd)
   sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
 
   myh = elf_link_hash_lookup
   sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
 
   myh = elf_link_hash_lookup

-    (&(hash_table)->root, tmp_name, false, false, true);
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);

 
   if (myh == NULL)
     /* xgettext:c-format */
 
   if (myh == NULL)
     /* xgettext:c-format */


@@ -360,14 +369,8 @@ static const insn16 t2a1_bx_pc_insn = 0x4778;
 static const insn16 t2a2_noop_insn = 0x46c0;
 static const insn32 t2a3_b_insn = 0xea000000;
 
 static const insn16 t2a2_noop_insn = 0x46c0;
 static const insn32 t2a3_b_insn = 0xea000000;
 

-static const insn16 t2a1_push_insn = 0xb540;
-static const insn16 t2a2_ldr_insn = 0x4e03;
-static const insn16 t2a3_mov_insn = 0x46fe;
-static const insn16 t2a4_bx_insn = 0x4730;
-static const insn32 t2a5_pop_insn = 0xe8bd4040;
-static const insn32 t2a6_bx_insn = 0xe12fff1e;
-
-boolean
+#ifndef ELFARM_NABI_C_INCLUDED
+bfd_boolean

 bfd_elf32_arm_allocate_interworking_sections (info)
      struct bfd_link_info * info;
 {
 bfd_elf32_arm_allocate_interworking_sections (info)
      struct bfd_link_info * info;
 {


@@ -411,7 +414,7 @@ bfd_elf32_arm_allocate_interworking_sections (info)
       s->contents = foo;
     }
 
       s->contents = foo;
     }
 

-  return true;
+  return TRUE;

 }
 
 static void
 }
 
 static void


@@ -423,6 +426,7 @@ record_arm_to_thumb_glue (link_info, h)
   asection * s;
   char * tmp_name;
   struct elf_link_hash_entry * myh;
   asection * s;
   char * tmp_name;
   struct elf_link_hash_entry * myh;

+  struct bfd_link_hash_entry * bh;

   struct elf32_arm_link_hash_table * globals;
   bfd_vma val;
 
   struct elf32_arm_link_hash_table * globals;
   bfd_vma val;
 


@@ -444,7 +448,7 @@ record_arm_to_thumb_glue (link_info, h)
   sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
 
   myh = elf_link_hash_lookup
   sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
 
   myh = elf_link_hash_lookup

-    (&(globals)->root, tmp_name, false, false, true);
+    (&(globals)->root, tmp_name, FALSE, FALSE, TRUE);

 
   if (myh != NULL)
     {
 
   if (myh != NULL)
     {


@@ -456,11 +460,11 @@ 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.  */

+  bh = NULL;

   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,
   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, &bh);

 
   free (tmp_name);
 
 
   free (tmp_name);
 


@@ -478,6 +482,7 @@ record_thumb_to_arm_glue (link_info, h)
   asection *s;
   char *tmp_name;
   struct elf_link_hash_entry *myh;
   asection *s;
   char *tmp_name;
   struct elf_link_hash_entry *myh;

+  struct bfd_link_hash_entry *bh;

   struct elf32_arm_link_hash_table *hash_table;
   char bind;
   bfd_vma val;
   struct elf32_arm_link_hash_table *hash_table;
   char bind;
   bfd_vma val;


@@ -500,7 +505,7 @@ record_thumb_to_arm_glue (link_info, h)
   sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
 
   myh = elf_link_hash_lookup
   sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
 
   myh = elf_link_hash_lookup

-    (&(hash_table)->root, tmp_name, false, false, true);
+    (&(hash_table)->root, tmp_name, FALSE, FALSE, TRUE);

 
   if (myh != NULL)
     {
 
   if (myh != NULL)
     {


@@ -509,13 +514,14 @@ record_thumb_to_arm_glue (link_info, h)
       return;
     }
 
       return;
     }
 

+  bh = NULL;

   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,
   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, &bh);

 
   /* If we mark it 'Thumb', the disassembler will do a better job.  */
 
   /* If we mark it 'Thumb', the disassembler will do a better job.  */

+  myh = (struct elf_link_hash_entry *) bh;

   bind = ELF_ST_BIND (myh->type);
   myh->type = ELF_ST_INFO (bind, STT_ARM_TFUNC);
 
   bind = ELF_ST_BIND (myh->type);
   myh->type = ELF_ST_INFO (bind, STT_ARM_TFUNC);
 


@@ -532,13 +538,11 @@ record_thumb_to_arm_glue (link_info, h)
 
   sprintf (tmp_name, CHANGE_TO_ARM, name);
 
 
   sprintf (tmp_name, CHANGE_TO_ARM, name);
 

-  myh = NULL;
-
+  bh = NULL;

   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,
   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, &bh);

 
   free (tmp_name);
 
 
   free (tmp_name);
 


@@ -547,30 +551,21 @@ 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
-bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
+bfd_boolean
+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 (info->relocateable)
-    return true;
-
-  globals = elf32_arm_hash_table (info);
-
-  BFD_ASSERT (globals != NULL);
-
-  if (globals->bfd_of_glue_owner != NULL)
-    return true;
+  /* If we are only performing a partial
+     link do not bother adding the glue.  */
+  if (info->relocatable)
+    return TRUE;

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


@@ -586,7 +581,7 @@ bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
       if (sec == NULL
          || !bfd_set_section_flags (abfd, sec, flags)
          || !bfd_set_section_alignment (abfd, sec, 2))
       if (sec == NULL
          || !bfd_set_section_flags (abfd, sec, flags)
          || !bfd_set_section_alignment (abfd, sec, 2))

-       return false;
+       return FALSE;

 
       /* Set the gc mark to prevent the section from being removed by garbage
         collection, despite the fact that no relocs refer to this section.  */
 
       /* Set the gc mark to prevent the section from being removed by garbage
         collection, despite the fact that no relocs refer to this section.  */


@@ -604,38 +599,61 @@ bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
       if (sec == NULL
          || !bfd_set_section_flags (abfd, sec, flags)
          || !bfd_set_section_alignment (abfd, sec, 2))
       if (sec == NULL
          || !bfd_set_section_flags (abfd, sec, flags)
          || !bfd_set_section_alignment (abfd, sec, 2))

-       return false;
+       return FALSE;

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

-  return true;
+  return TRUE;

 }
 
 }
 

-boolean
+bfd_boolean

 bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
      bfd *abfd;
      struct bfd_link_info *link_info;
      int no_pipeline_knowledge;
 {
   Elf_Internal_Shdr *symtab_hdr;
 bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
      bfd *abfd;
      struct bfd_link_info *link_info;
      int no_pipeline_knowledge;
 {
   Elf_Internal_Shdr *symtab_hdr;

-  Elf_Internal_Rela *free_relocs = NULL;
+  Elf_Internal_Rela *internal_relocs = NULL;

   Elf_Internal_Rela *irel, *irelend;
   bfd_byte *contents = NULL;
   Elf_Internal_Rela *irel, *irelend;
   bfd_byte *contents = NULL;

-  bfd_byte *free_contents = NULL;
-  Elf32_External_Sym *extsyms = NULL;
-  Elf32_External_Sym *free_extsyms = NULL;

 
   asection *sec;
   struct elf32_arm_link_hash_table *globals;
 
   /* If we are only performing a partial link do not bother
      to construct any glue.  */
 
   asection *sec;
   struct elf32_arm_link_hash_table *globals;
 
   /* If we are only performing a partial link do not bother
      to construct any glue.  */

-  if (link_info->relocateable)
-    return true;
+  if (link_info->relocatable)
+    return TRUE;

 
   /* Here we have a bfd that is to be included on the link.  We have a hook
      to do reloc rummaging, before section sizes are nailed down.  */
 
   /* Here we have a bfd that is to be included on the link.  We have a hook
      to do reloc rummaging, before section sizes are nailed down.  */


@@ -650,7 +668,7 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
   sec = abfd->sections;
 
   if (sec == NULL)
   sec = abfd->sections;
 
   if (sec == NULL)

-    return true;
+    return TRUE;

 
   for (; sec != NULL; sec = sec->next)
     {
 
   for (; sec != NULL; sec = sec->next)
     {


@@ -660,13 +678,15 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
       symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
 
       /* Load the relocs.  */
       symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
 
       /* Load the relocs.  */

-      irel = (_bfd_elf32_link_read_relocs (abfd, sec, (PTR) NULL,
-                                          (Elf_Internal_Rela *) NULL, false));
+      internal_relocs
+       = _bfd_elf_link_read_relocs (abfd, sec, (PTR) NULL,
+                                    (Elf_Internal_Rela *) NULL, FALSE);

 
 

-      BFD_ASSERT (irel != 0);
+      if (internal_relocs == NULL)
+       goto error_return;

 
 

-      irelend = irel + sec->reloc_count;
-      for (; irel < irelend; irel++)
+      irelend = internal_relocs + sec->reloc_count;
+      for (irel = internal_relocs; irel < irelend; irel++)

        {
          long r_type;
          unsigned long r_index;
        {
          long r_type;
          unsigned long r_index;


@@ -694,37 +714,12 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
                  if (contents == NULL)
                    goto error_return;
 
                  if (contents == NULL)
                    goto error_return;
 

-                 free_contents = contents;
-

                  if (!bfd_get_section_contents (abfd, sec, contents,
                                                 (file_ptr) 0, sec->_raw_size))
                    goto error_return;
                }
            }
 
                  if (!bfd_get_section_contents (abfd, sec, contents,
                                                 (file_ptr) 0, sec->_raw_size))
                    goto error_return;
                }
            }
 

-         /* Read this BFD's symbols if we haven't done so already.  */
-         if (extsyms == NULL)
-           {
-             /* Get cached copy if it exists.  */
-             if (symtab_hdr->contents != NULL)
-               extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-             else
-               {
-                 /* Go get them off disk.  */
-                 extsyms = ((Elf32_External_Sym *)
-                            bfd_malloc (symtab_hdr->sh_size));
-                 if (extsyms == NULL)
-                   goto error_return;
-
-                 free_extsyms = extsyms;
-
-                 if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-                     || (bfd_bread (extsyms, symtab_hdr->sh_size, abfd)
-                         != symtab_hdr->sh_size))
-                   goto error_return;
-               }
-           }
-

          /* If the relocation is not against a symbol it cannot concern us.  */
          h = NULL;
 
          /* If the relocation is not against a symbol it cannot concern us.  */
          h = NULL;
 


@@ -764,20 +759,31 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
              break;
            }
        }
              break;
            }
        }

+
+      if (contents != NULL
+         && elf_section_data (sec)->this_hdr.contents != contents)
+       free (contents);
+      contents = NULL;
+
+      if (internal_relocs != NULL
+         && elf_section_data (sec)->relocs != internal_relocs)
+       free (internal_relocs);
+      internal_relocs = NULL;

     }
 
     }
 

-  return true;
+  return TRUE;

 
 error_return:
 
 error_return:

-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  if (free_extsyms != NULL)
-    free (free_extsyms);
-
-  return false;
+  if (contents != NULL
+      && elf_section_data (sec)->this_hdr.contents != contents)
+    free (contents);
+  if (internal_relocs != NULL
+      && elf_section_data (sec)->relocs != internal_relocs)
+    free (internal_relocs);
+
+  return FALSE;

 }
 }

+#endif

 
 /* The thumb form of a long branch is a bit finicky, because the offset
    encoding is split over two fields, each in it's own instruction. They
 
 /* The thumb form of a long branch is a bit finicky, because the offset
    encoding is split over two fields, each in it's own instruction. They


@@ -860,7 +866,7 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
 
   myh = find_thumb_glue (info, name, input_bfd);
   if (myh == NULL)
 
   myh = find_thumb_glue (info, name, input_bfd);
   if (myh == NULL)

-    return false;
+    return FALSE;

 
   globals = elf32_arm_hash_table (info);
 
 
   globals = elf32_arm_hash_table (info);
 


@@ -889,7 +895,7 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
            (_("  first occurrence: %s: thumb call to arm"),
             bfd_archive_filename (input_bfd));
 
            (_("  first occurrence: %s: thumb call to arm"),
             bfd_archive_filename (input_bfd));
 

-         return false;
+         return FALSE;

        }
 
       --my_offset;
        }
 
       --my_offset;


@@ -923,13 +929,16 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
 
   BFD_ASSERT (my_offset <= globals->thumb_glue_size);
 
 
   BFD_ASSERT (my_offset <= globals->thumb_glue_size);
 

-  /* 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);
+  /* Now go back and fix up the original BL insn to point to here.  */
+  ret_offset =
+    /* Address of where the stub is located.  */
+    (s->output_section->vma + s->output_offset + my_offset)
+     /* Address of where the BL is located.  */
+    - (input_section->output_section->vma + input_section->output_offset + offset)
+    /* Addend in the relocation.  */
+    - addend
+    /* Biassing for PC-relative addressing.  */
+    - 8;

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


@@ -938,7 +947,7 @@ elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
              (bfd_vma) insert_thumb_branch (tmp, ret_offset),
              hit_data - input_section->vma);
 
              (bfd_vma) insert_thumb_branch (tmp, ret_offset),
              hit_data - input_section->vma);
 

-  return true;
+  return TRUE;

 }
 
 /* Arm code calling a Thumb function.  */
 }
 
 /* Arm code calling a Thumb function.  */


@@ -966,7 +975,7 @@ elf32_arm_to_thumb_stub (info, name, input_bfd, output_bfd, input_section,
 
   myh = find_arm_glue (info, name, input_bfd);
   if (myh == NULL)
 
   myh = find_arm_glue (info, name, input_bfd);
   if (myh == NULL)

-    return false;
+    return FALSE;

 
   globals = elf32_arm_hash_table (info);
 
 
   globals = elf32_arm_hash_table (info);
 


@@ -1026,9 +1035,21 @@ elf32_arm_to_thumb_stub (info, name, input_bfd, output_bfd, input_section,
 
   bfd_put_32 (output_bfd, (bfd_vma) tmp, hit_data - input_section->vma);
 
 
   bfd_put_32 (output_bfd, (bfd_vma) tmp, hit_data - input_section->vma);
 

-  return true;
+  return TRUE;

 }
 
 }
 

+/* This is the condition under which elf32_arm_finish_dynamic_symbol
+   will be called from elflink.h.  If elflink.h doesn't call our
+   finish_dynamic_symbol routine, we'll need to do something about
+   initializing any .plt and .got entries in elf32_arm_relocate_section
+   and elf32_arm_final_link_relocate.  */
+#define WILL_CALL_FINISH_DYNAMIC_SYMBOL(DYN, SHARED, H)                        \
+  ((DYN)                                                               \
+   && ((SHARED)                                                                \
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)     \
+   && ((H)->dynindx != -1                                              \
+       || ((H)->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0))
+

 /* Perform a relocation as part of a final link.  */
 
 static bfd_reloc_status_type
 /* Perform a relocation as part of a final link.  */
 
 static bfd_reloc_status_type


@@ -1087,7 +1108,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
   local_got_offsets = elf_local_got_offsets (input_bfd);
   r_symndx = ELF32_R_SYM (rel->r_info);
 
   local_got_offsets = elf_local_got_offsets (input_bfd);
   r_symndx = ELF32_R_SYM (rel->r_info);
 

-#ifdef USE_REL
+#if USE_REL

   addend = bfd_get_32 (input_bfd, hit_data) & howto->src_mask;
 
   if (addend & ((howto->src_mask + 1) >> 1))
   addend = bfd_get_32 (input_bfd, hit_data) & howto->src_mask;
 
   if (addend & ((howto->src_mask + 1) >> 1))


@@ -1116,6 +1137,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


@@ -1123,8 +1145,9 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
                      || (h->elf_link_hash_flags
                          & ELF_LINK_HASH_DEF_REGULAR) == 0))))
        {
                      || (h->elf_link_hash_flags
                          & ELF_LINK_HASH_DEF_REGULAR) == 0))))
        {

-         Elf_Internal_Rel outrel;
-         boolean skip, relocate;
+         Elf_Internal_Rela outrel;
+         bfd_byte *loc;
+         bfd_boolean skip, relocate;

 
          if (sreloc == NULL)
            {
 
          if (sreloc == NULL)
            {


@@ -1146,39 +1169,26 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
              BFD_ASSERT (sreloc != NULL);
            }
 
              BFD_ASSERT (sreloc != NULL);
            }
 

-         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;
-           }
+         skip = FALSE;
+         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
-               relocate = true;
+             if ((input_section->flags & SEC_ALLOC) == 0)
+               relocate = TRUE;

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


@@ -1188,25 +1198,21 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
                      && (h->elf_link_hash_flags
                          & ELF_LINK_HASH_DEF_REGULAR) != 0))
                {
                      && (h->elf_link_hash_flags
                          & ELF_LINK_HASH_DEF_REGULAR) != 0))
                {

-                 relocate = true;
+                 relocate = TRUE;

                  outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
                }
              else
                {
                  BFD_ASSERT (h->dynindx != -1);
                  outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
                }
              else
                {
                  BFD_ASSERT (h->dynindx != -1);

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

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

-         bfd_elf32_swap_reloc_out (output_bfd, &outrel,
-                                   (((Elf32_External_Rel *)
-                                     sreloc->contents)
-                                    + sreloc->reloc_count));
-         ++sreloc->reloc_count;
+         loc = sreloc->contents;
+         loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rel);
+         bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);

 
          /* If this reloc is against an external symbol, we do not want to
             fiddle with the addend.  Otherwise, we need to include the symbol
 
          /* If this reloc is against an external symbol, we do not want to
             fiddle with the addend.  Otherwise, we need to include the symbol


@@ -1377,7 +1383,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 
     case R_ARM_THM_ABS5:
       /* Support ldr and str instructions for the thumb.  */
 
     case R_ARM_THM_ABS5:
       /* Support ldr and str instructions for the thumb.  */

-#ifdef USE_REL
+#if 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.  */
       /* Need to refetch addend.  */
       addend = bfd_get_16 (input_bfd, hit_data) & howto->src_mask;
       /* ??? Need to determine shift amount from operand size.  */


@@ -1400,16 +1406,16 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
     case R_ARM_THM_PC22:
       /* Thumb BL (branch long instruction).  */
       {
     case R_ARM_THM_PC22:
       /* Thumb BL (branch long instruction).  */
       {

-       bfd_vma        relocation;
-       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_vma relocation;
+       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);
+       bfd_signed_vma reloc_signed_max = ((1 << (howto->bitsize - 1)) - 1) >> howto->rightshift;

        bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
        bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;

-       bfd_vma        check;
+       bfd_vma check;

        bfd_signed_vma signed_check;
 
        bfd_signed_vma signed_check;
 

-#ifdef USE_REL
+#if USE_REL

        /* Need to refetch the addend and squish the two 11 bit pieces
           together.  */
        {
        /* Need to refetch the addend and squish the two 11 bit pieces
           together.  */
        {


@@ -1483,24 +1489,21 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 
        /* Assumes two's complement.  */
        if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
 
        /* Assumes two's complement.  */
        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);
+         overflow = TRUE;

 
 #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);


@@ -1509,6 +1512,50 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
       }
       break;
 
       }
       break;
 

+    case R_ARM_THM_PC11:
+      /* Thumb B (branch) instruction).  */
+      {
+       bfd_signed_vma relocation;
+       bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
+       bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
+       bfd_signed_vma signed_check;
+
+#if USE_REL
+       /* Need to refetch addend.  */
+       addend = bfd_get_16 (input_bfd, hit_data) & howto->src_mask;
+       if (addend & ((howto->src_mask + 1) >> 1))
+         {
+           signed_addend = -1;
+           signed_addend &= ~ howto->src_mask;
+           signed_addend |= addend;
+         }
+       else
+         signed_addend = addend;
+       /* The value in the insn has been right shifted.  We need to
+          undo this, so that we can perform the address calculation
+          in terms of bytes.  */
+       signed_addend <<= howto->rightshift;
+#endif
+       relocation = value + signed_addend;
+
+       relocation -= (input_section->output_section->vma
+                      + input_section->output_offset
+                      + rel->r_offset);
+
+       relocation >>= howto->rightshift;
+       signed_check = relocation;
+       relocation &= howto->dst_mask;
+       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;


@@ -1533,6 +1580,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


@@ -1564,13 +1617,16 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
       if (h != NULL)
        {
          bfd_vma off;
       if (h != NULL)
        {
          bfd_vma off;

+         bfd_boolean dyn = elf_hash_table (info)->dynamic_sections_created;

 
          off = h->got.offset;
          BFD_ASSERT (off != (bfd_vma) -1);
 
 
          off = h->got.offset;
          BFD_ASSERT (off != (bfd_vma) -1);
 

-         if (!elf_hash_table (info)->dynamic_sections_created ||
-             (info->shared && (info->symbolic || h->dynindx == -1)
-              && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
+         if (!WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h)
+             || (info->shared
+                 && (info->symbolic || h->dynindx == -1
+                     || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL))
+                 && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))

            {
              /* This is actually a static link, or it is a -Bsymbolic link
                 and the symbol is defined locally.  We must initialize this
            {
              /* This is actually a static link, or it is a -Bsymbolic link
                 and the symbol is defined locally.  We must initialize this


@@ -1585,6 +1641,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;
                }


@@ -1613,7 +1676,8 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
              if (info->shared)
                {
                  asection * srelgot;
              if (info->shared)
                {
                  asection * srelgot;

-                 Elf_Internal_Rel outrel;
+                 Elf_Internal_Rela outrel;
+                 bfd_byte *loc;

 
                  srelgot = bfd_get_section_by_name (dynobj, ".rel.got");
                  BFD_ASSERT (srelgot != NULL);
 
                  srelgot = bfd_get_section_by_name (dynobj, ".rel.got");
                  BFD_ASSERT (srelgot != NULL);


@@ -1622,11 +1686,9 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
                                     + sgot->output_offset
                                     + off);
                  outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
                                     + sgot->output_offset
                                     + off);
                  outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);

-                 bfd_elf32_swap_reloc_out (output_bfd, &outrel,
-                                           (((Elf32_External_Rel *)
-                                             srelgot->contents)
-                                            + srelgot->reloc_count));
-                 ++srelgot->reloc_count;
+                 loc = srelgot->contents;
+                 loc += srelgot->reloc_count++ * sizeof (Elf32_External_Rel);
+                 bfd_elf32_swap_reloc_out (output_bfd, &outrel, loc);

                }
 
              local_got_offsets[r_symndx] |= 1;
                }
 
              local_got_offsets[r_symndx] |= 1;


@@ -1698,7 +1760,7 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
     }
 }
 
     }
 }
 

-#ifdef USE_REL
+#if USE_REL

 /* Add INCREMENT to the reloc (of type HOWTO) at ADDRESS.  */
 static void
 arm_add_to_rel (abfd, address, howto, increment)
 /* Add INCREMENT to the reloc (of type HOWTO) at ADDRESS.  */
 static void
 arm_add_to_rel (abfd, address, howto, increment)


@@ -1772,23 +1834,28 @@ arm_add_to_rel (abfd, address, howto, increment)
 #endif /* USE_REL */
 
 /* Relocate an ARM ELF section.  */
 #endif /* USE_REL */
 
 /* Relocate an ARM ELF section.  */

-static boolean
+static bfd_boolean

 elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                            contents, relocs, local_syms, local_sections)
 elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                            contents, relocs, local_syms, local_sections)

-     bfd *                  output_bfd;
-     struct bfd_link_info * info;
-     bfd *                  input_bfd;
-     asection *             input_section;
-     bfd_byte *             contents;
-     Elf_Internal_Rela *    relocs;
-     Elf_Internal_Sym *     local_syms;
-     asection **            local_sections;
+     bfd *output_bfd;
+     struct bfd_link_info *info;
+     bfd *input_bfd;
+     asection *input_section;
+     bfd_byte *contents;
+     Elf_Internal_Rela *relocs;
+     Elf_Internal_Sym *local_syms;
+     asection **local_sections;

 {
 {

-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
-  const char *                  name;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  Elf_Internal_Rela *rel;
+  Elf_Internal_Rela *relend;
+  const char *name;
+
+#if !USE_REL
+  if (info->relocatable)
+    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);


@@ -1814,17 +1881,13 @@ 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;
 

-      if (info->relocateable)
+#if USE_REL
+      if (info->relocatable)

        {
        {

-         /* This is a relocateable link.  We don't have to change
+         /* This is a relocatable link.  We don't have to change

             anything, unless the reloc is against a section symbol,
             in which case we have to adjust according to where the
             section symbol winds up in the output section.  */
             anything, unless the reloc is against a section symbol,
             in which case we have to adjust according to where the
             section symbol winds up in the output section.  */


@@ -1834,19 +1897,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,
                                  howto,
                                  (bfd_signed_vma) (sec->output_offset
                                                    + sym->st_value));
                  arm_add_to_rel (input_bfd, contents + rel->r_offset,
                                  howto,
                                  (bfd_signed_vma) (sec->output_offset
                                                    + sym->st_value));

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

                }
            }
 
          continue;
        }
                }
            }
 
          continue;
        }

+#endif

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


@@ -1857,25 +1917,62 @@ 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];

+#if USE_REL

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

-       }
-      else
-       {
-         h = sym_hashes[r_symndx - symtab_hdr->sh_info];
+         if ((sec->flags & SEC_MERGE)
+                  && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
+           {
+             asection *msec;
+             bfd_vma addend, value;

 
 

-         while (   h->root.type == bfd_link_hash_indirect
-                || h->root.type == bfd_link_hash_warning)
-           h = (struct elf_link_hash_entry *) h->root.u.i.link;
+             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;
+               }

 
 

-         if (   h->root.type == bfd_link_hash_defined
-             || h->root.type == bfd_link_hash_defweak)
-           {
-             int relocation_needed = 1;
+             value = bfd_get_32 (input_bfd, contents + rel->r_offset);

 
 

-             sec = h->root.u.def.section;
+             /* 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
+       {
+         bfd_boolean warned;
+         bfd_boolean unresolved_reloc;
+
+         RELOC_FOR_GLOBAL_SYMBOL (h, sym_hashes, r_symndx,
+                                  symtab_hdr, relocation,
+                                  sec, unresolved_reloc, info,
+                                  warned);
+         
+         if (unresolved_reloc || relocation != 0)
+           {

              /* In these cases, we don't need the relocation value.
                 We check specially because in some obscure cases
                 sec->output_section will be NULL.  */
              /* In these cases, we don't need the relocation value.
                 We check specially because in some obscure cases
                 sec->output_section will be NULL.  */


@@ -1898,63 +1995,39 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                              && (h->elf_link_hash_flags
                                  & ELF_LINK_HASH_DEF_DYNAMIC) != 0))
                      )
                              && (h->elf_link_hash_flags
                                  & ELF_LINK_HASH_DEF_DYNAMIC) != 0))
                      )

-                   relocation_needed = 0;
+                   relocation = 0;

                  break;
 
                case R_ARM_GOTPC:
                  break;
 
                case R_ARM_GOTPC:

-                 relocation_needed = 0;
+                 relocation = 0;

                  break;
 
                case R_ARM_GOT32:
                  break;
 
                case R_ARM_GOT32:

-                 if (elf_hash_table(info)->dynamic_sections_created
-                     && (!info->shared
+                 if ((WILL_CALL_FINISH_DYNAMIC_SYMBOL
+                      (elf_hash_table (info)->dynamic_sections_created,
+                       info->shared, h))
+                     && (!info->shared

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

-                         || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
-                         )
-                     )
-                   relocation_needed = 0;
+                         || (h->elf_link_hash_flags
+                             & ELF_LINK_HASH_DEF_REGULAR) == 0))
+                   relocation = 0;

                  break;
 
                case R_ARM_PLT32:
                  if (h->plt.offset != (bfd_vma)-1)
                  break;
 
                case R_ARM_PLT32:
                  if (h->plt.offset != (bfd_vma)-1)

-                   relocation_needed = 0;
+                   relocation = 0;

                  break;
 
                default:
                  break;
 
                default:

-                 if (sec->output_section == NULL)
-                   {
-                     (*_bfd_error_handler)
-                       (_("%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;
-                   }
+                 if (unresolved_reloc)
+                   _bfd_error_handler
+                     (_("%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));
+                 break;

                }
                }

-
-             if (relocation_needed)
-               relocation = h->root.u.def.value
-                 + sec->output_section->vma
-                 + sec->output_offset;
-             else
-               relocation = 0;
-           }
-         else if (h->root.type == bfd_link_hash_undefweak)
-           relocation = 0;
-         else if (info->shared && !info->symbolic
-                  && !info->no_undefined
-                  && ELF_ST_VISIBILITY (h->other) == STV_DEFAULT)
-           relocation = 0;
-         else
-           {
-             if (!((*info->callbacks->undefined_symbol)
-                   (info, h->root.root.string, input_bfd,
-                    input_section, rel->r_offset,
-                    (!info->shared || info->no_undefined
-                     || ELF_ST_VISIBILITY (h->other)))))
-               return false;
-             relocation = 0;

            }
        }
 
            }
        }
 


@@ -1989,14 +2062,14 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                  && (!((*info->callbacks->reloc_overflow)
                        (info, name, howto->name, (bfd_vma) 0,
                         input_bfd, input_section, rel->r_offset))))
                  && (!((*info->callbacks->reloc_overflow)
                        (info, name, howto->name, (bfd_vma) 0,
                         input_bfd, input_section, rel->r_offset))))

-                 return false;
+                 return FALSE;

              break;
 
            case bfd_reloc_undefined:
              if (!((*info->callbacks->undefined_symbol)
                    (info, name, input_bfd, input_section,
              break;
 
            case bfd_reloc_undefined:
              if (!((*info->callbacks->undefined_symbol)
                    (info, name, input_bfd, input_section,

-                    rel->r_offset, true)))
-               return false;
+                    rel->r_offset, TRUE)))
+               return FALSE;

              break;
 
            case bfd_reloc_outofrange:
              break;
 
            case bfd_reloc_outofrange:


@@ -2019,17 +2092,39 @@ elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
              if (!((*info->callbacks->warning)
                    (info, msg, name, input_bfd, input_section,
                     rel->r_offset)))
              if (!((*info->callbacks->warning)
                    (info, msg, name, input_bfd, input_section,
                     rel->r_offset)))

-               return false;
+               return FALSE;

              break;
            }
        }
     }
 
              break;
            }
        }
     }
 

-  return true;
+  return TRUE;
+}
+
+/* Set the right machine number.  */
+
+static bfd_boolean
+elf32_arm_object_p (abfd)
+     bfd *abfd;
+{
+  unsigned int mach;
+  
+  mach = bfd_arm_get_mach_from_notes (abfd, ARM_NOTE_SECTION);
+
+  if (mach != bfd_mach_arm_unknown)
+    bfd_default_set_arch_mach (abfd, bfd_arch_arm, mach);
+
+  else if (elf_elfheader (abfd)->e_flags & EF_ARM_MAVERICK_FLOAT)
+    bfd_default_set_arch_mach (abfd, bfd_arch_arm, bfd_mach_arm_ep9312);
+
+  else
+    bfd_default_set_arch_mach (abfd, bfd_arch_arm, mach);
+
+  return TRUE;

 }
 
 /* Function to keep ARM specific flags in the ELF header.  */
 }
 
 /* Function to keep ARM specific flags in the ELF header.  */

-static boolean
+static bfd_boolean

 elf32_arm_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;
 elf32_arm_set_private_flags (abfd, flags)
      bfd *abfd;
      flagword flags;


@@ -2041,26 +2136,26 @@ elf32_arm_set_private_flags (abfd, flags)
        {
          if (flags & EF_ARM_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 interworking flag of %s since it has already been specified as non-interworking"),

                                   bfd_archive_filename (abfd));
          else
            _bfd_error_handler (_("\
                                   bfd_archive_filename (abfd));
          else
            _bfd_error_handler (_("\

-Warning: Clearing the interwork flag of %s due to outside request"),
+Warning: Clearing the interworking flag of %s due to outside request"),

                                bfd_archive_filename (abfd));
        }
     }
   else
     {
       elf_elfheader (abfd)->e_flags = flags;
                                bfd_archive_filename (abfd));
        }
     }
   else
     {
       elf_elfheader (abfd)->e_flags = flags;

-      elf_flags_init (abfd) = true;
+      elf_flags_init (abfd) = TRUE;

     }
 
     }
 

-  return true;
+  return TRUE;

 }
 
 /* Copy backend specific data from one object module to another.  */
 
 }
 
 /* Copy backend specific data from one object module to another.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 elf32_arm_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;


@@ -2070,7 +2165,7 @@ elf32_arm_copy_private_bfd_data (ibfd, obfd)
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)

-    return true;
+    return TRUE;

 
   in_flags  = elf_elfheader (ibfd)->e_flags;
   out_flags = elf_elfheader (obfd)->e_flags;
 
   in_flags  = elf_elfheader (ibfd)->e_flags;
   out_flags = elf_elfheader (obfd)->e_flags;


@@ -2081,11 +2176,11 @@ elf32_arm_copy_private_bfd_data (ibfd, obfd)
     {
       /* Cannot mix APCS26 and APCS32 code.  */
       if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))
     {
       /* Cannot mix APCS26 and APCS32 code.  */
       if ((in_flags & EF_ARM_APCS_26) != (out_flags & EF_ARM_APCS_26))

-       return false;
+       return FALSE;

 
       /* Cannot mix float APCS and non-float APCS code.  */
       if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))
 
       /* Cannot mix float APCS and non-float APCS code.  */
       if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_APCS_FLOAT))

-       return false;
+       return FALSE;

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


@@ -2093,7 +2188,7 @@ 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"),
+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));
 
                                bfd_get_filename (obfd),
                                bfd_archive_filename (ibfd));
 


@@ -2106,32 +2201,32 @@ Warning: Clearing the interwork flag in %s because non-interworking code in %s h
     }
 
   elf_elfheader (obfd)->e_flags = in_flags;
     }
 
   elf_elfheader (obfd)->e_flags = in_flags;

-  elf_flags_init (obfd) = true;
+  elf_flags_init (obfd) = TRUE;

 
 

-  return true;
+  return TRUE;

 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 
 }
 
 /* Merge backend specific data from an object file to the output
    object file when linking.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_merge_private_bfd_data (ibfd, obfd)
      bfd * ibfd;
      bfd * obfd;
 {
   flagword out_flags;
   flagword in_flags;
 elf32_arm_merge_private_bfd_data (ibfd, obfd)
      bfd * ibfd;
      bfd * obfd;
 {
   flagword out_flags;
   flagword in_flags;

-  boolean flags_compatible = true;
-  boolean null_input_bfd = true;
+  bfd_boolean flags_compatible = TRUE;
+  bfd_boolean null_input_bfd = TRUE;

   asection *sec;
 
   /* Check if we have the same endianess.  */
   asection *sec;
 
   /* Check if we have the same endianess.  */

-  if (_bfd_generic_verify_endian_match (ibfd, obfd) == false)
-    return false;
+  if (! _bfd_generic_verify_endian_match (ibfd, obfd))
+    return FALSE;

 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
 
   if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
       || bfd_get_flavour (obfd) != bfd_target_elf_flavour)

-    return true;
+    return TRUE;

 
   /* The input BFD must have had its flags initialised.  */
   /* The following seems bogus to me -- The flags are initialized in
 
   /* The input BFD must have had its flags initialised.  */
   /* The following seems bogus to me -- The flags are initialized in


@@ -2152,21 +2247,26 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd)
          to the default values.  */
       if (bfd_get_arch_info (ibfd)->the_default
          && elf_elfheader (ibfd)->e_flags == 0)
          to the default values.  */
       if (bfd_get_arch_info (ibfd)->the_default
          && elf_elfheader (ibfd)->e_flags == 0)

-       return true;
+       return TRUE;

 
 

-      elf_flags_init (obfd) = true;
+      elf_flags_init (obfd) = TRUE;

       elf_elfheader (obfd)->e_flags = in_flags;
 
       if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
          && bfd_get_arch_info (obfd)->the_default)
        return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
 
       elf_elfheader (obfd)->e_flags = in_flags;
 
       if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
          && bfd_get_arch_info (obfd)->the_default)
        return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
 

-      return true;
+      return TRUE;

     }
 
     }
 

+  /* Determine what should happen if the input ARM architecture
+     does not match the output ARM architecture.  */
+  if (! bfd_arm_merge_machines (ibfd, obfd))
+    return FALSE;
+

   /* Identical flags must be compatible.  */
   if (in_flags == out_flags)
   /* Identical flags must be compatible.  */
   if (in_flags == out_flags)

-    return true;
+    return TRUE;

 
   /* Check to see if the input BFD actually contains any sections.
      If not, its flags may not have been initialised either, but it cannot
 
   /* Check to see if the input BFD actually contains any sections.
      If not, its flags may not have been initialised either, but it cannot


@@ -2177,23 +2277,23 @@ elf32_arm_merge_private_bfd_data (ibfd, obfd)
       if (strcmp (sec->name, ".glue_7")
          && strcmp (sec->name, ".glue_7t"))
        {
       if (strcmp (sec->name, ".glue_7")
          && strcmp (sec->name, ".glue_7t"))
        {

-         null_input_bfd = false;
+         null_input_bfd = FALSE;

          break;
        }
     }
   if (null_input_bfd)
          break;
        }
     }
   if (null_input_bfd)

-    return true;
+    return TRUE;

 
   /* Complain about various flag mismatches.  */
   if (EF_ARM_EABI_VERSION (in_flags) != EF_ARM_EABI_VERSION (out_flags))
     {
       _bfd_error_handler (_("\
 
   /* Complain about various flag mismatches.  */
   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"),
+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);
                          bfd_archive_filename (ibfd),
                          (in_flags & EF_ARM_EABIMASK) >> 24,
                          bfd_get_filename (obfd),
                          (out_flags & EF_ARM_EABIMASK) >> 24);

-      return false;
+      return FALSE;

     }
 
   /* Not sure what needs to be checked for EABI versions >= 1.  */
     }
 
   /* Not sure what needs to be checked for EABI versions >= 1.  */


@@ -2202,51 +2302,106 @@ 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"),
+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);
                              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;
+         flags_compatible = FALSE;

        }
 
       if ((in_flags & EF_ARM_APCS_FLOAT) != (out_flags & EF_ARM_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");
+         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));

 
 

-         _bfd_error_handler (_("\
-Error: %s passes floats in %s registers, whereas %s passes them in %s registers"),
-                             bfd_archive_filename (ibfd), s1,
-                             bfd_get_filename (obfd), s2);
-         flags_compatible = false;
+         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 does not"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
+         else
+           _bfd_error_handler (_("\
+ERROR: %s uses FPA instructions, whereas %s does not"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
+
+         flags_compatible = FALSE;
+       }
+
+      if ((in_flags & EF_ARM_MAVERICK_FLOAT) != (out_flags & EF_ARM_MAVERICK_FLOAT))
+       {
+         if (in_flags & EF_ARM_MAVERICK_FLOAT)
+           _bfd_error_handler (_("\
+ERROR: %s uses Maverick instructions, whereas %s does not"),
+                               bfd_archive_filename (ibfd),
+                               bfd_get_filename (obfd));
+         else
+           _bfd_error_handler (_("\
+ERROR: %s uses Maverick instructions, whereas %s does not"),
+                               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))
        {
        }
 
 #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_archive_filename (ibfd), s1,
-                             bfd_get_filename (obfd), s2);
-         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))
        {

-         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"),
-                             bfd_archive_filename (ibfd), s1,
-                             bfd_get_filename (obfd), s2);
+         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));
+           }

        }
     }
 
        }
     }
 


@@ -2255,7 +2410,7 @@ Warning: %s %s interworking, whereas %s %s"),
 
 /* Display the flags field.  */
 
 
 /* Display the flags field.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;
 elf32_arm_print_private_bfd_data (abfd, ptr)
      bfd *abfd;
      PTR ptr;


@@ -2285,9 +2440,16 @@ 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 if (flags & EF_ARM_MAVERICK_FLOAT)
+       fprintf (file, _(" [Maverick 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]"));


@@ -2304,8 +2466,10 @@ 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
+                | EF_ARM_MAVERICK_FLOAT);

       break;
 
     case EF_ARM_EABI_VER1:
       break;
 
     case EF_ARM_EABI_VER1:


@@ -2357,7 +2521,7 @@ elf32_arm_print_private_bfd_data (abfd, ptr)
 
   fputc ('\n', file);
 
 
   fputc ('\n', file);
 

-  return true;
+  return TRUE;

 }
 
 static int
 }
 
 static int


@@ -2387,8 +2551,8 @@ elf32_arm_get_symbol_type (elf_sym, type)
 }
 
 static asection *
 }
 
 static asection *

-elf32_arm_gc_mark_hook (abfd, info, rel, h, sym)
-       bfd *abfd;
+elf32_arm_gc_mark_hook (sec, info, rel, h, sym)
+       asection *sec;

        struct bfd_link_info *info ATTRIBUTE_UNUSED;
        Elf_Internal_Rela *rel;
        struct elf_link_hash_entry *h;
        struct bfd_link_info *info ATTRIBUTE_UNUSED;
        Elf_Internal_Rela *rel;
        struct elf_link_hash_entry *h;


@@ -2418,21 +2582,14 @@ 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 (sec->owner, sym->st_shndx);
+

   return NULL;
 }
 
 /* Update the got entry reference counts for the section being removed.  */
 
   return NULL;
 }
 
 /* Update the got entry reference counts for the section being removed.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;
 elf32_arm_gc_sweep_hook (abfd, info, sec, relocs)
      bfd *abfd ATTRIBUTE_UNUSED;
      struct bfd_link_info *info ATTRIBUTE_UNUSED;


@@ -2440,29 +2597,29 @@ elf32_arm_gc_sweep_hook (abfd, info, sec, relocs)
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* We don't support garbage collection of GOT and PLT relocs yet.  */
      const Elf_Internal_Rela *relocs ATTRIBUTE_UNUSED;
 {
   /* We don't support garbage collection of GOT and PLT relocs yet.  */

-  return true;
+  return TRUE;

 }
 
 /* Look through the relocs for a section during the first phase.  */
 
 }
 
 /* Look through the relocs for a section during the first phase.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_check_relocs (abfd, info, sec, relocs)
 elf32_arm_check_relocs (abfd, info, sec, relocs)

-     bfd *                      abfd;
-     struct bfd_link_info *     info;
-     asection *                 sec;
-     const Elf_Internal_Rela *  relocs;
+     bfd *abfd;
+     struct bfd_link_info *info;
+     asection *sec;
+     const Elf_Internal_Rela *relocs;

 {
 {

-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  struct elf_link_hash_entry ** sym_hashes_end;
-  const Elf_Internal_Rela *     rel;
-  const Elf_Internal_Rela *     rel_end;
-  bfd *                         dynobj;
-  asection * sgot, *srelgot, *sreloc;
-  bfd_vma * local_got_offsets;
+  Elf_Internal_Shdr *symtab_hdr;
+  struct elf_link_hash_entry **sym_hashes;
+  struct elf_link_hash_entry **sym_hashes_end;
+  const Elf_Internal_Rela *rel;
+  const Elf_Internal_Rela *rel_end;
+  bfd *dynobj;
+  asection *sgot, *srelgot, *sreloc;
+  bfd_vma *local_got_offsets;

 
 

-  if (info->relocateable)
-    return true;
+  if (info->relocatable)
+    return TRUE;

 
   sgot = srelgot = sreloc = NULL;
 
 
   sgot = srelgot = sreloc = NULL;
 


@@ -2499,7 +2656,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
            case R_ARM_GOTPC:
              elf_hash_table (info)->dynobj = dynobj = abfd;
              if (! _bfd_elf_create_got_section (dynobj, info))
            case R_ARM_GOTPC:
              elf_hash_table (info)->dynobj = dynobj = abfd;
              if (! _bfd_elf_create_got_section (dynobj, info))

-               return false;
+               return FALSE;

              break;
 
            default:
              break;
 
            default:


@@ -2536,7 +2693,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                                                     | SEC_LINKER_CREATED
                                                     | SEC_READONLY))
                        || ! bfd_set_section_alignment (dynobj, srelgot, 2))
                                                     | SEC_LINKER_CREATED
                                                     | SEC_READONLY))
                        || ! bfd_set_section_alignment (dynobj, srelgot, 2))

-                     return false;
+                     return FALSE;

                  }
              }
 
                  }
              }
 


@@ -2551,7 +2708,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                /* Make sure this symbol is output as a dynamic symbol.  */
                if (h->dynindx == -1)
                  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
                /* Make sure this symbol is output as a dynamic symbol.  */
                if (h->dynindx == -1)
                  if (! bfd_elf32_link_record_dynamic_symbol (info, h))

-                   return false;
+                   return FALSE;

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


@@ -2568,7 +2725,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                    size *= sizeof (bfd_vma);
                    local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
                    if (local_got_offsets == NULL)
                    size *= sizeof (bfd_vma);
                    local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
                    if (local_got_offsets == NULL)

-                     return false;
+                     return FALSE;

                    elf_local_got_offsets (abfd) = local_got_offsets;
                    for (i = 0; i < symtab_hdr->sh_info; i++)
                      local_got_offsets[i] = (bfd_vma) -1;
                    elf_local_got_offsets (abfd) = local_got_offsets;
                    for (i = 0; i < symtab_hdr->sh_info; i++)
                      local_got_offsets[i] = (bfd_vma) -1;


@@ -2640,7 +2797,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                             elf_elfheader (abfd)->e_shstrndx,
                             elf_section_data (sec)->rel_hdr.sh_name));
                    if (name == NULL)
                             elf_elfheader (abfd)->e_shstrndx,
                             elf_section_data (sec)->rel_hdr.sh_name));
                    if (name == NULL)

-                     return false;
+                     return FALSE;

 
                    BFD_ASSERT (strncmp (name, ".rel", 4) == 0
                                && strcmp (bfd_get_section_name (abfd, sec),
 
                    BFD_ASSERT (strncmp (name, ".rel", 4) == 0
                                && strcmp (bfd_get_section_name (abfd, sec),


@@ -2659,7 +2816,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                        if (sreloc == NULL
                            || ! bfd_set_section_flags (dynobj, sreloc, flags)
                            || ! bfd_set_section_alignment (dynobj, sreloc, 2))
                        if (sreloc == NULL
                            || ! bfd_set_section_flags (dynobj, sreloc, flags)
                            || ! bfd_set_section_alignment (dynobj, sreloc, 2))

-                         return false;
+                         return FALSE;

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


@@ -2691,7 +2848,7 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
                        p = ((struct elf32_arm_pcrel_relocs_copied *)
                             bfd_alloc (dynobj, (bfd_size_type) sizeof * p));
                        if (p == NULL)
                        p = ((struct elf32_arm_pcrel_relocs_copied *)
                             bfd_alloc (dynobj, (bfd_size_type) sizeof * p));
                        if (p == NULL)

-                         return false;
+                         return FALSE;

                        p->next = eh->pcrel_relocs_copied;
                        eh->pcrel_relocs_copied = p;
                        p->section = sreloc;
                        p->next = eh->pcrel_relocs_copied;
                        eh->pcrel_relocs_copied = p;
                        p->section = sreloc;


@@ -2707,59 +2864,59 @@ elf32_arm_check_relocs (abfd, info, sec, relocs)
            Reconstruct it for later use during GC.  */
         case R_ARM_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
            Reconstruct it for later use during GC.  */
         case R_ARM_GNU_VTINHERIT:
           if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))

-            return false;
+            return FALSE;

           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_ARM_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
           break;
 
         /* This relocation describes which C++ vtable entries are actually
            used.  Record for later use during GC.  */
         case R_ARM_GNU_VTENTRY:
           if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))

-            return false;
+            return FALSE;

           break;
         }
     }
 
           break;
         }
     }
 

-  return true;
+  return TRUE;

 }
 
 /* Find the nearest line to a particular section and offset, for error
    reporting.   This code is a duplicate of the code in elf.c, except
    that it also accepts STT_ARM_TFUNC as a symbol that names a function.  */
 
 }
 
 /* Find the nearest line to a particular section and offset, for error
    reporting.   This code is a duplicate of the code in elf.c, except
    that it also accepts STT_ARM_TFUNC as a symbol that names a function.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_find_nearest_line
   (abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr)
 elf32_arm_find_nearest_line
   (abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr)

-     bfd *          abfd;
-     asection *     section;
-     asymbol **     symbols;
-     bfd_vma        offset;
-     const char **  filename_ptr;
-     const char **  functionname_ptr;
-     unsigned int * line_ptr;
+     bfd *abfd;
+     asection *section;
+     asymbol **symbols;
+     bfd_vma offset;
+     const char **filename_ptr;
+     const char **functionname_ptr;
+     unsigned int *line_ptr;

 {
 {

-  boolean      found;
-  const char * filename;
-  asymbol *    func;
-  bfd_vma      low_func;
-  asymbol **   p;
+  bfd_boolean found;
+  const char *filename;
+  asymbol *func;
+  bfd_vma low_func;
+  asymbol **p;

 
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
                                     filename_ptr, functionname_ptr,
                                     line_ptr, 0,
                                     &elf_tdata (abfd)->dwarf2_find_line_info))
 
   if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
                                     filename_ptr, functionname_ptr,
                                     line_ptr, 0,
                                     &elf_tdata (abfd)->dwarf2_find_line_info))

-    return true;
+    return TRUE;

 
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
                                             &found, filename_ptr,
                                             functionname_ptr, line_ptr,
                                             &elf_tdata (abfd)->line_info))
 
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
                                             &found, filename_ptr,
                                             functionname_ptr, line_ptr,
                                             &elf_tdata (abfd)->line_info))

-    return false;
+    return FALSE;

 
   if (found)
 
   if (found)

-    return true;
+    return TRUE;

 
   if (symbols == NULL)
 
   if (symbols == NULL)

-    return false;
+    return FALSE;

 
   filename = NULL;
   func = NULL;
 
   filename = NULL;
   func = NULL;


@@ -2796,13 +2953,13 @@ elf32_arm_find_nearest_line
     }
 
   if (func == NULL)
     }
 
   if (func == NULL)

-    return false;
+    return FALSE;

 
   *filename_ptr = filename;
   *functionname_ptr = bfd_asymbol_name (func);
   *line_ptr = 0;
 
 
   *filename_ptr = filename;
   *functionname_ptr = bfd_asymbol_name (func);
   *line_ptr = 0;
 

-  return true;
+  return TRUE;

 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a
 }
 
 /* Adjust a symbol defined by a dynamic object and referenced by a


@@ -2811,7 +2968,7 @@ elf32_arm_find_nearest_line
    change the definition to something the rest of the link can
    understand.  */
 
    change the definition to something the rest of the link can
    understand.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_adjust_dynamic_symbol (info, h)
      struct bfd_link_info * info;
      struct elf_link_hash_entry * h;
 elf32_arm_adjust_dynamic_symbol (info, h)
      struct bfd_link_info * info;
      struct elf_link_hash_entry * h;


@@ -2839,24 +2996,30 @@ elf32_arm_adjust_dynamic_symbol (info, h)
   if (h->type == STT_FUNC
       || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
     {
   if (h->type == STT_FUNC
       || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
     {

+      /* If we link a program (not a DSO), we'll get rid of unnecessary
+        PLT entries; we point to the actual symbols -- even for pic
+        relocs, because a program built with -fpic should have the same
+        result as one built without -fpic, specifically considering weak
+        symbols.
+        FIXME: m68k and i386 differ here, for unclear reasons.  */

       if (! info->shared
       if (! info->shared

-         && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-         && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0)
+         && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0)

        {
          /* This case can occur if we saw a PLT32 reloc in an input
        {
          /* This case can occur if we saw a PLT32 reloc in an input

-             file, but the symbol was never referred to by a dynamic
-             object.  In such a case, we don't actually need to build
-             a procedure linkage table, and we can just do a PC32
-             reloc instead.  */
+            file, but the symbol was not defined by a dynamic object.
+            In such a case, we don't actually need to build a
+            procedure linkage table, and we can just do a PC32 reloc
+            instead.  */

          BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
          BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);

-         return true;
+         h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
+         return TRUE;

        }
 
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (h->dynindx == -1)
        {
          if (! bfd_elf32_link_record_dynamic_symbol (info, h))
        }
 
       /* Make sure this symbol is output as a dynamic symbol.  */
       if (h->dynindx == -1)
        {
          if (! bfd_elf32_link_record_dynamic_symbol (info, h))

-           return false;
+           return FALSE;

        }
 
       s = bfd_get_section_by_name (dynobj, ".plt");
        }
 
       s = bfd_get_section_by_name (dynobj, ".plt");


@@ -2896,7 +3059,7 @@ elf32_arm_adjust_dynamic_symbol (info, h)
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf32_External_Rel);
 
       BFD_ASSERT (s != NULL);
       s->_raw_size += sizeof (Elf32_External_Rel);
 

-      return true;
+      return TRUE;

     }
 
   /* If this is a weak symbol, and there is a real definition, the
     }
 
   /* If this is a weak symbol, and there is a real definition, the


@@ -2908,7 +3071,7 @@ elf32_arm_adjust_dynamic_symbol (info, h)
                  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;
                  || h->weakdef->root.type == bfd_link_hash_defweak);
       h->root.u.def.section = h->weakdef->root.u.def.section;
       h->root.u.def.value = h->weakdef->root.u.def.value;

-      return true;
+      return TRUE;

     }
 
   /* This is a reference to a symbol defined by a dynamic object which
     }
 
   /* This is a reference to a symbol defined by a dynamic object which


@@ -2919,7 +3082,7 @@ elf32_arm_adjust_dynamic_symbol (info, h)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)
      For such cases we need not do anything here; the relocations will
      be handled correctly by relocate_section.  */
   if (info->shared)

-    return true;
+    return TRUE;

 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be
 
   /* We must allocate the symbol in our .dynbss section, which will
      become part of the .bss section of the executable.  There will be


@@ -2959,7 +3122,7 @@ elf32_arm_adjust_dynamic_symbol (info, h)
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (! bfd_set_section_alignment (dynobj, s, power_of_two))
   if (power_of_two > bfd_get_section_alignment (dynobj, s))
     {
       if (! bfd_set_section_alignment (dynobj, s, power_of_two))

-       return false;
+       return FALSE;

     }
 
   /* Define the symbol as being at this point in the section.  */
     }
 
   /* Define the symbol as being at this point in the section.  */


@@ -2969,20 +3132,20 @@ elf32_arm_adjust_dynamic_symbol (info, h)
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 
   /* Increment the section size to make room for the symbol.  */
   s->_raw_size += h->size;
 

-  return true;
+  return TRUE;

 }
 
 /* Set the sizes of the dynamic sections.  */
 
 }
 
 /* Set the sizes of the dynamic sections.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_size_dynamic_sections (output_bfd, info)
      bfd * output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info * info;
 {
   bfd * dynobj;
   asection * s;
 elf32_arm_size_dynamic_sections (output_bfd, info)
      bfd * output_bfd ATTRIBUTE_UNUSED;
      struct bfd_link_info * info;
 {
   bfd * dynobj;
   asection * s;

-  boolean plt;
-  boolean relocs;
+  bfd_boolean plt;
+  bfd_boolean relocs;

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


@@ -3022,12 +3185,12 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */
   /* The check_relocs and adjust_dynamic_symbol entry points have
      determined the sizes of the various dynamic sections.  Allocate
      memory for them.  */

-  plt = false;
-  relocs = false;
+  plt = FALSE;
+  relocs = 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;

-      boolean strip;
+      bfd_boolean strip;

 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
        continue;
 
       if ((s->flags & SEC_LINKER_CREATED) == 0)
        continue;


@@ -3036,7 +3199,7 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
         of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 
         of the dynobj section names depend upon the input files.  */
       name = bfd_get_section_name (dynobj, s);
 

-      strip = false;
+      strip = FALSE;

 
       if (strcmp (name, ".plt") == 0)
        {
 
       if (strcmp (name, ".plt") == 0)
        {


@@ -3044,12 +3207,12 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
            {
              /* Strip this section if we don't need it; see the
                  comment below.  */
            {
              /* Strip this section if we don't need it; see the
                  comment below.  */

-             strip = true;
+             strip = TRUE;

            }
          else
            {
              /* Remember whether there is a PLT.  */
            }
          else
            {
              /* Remember whether there is a PLT.  */

-             plt = true;
+             plt = TRUE;

            }
        }
       else if (strncmp (name, ".rel", 4) == 0)
            }
        }
       else if (strncmp (name, ".rel", 4) == 0)


@@ -3065,14 +3228,14 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
                 adjust_dynamic_symbol is called, and it is that
                 function which decides whether anything needs to go
                 into these sections.  */
                 adjust_dynamic_symbol is called, and it is that
                 function which decides whether anything needs to go
                 into these sections.  */

-             strip = true;
+             strip = TRUE;

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

-               relocs = 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.  */


@@ -3087,22 +3250,14 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
 
       if (strip)
        {
 
       if (strip)
        {

-         asection ** spp;
-
-         for (spp = &s->output_section->owner->sections;
-              *spp != s->output_section;
-              spp = &(*spp)->next)
-           ;
-         *spp = s->output_section->next;
-         --s->output_section->owner->section_count;
-
+         _bfd_strip_section_from_output (info, s);

          continue;
        }
 
       /* Allocate memory for the section contents.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)
          continue;
        }
 
       /* Allocate memory for the section contents.  */
       s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
       if (s->contents == NULL && s->_raw_size != 0)

-       return false;
+       return FALSE;

     }
 
   if (elf_hash_table (info)->dynamic_sections_created)
     }
 
   if (elf_hash_table (info)->dynamic_sections_created)


@@ -3118,7 +3273,7 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
       if (!info->shared)
        {
          if (!add_dynamic_entry (DT_DEBUG, 0))
       if (!info->shared)
        {
          if (!add_dynamic_entry (DT_DEBUG, 0))

-           return false;
+           return FALSE;

        }
 
       if (plt)
        }
 
       if (plt)


@@ -3127,7 +3282,7 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
              || !add_dynamic_entry (DT_PLTRELSZ, 0)
              || !add_dynamic_entry (DT_PLTREL, DT_REL)
              || !add_dynamic_entry (DT_JMPREL, 0))
              || !add_dynamic_entry (DT_PLTRELSZ, 0)
              || !add_dynamic_entry (DT_PLTREL, DT_REL)
              || !add_dynamic_entry (DT_JMPREL, 0))

-           return false;
+           return FALSE;

        }
 
       if (relocs)
        }
 
       if (relocs)


@@ -3135,19 +3290,19 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
          if (   !add_dynamic_entry (DT_REL, 0)
              || !add_dynamic_entry (DT_RELSZ, 0)
              || !add_dynamic_entry (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 ((info->flags & DF_TEXTREL) != 0)
        {
          if (!add_dynamic_entry (DT_TEXTREL, 0))
        }
 
       if ((info->flags & DF_TEXTREL) != 0)
        {
          if (!add_dynamic_entry (DT_TEXTREL, 0))

-           return false;
+           return FALSE;

          info->flags |= DF_TEXTREL;
        }
     }
 #undef add_synamic_entry
 
          info->flags |= DF_TEXTREL;
        }
     }
 #undef add_synamic_entry
 

-  return true;
+  return TRUE;

 }
 
 /* This function is called via elf32_arm_link_hash_traverse if we are
 }
 
 /* This function is called via elf32_arm_link_hash_traverse if we are


@@ -3157,27 +3312,30 @@ elf32_arm_size_dynamic_sections (output_bfd, info)
    check_relocs routine, but we won't fill them in in the
    relocate_section routine.  */
 
    check_relocs routine, but we won't fill them in in the
    relocate_section routine.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_discard_copies (h, ignore)
      struct elf32_arm_link_hash_entry * h;
      PTR ignore ATTRIBUTE_UNUSED;
 {
   struct elf32_arm_pcrel_relocs_copied * s;
 
 elf32_arm_discard_copies (h, ignore)
      struct elf32_arm_link_hash_entry * h;
      PTR ignore ATTRIBUTE_UNUSED;
 {
   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)
   /* 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;
+    return TRUE;

 
   for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
     s->section->_raw_size -= s->count * sizeof (Elf32_External_Rel);
 
 
   for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
     s->section->_raw_size -= s->count * sizeof (Elf32_External_Rel);
 

-  return true;
+  return TRUE;

 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 
 }
 
 /* Finish up dynamic symbol handling.  We set the contents of various
    dynamic sections here.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd * output_bfd;
      struct bfd_link_info * info;
 elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
      bfd * output_bfd;
      struct bfd_link_info * info;


@@ -3195,7 +3353,8 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
       asection * srel;
       bfd_vma plt_index;
       bfd_vma got_offset;
       asection * srel;
       bfd_vma plt_index;
       bfd_vma got_offset;

-      Elf_Internal_Rel rel;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;

 
       /* This symbol has an entry in the procedure linkage table.  Set
         it up.  */
 
       /* This symbol has an entry in the procedure linkage table.  Set
         it up.  */


@@ -3245,9 +3404,8 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
                      + sgot->output_offset
                      + got_offset);
       rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_JUMP_SLOT);
                      + sgot->output_offset
                      + got_offset);
       rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_JUMP_SLOT);

-      bfd_elf32_swap_reloc_out (output_bfd, &rel,
-                               ((Elf32_External_Rel *) srel->contents
-                                + plt_index));
+      loc = srel->contents + plt_index * sizeof (Elf32_External_Rel);
+      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);

 
       if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
        {
 
       if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
        {


@@ -3268,7 +3426,8 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
     {
       asection * sgot;
       asection * srel;
     {
       asection * sgot;
       asection * srel;

-      Elf_Internal_Rel rel;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;

 
       /* This symbol has an entry in the global offset table.  Set it
         up.  */
 
       /* This symbol has an entry in the global offset table.  Set it
         up.  */


@@ -3294,16 +3453,15 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
          rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_GLOB_DAT);
        }
 
          rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_GLOB_DAT);
        }
 

-      bfd_elf32_swap_reloc_out (output_bfd, &rel,
-                               ((Elf32_External_Rel *) srel->contents
-                                + srel->reloc_count));
-      ++srel->reloc_count;
+      loc = srel->contents + srel->reloc_count++ * sizeof (Elf32_External_Rel);
+      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);

     }
 
   if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
     {
       asection * s;
     }
 
   if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
     {
       asection * s;

-      Elf_Internal_Rel rel;
+      Elf_Internal_Rela rel;
+      bfd_byte *loc;

 
       /* This symbol needs a copy reloc.  Set it up.  */
       BFD_ASSERT (h->dynindx != -1
 
       /* This symbol needs a copy reloc.  Set it up.  */
       BFD_ASSERT (h->dynindx != -1


@@ -3318,10 +3476,8 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
                      + h->root.u.def.section->output_section->vma
                      + h->root.u.def.section->output_offset);
       rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_COPY);
                      + h->root.u.def.section->output_section->vma
                      + h->root.u.def.section->output_offset);
       rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_COPY);

-      bfd_elf32_swap_reloc_out (output_bfd, &rel,
-                               ((Elf32_External_Rel *) s->contents
-                                + s->reloc_count));
-      ++s->reloc_count;
+      loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rel);
+      bfd_elf32_swap_reloc_out (output_bfd, &rel, loc);

     }
 
   /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
     }
 
   /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */


@@ -3329,12 +3485,12 @@ elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 
       || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
     sym->st_shndx = SHN_ABS;
 

-  return true;
+  return TRUE;

 }
 
 /* Finish up the dynamic sections.  */
 
 }
 
 /* Finish up the dynamic sections.  */
 

-static boolean
+static bfd_boolean

 elf32_arm_finish_dynamic_sections (output_bfd, info)
      bfd * output_bfd;
      struct bfd_link_info * info;
 elf32_arm_finish_dynamic_sections (output_bfd, info)
      bfd * output_bfd;
      struct bfd_link_info * info;


@@ -3415,6 +3571,31 @@ elf32_arm_finish_dynamic_sections (output_bfd, info)
                }
              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
              break;
                }
              bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
              break;

+
+             /* Set the bottom bit of DT_INIT/FINI if the
+                corresponding function is Thumb.  */
+           case DT_INIT:
+             name = info->init_function;
+             goto get_sym;
+           case DT_FINI:
+             name = info->fini_function;
+           get_sym:
+             /* If it wasn't set by elf_bfd_final_link
+                then there is nothing to ajdust.  */
+             if (dyn.d_un.d_val != 0)
+               {
+                 struct elf_link_hash_entry * eh;
+
+                 eh = elf_link_hash_lookup (elf_hash_table (info), name,
+                                            FALSE, FALSE, TRUE);
+                 if (eh != (struct elf_link_hash_entry *) NULL
+                     && ELF_ST_TYPE (eh->type) == STT_ARM_TFUNC)
+                   {
+                     dyn.d_un.d_val |= 1;
+                     bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
+                   }
+               }
+             break;

            }
        }
 
            }
        }
 


@@ -3447,7 +3628,7 @@ elf32_arm_finish_dynamic_sections (output_bfd, info)
 
   elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
 
 
   elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
 

-  return true;
+  return TRUE;

 }
 
 static void
 }
 
 static void


@@ -3480,10 +3661,37 @@ elf32_arm_reloc_type_class (rela)
     }
 }
 
     }
 }
 

+static bfd_boolean elf32_arm_section_flags           PARAMS ((flagword *, Elf_Internal_Shdr *));
+static void        elf32_arm_final_write_processing  PARAMS ((bfd *, bfd_boolean));
+
+/* Set the right machine number for an Arm ELF file.  */
+
+static bfd_boolean
+elf32_arm_section_flags (flags, hdr)
+     flagword *flags;
+     Elf_Internal_Shdr *hdr;
+{
+  if (hdr->sh_type == SHT_NOTE)
+    *flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_SAME_CONTENTS;
+
+  return TRUE;
+}
+
+void
+elf32_arm_final_write_processing (abfd, linker)
+     bfd *abfd;
+     bfd_boolean linker ATTRIBUTE_UNUSED;
+{
+  bfd_arm_update_notes (abfd, ARM_NOTE_SECTION);
+}

 
 #define ELF_ARCH                       bfd_arch_arm
 #define ELF_MACHINE_CODE               EM_ARM
 
 #define ELF_ARCH                       bfd_arch_arm
 #define ELF_MACHINE_CODE               EM_ARM

+#ifdef __QNXTARGET__
+#define ELF_MAXPAGESIZE                        0x1000
+#else

 #define ELF_MAXPAGESIZE                        0x8000
 #define ELF_MAXPAGESIZE                        0x8000

+#endif

 
 #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


@@ -3505,13 +3713,20 @@ elf32_arm_reloc_type_class (rela)
 #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_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_object_p                   elf32_arm_object_p
+#define elf_backend_section_flags              elf32_arm_section_flags
+#define elf_backend_final_write_processing      elf32_arm_final_write_processing

 
 #define elf_backend_can_gc_sections 1
 #define elf_backend_plt_readonly    1
 #define elf_backend_want_got_plt    1
 #define elf_backend_want_plt_sym    0
 
 #define elf_backend_can_gc_sections 1
 #define elf_backend_plt_readonly    1
 #define elf_backend_want_got_plt    1
 #define elf_backend_want_plt_sym    0

+#if !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
 
 #include "elf32-target.h"
 
 #define elf_backend_got_header_size    12
 #define elf_backend_plt_header_size    PLT_ENTRY_SIZE
 
 #include "elf32-target.h"

+