ChangeLog rotatation and copyright year update

[deliverable/binutils-gdb.git] / bfd / coff-arm.c

diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index ba8a7363fbb3302ed004050fa05524f6e28e8d50..74ce0172be0e986ce839f6d7381107fa812d0fd6 100644 (file)
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -1,14 +1,12 @@
 /* BFD back-end for ARM COFF files.
 /* BFD back-end for ARM COFF files.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2015 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,14 +16,13 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 #include "libbfd.h"

-

 #include "coff/arm.h"
 #include "coff/arm.h"

-

 #include "coff/internal.h"
 
 #ifdef COFF_WITH_PE
 #include "coff/internal.h"
 
 #ifdef COFF_WITH_PE


@@ -75,73 +72,10 @@
 #endif
 
 typedef enum {bunknown, b9, b12, b23} thumb_pcrel_branchtype;
 #endif
 
 typedef enum {bunknown, b9, b12, b23} thumb_pcrel_branchtype;

-/* some typedefs for holding instructions */
+/* Some typedefs for holding instructions.  */

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

-     /* Forward declarations for stupid compilers.  */
-static bfd_boolean coff_arm_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-           struct internal_reloc *, struct internal_syment *, asection **));
-static bfd_reloc_status_type aoutarm_fix_pcrel_26_done
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type aoutarm_fix_pcrel_26
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-#ifndef ARM_WINCE
-static bfd_reloc_status_type coff_thumb_pcrel_23
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type coff_thumb_pcrel_9
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static insn32 insert_thumb_branch
-  PARAMS ((insn32, int));
-#endif
-static bfd_reloc_status_type coff_thumb_pcrel_12
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type coff_arm_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_boolean coff_arm_adjust_symndx
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *,
-          asection *, struct internal_reloc *, bfd_boolean *));
-static reloc_howto_type * coff_arm_rtype_to_howto
-  PARAMS ((bfd *, asection *, struct internal_reloc *,
-          struct coff_link_hash_entry *, struct internal_syment *,
-          bfd_vma *));
-static bfd_reloc_status_type coff_thumb_pcrel_common
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **,
-          thumb_pcrel_branchtype));
-static const struct reloc_howto_struct * coff_arm_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static struct bfd_link_hash_table * coff_arm_link_hash_table_create
-  PARAMS ((bfd *));
-static struct coff_link_hash_entry * find_thumb_glue
-  PARAMS ((struct bfd_link_info *, const char *, bfd *));
-static struct coff_link_hash_entry * find_arm_glue
-  PARAMS ((struct bfd_link_info *, const char *, bfd *));
-#ifndef COFF_IMAGE_WITH_PE
-static void record_arm_to_thumb_glue
-  PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *));
-#ifndef ARM_WINCE
-static void record_thumb_to_arm_glue
-  PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *));
-#endif
-#endif
-static bfd_boolean coff_arm_merge_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static bfd_boolean coff_arm_print_private_bfd_data
-  PARAMS ((bfd *, PTR));
-static bfd_boolean _bfd_coff_arm_set_private_flags
-  PARAMS ((bfd *, flagword));
-static bfd_boolean coff_arm_copy_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static bfd_boolean coff_arm_is_local_label_name
-  PARAMS ((bfd *, const char *));
-static bfd_boolean coff_arm_link_output_has_begun
-  PARAMS ((bfd *, struct coff_final_link_info *));
-static bfd_boolean coff_arm_final_link_postscript
-  PARAMS ((bfd *, struct coff_final_link_info *));
-static void arm_emit_base_file_entry
-  PARAMS ((struct bfd_link_info *, bfd *, asection *, bfd_vma));
-

 /* The linker script knows the section names for placement.
    The entry_names are used to do simple name mangling on the stubs.
    Given a function name, and its type, the stub can be found. The
 /* The linker script knows the section names for placement.
    The entry_names are used to do simple name mangling on the stubs.
    Given a function name, and its type, the stub can be found. The


@@ -156,18 +90,17 @@ static void arm_emit_base_file_entry
 /* Used by the assembler.  */
 
 static bfd_reloc_status_type
 /* Used by the assembler.  */
 
 static bfd_reloc_status_type

-coff_arm_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
-                error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol ATTRIBUTE_UNUSED;
-     PTR data;
-     asection *input_section ATTRIBUTE_UNUSED;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
+coff_arm_reloc (bfd *abfd,
+               arelent *reloc_entry,
+               asymbol *symbol ATTRIBUTE_UNUSED,
+               void * data,
+               asection *input_section ATTRIBUTE_UNUSED,
+               bfd *output_bfd,
+               char **error_message ATTRIBUTE_UNUSED)

 {
   symvalue diff;
 {
   symvalue diff;

-  if (output_bfd == (bfd *) NULL)
+
+  if (output_bfd == NULL)

     return bfd_reloc_continue;
 
   diff = reloc_entry->addend;
     return bfd_reloc_continue;
 
   diff = reloc_entry->addend;


@@ -229,6 +162,19 @@ coff_arm_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 
 /* These most certainly belong somewhere else. Just had to get rid of
    the manifest constants in the code.  */
 
 /* These most certainly belong somewhere else. Just had to get rid of
    the manifest constants in the code.  */

+
+#ifdef ARM_WINCE
+
+#define ARM_26D      0
+#define ARM_32       1
+#define ARM_RVA32    2
+#define ARM_26      3
+#define ARM_THUMB12  4
+#define ARM_SECTION  14
+#define ARM_SECREL   15
+
+#else
+

 #define ARM_8        0
 #define ARM_16       1
 #define ARM_32       2
 #define ARM_8        0
 #define ARM_16       1
 #define ARM_32       2


@@ -237,7 +183,7 @@ coff_arm_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 #define ARM_DISP16   5
 #define ARM_DISP32   6
 #define ARM_26D      7
 #define ARM_DISP16   5
 #define ARM_DISP32   6
 #define ARM_26D      7

-/* 8 is unused */
+/* 8 is unused.  */

 #define ARM_NEG16    9
 #define ARM_NEG32   10
 #define ARM_RVA32   11
 #define ARM_NEG16    9
 #define ARM_NEG32   10
 #define ARM_RVA32   11


@@ -245,26 +191,37 @@ coff_arm_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
 #define ARM_THUMB12 13
 #define ARM_THUMB23 14
 
 #define ARM_THUMB12 13
 #define ARM_THUMB23 14
 

-#ifdef ARM_WINCE
-#undef  ARM_32
-#undef  ARM_RVA32
-#undef  ARM_26
-#undef  ARM_THUMB12
-#undef  ARM_26D
+#endif

 
 

-#define ARM_32       1
-#define ARM_RVA32    2
-#define ARM_26      3
-#define ARM_THUMB12  4
-#define ARM_26D      5
-#define ARM_SECTION  14
-#define ARM_SECREL   15
+static bfd_reloc_status_type aoutarm_fix_pcrel_26_done
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type aoutarm_fix_pcrel_26
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type coff_thumb_pcrel_12
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+#ifndef ARM_WINCE
+static bfd_reloc_status_type coff_thumb_pcrel_9
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);
+static bfd_reloc_status_type coff_thumb_pcrel_23
+  (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **);

 #endif
 
 static reloc_howto_type aoutarm_std_reloc_howto[] =
   {
 #ifdef ARM_WINCE
 #endif
 
 static reloc_howto_type aoutarm_std_reloc_howto[] =
   {
 #ifdef ARM_WINCE

-    EMPTY_HOWTO (-1),
+    HOWTO (ARM_26D,
+          2,
+          2,
+          24,
+          TRUE,
+          0,
+          complain_overflow_dont,
+          aoutarm_fix_pcrel_26_done,
+          "ARM_26D",
+          TRUE,        /* partial_inplace.  */
+          0x00ffffff,
+          0x0,
+          PCRELOFFSET),

     HOWTO (ARM_32,
           0,
           2,
     HOWTO (ARM_32,
           0,
           2,


@@ -274,7 +231,7 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
           complain_overflow_bitfield,
           coff_arm_reloc,
           "ARM_32",
           complain_overflow_bitfield,
           coff_arm_reloc,
           "ARM_32",

-          TRUE,
+          TRUE,        /* partial_inplace.  */

           0xffffffff,
           0xffffffff,
           PCRELOFFSET),
           0xffffffff,
           0xffffffff,
           PCRELOFFSET),


@@ -287,7 +244,7 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
           complain_overflow_bitfield,
           coff_arm_reloc,
           "ARM_RVA32",
           complain_overflow_bitfield,
           coff_arm_reloc,
           "ARM_RVA32",

-          TRUE,
+          TRUE,        /* partial_inplace.  */

           0xffffffff,
           0xffffffff,
           PCRELOFFSET),
           0xffffffff,
           0xffffffff,
           PCRELOFFSET),


@@ -317,19 +274,7 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
           0x000007ff,
           0x000007ff,
           PCRELOFFSET),
           0x000007ff,
           0x000007ff,
           PCRELOFFSET),

-    HOWTO (ARM_26D,
-          2,
-          2,
-          24,
-          FALSE,
-          0,
-          complain_overflow_dont,
-          aoutarm_fix_pcrel_26_done,
-          "ARM_26D",
-          TRUE,
-          0x00ffffff,
-          0x0,
-          FALSE),
+    EMPTY_HOWTO (-1),

     EMPTY_HOWTO (-1),
     EMPTY_HOWTO (-1),
     EMPTY_HOWTO (-1),
     EMPTY_HOWTO (-1),
     EMPTY_HOWTO (-1),
     EMPTY_HOWTO (-1),


@@ -346,8 +291,8 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
           0,
           complain_overflow_bitfield,
           coff_arm_reloc,
           0,
           complain_overflow_bitfield,
           coff_arm_reloc,

-          "ARM_16",
-          TRUE,
+          "ARM_SECTION",
+          TRUE,        /* partial_inplace.  */

           0x0000ffff,
           0x0000ffff,
           PCRELOFFSET),
           0x0000ffff,
           0x0000ffff,
           PCRELOFFSET),


@@ -359,25 +304,25 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
           0,
           complain_overflow_bitfield,
           coff_arm_reloc,
           0,
           complain_overflow_bitfield,
           coff_arm_reloc,

-          "ARM_32",
-          TRUE,
+          "ARM_SECREL",
+          TRUE,        /* partial_inplace.  */

           0xffffffff,
           0xffffffff,
           PCRELOFFSET),
 #else /* not ARM_WINCE */
           0xffffffff,
           0xffffffff,
           PCRELOFFSET),
 #else /* not ARM_WINCE */

-    HOWTO (ARM_8,              /* type */
-          0,                   /* rightshift */
-          0,                   /* size */
-          8,                   /* bitsize */
-          FALSE,               /* pc_relative */
-          0,                   /* bitpos */
-          complain_overflow_bitfield, /* complain_on_overflow */
-          coff_arm_reloc,      /* special_function */
-          "ARM_8",             /* name */
-          TRUE,                /* partial_inplace */
-          0x000000ff,          /* src_mask */
-          0x000000ff,          /* dst_mask */
-          PCRELOFFSET          /* pcrel_offset */),
+    HOWTO (ARM_8,
+          0,
+          0,
+          8,
+          FALSE,
+          0,
+          complain_overflow_bitfield,
+          coff_arm_reloc,
+          "ARM_8",
+          TRUE,
+          0x000000ff,
+          0x000000ff,
+          PCRELOFFSET),

     HOWTO (ARM_16,
           0,
           1,
     HOWTO (ARM_16,
           0,
           1,


@@ -555,14 +500,12 @@ static reloc_howto_type aoutarm_std_reloc_howto[] =
 #define NUM_RELOCS NUM_ELEM (aoutarm_std_reloc_howto)
 
 #ifdef COFF_WITH_PE
 #define NUM_RELOCS NUM_ELEM (aoutarm_std_reloc_howto)
 
 #ifdef COFF_WITH_PE

-static bfd_boolean in_reloc_p PARAMS ((bfd *, reloc_howto_type *));

 /* Return TRUE if this relocation should
    appear in the output .reloc section.  */
 
 static bfd_boolean
 /* Return TRUE if this relocation should
    appear in the output .reloc section.  */
 
 static bfd_boolean

-in_reloc_p (abfd, howto)
-     bfd * abfd ATTRIBUTE_UNUSED;
-     reloc_howto_type * howto;
+in_reloc_p (bfd * abfd ATTRIBUTE_UNUSED,
+           reloc_howto_type * howto)

 {
   return !howto->pc_relative && howto->type != ARM_RVA32;
 }
 {
   return !howto->pc_relative && howto->type != ARM_RVA32;
 }


@@ -577,13 +520,12 @@ in_reloc_p (abfd, howto)
 #define coff_rtype_to_howto coff_arm_rtype_to_howto
 
 static reloc_howto_type *
 #define coff_rtype_to_howto coff_arm_rtype_to_howto
 
 static reloc_howto_type *

-coff_arm_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     asection *sec;
-     struct internal_reloc *rel;
-     struct coff_link_hash_entry *h ATTRIBUTE_UNUSED;
-     struct internal_syment *sym ATTRIBUTE_UNUSED;
-     bfd_vma *addendp;
+coff_arm_rtype_to_howto (bfd *abfd ATTRIBUTE_UNUSED,
+                        asection *sec,
+                        struct internal_reloc *rel,
+                        struct coff_link_hash_entry *h ATTRIBUTE_UNUSED,
+                        struct internal_syment *sym ATTRIBUTE_UNUSED,
+                        bfd_vma *addendp)

 {
   reloc_howto_type * howto;
 
 {
   reloc_howto_type * howto;
 


@@ -595,21 +537,44 @@ coff_arm_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
   if (rel->r_type == ARM_RVA32)
     *addendp -= pe_data (sec->output_section->owner)->pe_opthdr.ImageBase;
 
   if (rel->r_type == ARM_RVA32)
     *addendp -= pe_data (sec->output_section->owner)->pe_opthdr.ImageBase;
 

+#if defined COFF_WITH_PE && defined ARM_WINCE
+  if (rel->r_type == ARM_SECREL)
+    {
+      bfd_vma osect_vma;
+
+      if (h && (h->type == bfd_link_hash_defined
+               || h->type == bfd_link_hash_defweak))
+       osect_vma = h->root.u.def.section->output_section->vma;
+      else
+       {
+         int i;
+
+         /* Sigh, the only way to get the section to offset against
+            is to find it the hard way.  */
+
+         for (sec = abfd->sections, i = 1; i < sym->n_scnum; i++)
+           sec = sec->next;
+
+         osect_vma = sec->output_section->vma;
+       }
+
+      *addendp -= osect_vma;
+    }
+#endif
+

   return howto;
 }
 
 /* Used by the assembler.  */
 
 static bfd_reloc_status_type
   return howto;
 }
 
 /* Used by the assembler.  */
 
 static bfd_reloc_status_type

-aoutarm_fix_pcrel_26_done (abfd, reloc_entry, symbol, data, input_section,
-                         output_bfd, error_message)
-     bfd *abfd ATTRIBUTE_UNUSED;
-     arelent *reloc_entry ATTRIBUTE_UNUSED;
-     asymbol *symbol ATTRIBUTE_UNUSED;
-     PTR data ATTRIBUTE_UNUSED;
-     asection *input_section ATTRIBUTE_UNUSED;
-     bfd *output_bfd ATTRIBUTE_UNUSED;
-     char **error_message ATTRIBUTE_UNUSED;
+aoutarm_fix_pcrel_26_done (bfd *abfd ATTRIBUTE_UNUSED,
+                          arelent *reloc_entry ATTRIBUTE_UNUSED,
+                          asymbol *symbol ATTRIBUTE_UNUSED,
+                          void * data ATTRIBUTE_UNUSED,
+                          asection *input_section ATTRIBUTE_UNUSED,
+                          bfd *output_bfd ATTRIBUTE_UNUSED,
+                          char **error_message ATTRIBUTE_UNUSED)

 {
   /* This is dead simple at present.  */
   return bfd_reloc_ok;
 {
   /* This is dead simple at present.  */
   return bfd_reloc_ok;


@@ -618,15 +583,13 @@ aoutarm_fix_pcrel_26_done (abfd, reloc_entry, symbol, data, input_section,
 /* Used by the assembler.  */
 
 static bfd_reloc_status_type
 /* Used by the assembler.  */
 
 static bfd_reloc_status_type

-aoutarm_fix_pcrel_26 (abfd, reloc_entry, symbol, data, input_section,
-                    output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
+aoutarm_fix_pcrel_26 (bfd *abfd,
+                     arelent *reloc_entry,
+                     asymbol *symbol,
+                     void * data,
+                     asection *input_section,
+                     bfd *output_bfd,
+                     char **error_message ATTRIBUTE_UNUSED)

 {
   bfd_vma relocation;
   bfd_size_type addr = reloc_entry->address;
 {
   bfd_vma relocation;
   bfd_size_type addr = reloc_entry->address;


@@ -634,7 +597,7 @@ aoutarm_fix_pcrel_26 (abfd, reloc_entry, symbol, data, input_section,
   bfd_reloc_status_type flag = bfd_reloc_ok;
 
   /* If this is an undefined symbol, return error.  */
   bfd_reloc_status_type flag = bfd_reloc_ok;
 
   /* If this is an undefined symbol, return error.  */

-  if (symbol->section == &bfd_und_section
+  if (bfd_is_und_section (symbol->section)

       && (symbol->flags & BSF_WEAK) == 0)
     return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
 
       && (symbol->flags & BSF_WEAK) == 0)
     return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
 


@@ -678,16 +641,14 @@ aoutarm_fix_pcrel_26 (abfd, reloc_entry, symbol, data, input_section,
 }
 
 static bfd_reloc_status_type
 }
 
 static bfd_reloc_status_type

-coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section,
-                    output_bfd, error_message, btype)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message ATTRIBUTE_UNUSED;
-     thumb_pcrel_branchtype btype;
+coff_thumb_pcrel_common (bfd *abfd,
+                        arelent *reloc_entry,
+                        asymbol *symbol,
+                        void * data,
+                        asection *input_section,
+                        bfd *output_bfd,
+                        char **error_message ATTRIBUTE_UNUSED,
+                        thumb_pcrel_branchtype btype)

 {
   bfd_vma relocation = 0;
   bfd_size_type addr = reloc_entry->address;
 {
   bfd_vma relocation = 0;
   bfd_size_type addr = reloc_entry->address;


@@ -699,7 +660,6 @@ coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section,
 
   /* NOTE: This routine is currently used by GAS, but not by the link
      phase.  */
 
   /* NOTE: This routine is currently used by GAS, but not by the link
      phase.  */

-

   switch (btype)
     {
     case b9:
   switch (btype)
     {
     case b9:


@@ -725,7 +685,7 @@ coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section,
     }
 
   /* If this is an undefined symbol, return error.  */
     }
 
   /* If this is an undefined symbol, return error.  */

-  if (symbol->section == &bfd_und_section
+  if (bfd_is_und_section (symbol->section)

       && (symbol->flags & BSF_WEAK) == 0)
     return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
 
       && (symbol->flags & BSF_WEAK) == 0)
     return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
 


@@ -807,15 +767,13 @@ coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section,
 
 #ifndef ARM_WINCE
 static bfd_reloc_status_type
 
 #ifndef ARM_WINCE
 static bfd_reloc_status_type

-coff_thumb_pcrel_23 (abfd, reloc_entry, symbol, data, input_section,
-                    output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
+coff_thumb_pcrel_23 (bfd *abfd,
+                    arelent *reloc_entry,
+                    asymbol *symbol,
+                    void * data,
+                    asection *input_section,
+                    bfd *output_bfd,
+                    char **error_message)

 {
   return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
                                   input_section, output_bfd, error_message,
 {
   return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
                                   input_section, output_bfd, error_message,


@@ -823,15 +781,13 @@ coff_thumb_pcrel_23 (abfd, reloc_entry, symbol, data, input_section,
 }
 
 static bfd_reloc_status_type
 }
 
 static bfd_reloc_status_type

-coff_thumb_pcrel_9 (abfd, reloc_entry, symbol, data, input_section,
-                    output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
+coff_thumb_pcrel_9 (bfd *abfd,
+                   arelent *reloc_entry,
+                   asymbol *symbol,
+                   void * data,
+                   asection *input_section,
+                   bfd *output_bfd,
+                   char **error_message)

 {
   return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
                                   input_section, output_bfd, error_message,
 {
   return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
                                   input_section, output_bfd, error_message,


@@ -840,15 +796,13 @@ coff_thumb_pcrel_9 (abfd, reloc_entry, symbol, data, input_section,
 #endif /* not ARM_WINCE */
 
 static bfd_reloc_status_type
 #endif /* not ARM_WINCE */
 
 static bfd_reloc_status_type

-coff_thumb_pcrel_12 (abfd, reloc_entry, symbol, data, input_section,
-                    output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
+coff_thumb_pcrel_12 (bfd *abfd,
+                    arelent *reloc_entry,
+                    asymbol *symbol,
+                    void * data,
+                    asection *input_section,
+                    bfd *output_bfd,
+                    char **error_message)

 {
   return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
                                   input_section, output_bfd, error_message,
 {
   return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
                                   input_section, output_bfd, error_message,


@@ -856,20 +810,18 @@ coff_thumb_pcrel_12 (abfd, reloc_entry, symbol, data, input_section,
 }
 
 static const struct reloc_howto_struct *
 }
 
 static const struct reloc_howto_struct *

-coff_arm_reloc_type_lookup (abfd, code)
-      bfd * abfd;
-      bfd_reloc_code_real_type code;
+coff_arm_reloc_type_lookup (bfd * abfd, bfd_reloc_code_real_type code)

 {
 #define ASTD(i,j)       case i: return aoutarm_std_reloc_howto + j
 
   if (code == BFD_RELOC_CTOR)
 {
 #define ASTD(i,j)       case i: return aoutarm_std_reloc_howto + j
 
   if (code == BFD_RELOC_CTOR)

-    switch (bfd_get_arch_info (abfd)->bits_per_address)
+    switch (bfd_arch_bits_per_address (abfd))

       {
       case 32:
         code = BFD_RELOC_32;
         break;
       default:
       {
       case 32:
         code = BFD_RELOC_32;
         break;
       default:

-       return (const struct reloc_howto_struct *) 0;
+       return NULL;

       }
 
   switch (code)
       }
 
   switch (code)


@@ -879,6 +831,7 @@ coff_arm_reloc_type_lookup (abfd, code)
       ASTD (BFD_RELOC_RVA,                  ARM_RVA32);
       ASTD (BFD_RELOC_ARM_PCREL_BRANCH,     ARM_26);
       ASTD (BFD_RELOC_THUMB_PCREL_BRANCH12, ARM_THUMB12);
       ASTD (BFD_RELOC_RVA,                  ARM_RVA32);
       ASTD (BFD_RELOC_ARM_PCREL_BRANCH,     ARM_26);
       ASTD (BFD_RELOC_THUMB_PCREL_BRANCH12, ARM_THUMB12);

+      ASTD (BFD_RELOC_32_SECREL,            ARM_SECREL);

 #else
       ASTD (BFD_RELOC_8,                    ARM_8);
       ASTD (BFD_RELOC_16,                   ARM_16);
 #else
       ASTD (BFD_RELOC_8,                    ARM_8);
       ASTD (BFD_RELOC_16,                   ARM_16);


@@ -894,17 +847,34 @@ coff_arm_reloc_type_lookup (abfd, code)
       ASTD (BFD_RELOC_THUMB_PCREL_BRANCH23, ARM_THUMB23);
       ASTD (BFD_RELOC_THUMB_PCREL_BLX,      ARM_THUMB23);
 #endif
       ASTD (BFD_RELOC_THUMB_PCREL_BRANCH23, ARM_THUMB23);
       ASTD (BFD_RELOC_THUMB_PCREL_BLX,      ARM_THUMB23);
 #endif

-    default: return (const struct reloc_howto_struct *) 0;
+    default: return NULL;

     }
 }
 
     }
 }
 

-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
-#define COFF_PAGE_SIZE 0x1000
-/* Turn a howto into a reloc  nunmber */
+static reloc_howto_type *
+coff_arm_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED,
+                           const char *r_name)
+{
+  unsigned int i;

 
 

+  for (i = 0;
+       i < (sizeof (aoutarm_std_reloc_howto)
+           / sizeof (aoutarm_std_reloc_howto[0]));
+       i++)
+    if (aoutarm_std_reloc_howto[i].name != NULL
+       && strcasecmp (aoutarm_std_reloc_howto[i].name, r_name) == 0)
+      return &aoutarm_std_reloc_howto[i];
+
+  return NULL;
+}
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER  2
+#define COFF_PAGE_SIZE                        0x1000
+
+/* Turn a howto into a reloc  nunmber.  */

 #define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
 #define SELECT_RELOC(x,howto) { x.r_type = howto->type; }

-#define BADMAG(x) ARMBADMAG(x)
-#define ARM 1                  /* Customize coffcode.h */
+#define BADMAG(x)             ARMBADMAG(x)
+#define ARM                   1                        /* Customize coffcode.h.  */

 
 #ifndef ARM_WINCE
 /* Make sure that the 'r_offset' field is copied properly
 
 #ifndef ARM_WINCE
 /* Make sure that the 'r_offset' field is copied properly


@@ -941,46 +911,45 @@ struct coff_arm_link_hash_table
 /* Create an ARM coff linker hash table.  */
 
 static struct bfd_link_hash_table *
 /* Create an ARM coff linker hash table.  */
 
 static struct bfd_link_hash_table *

-coff_arm_link_hash_table_create (abfd)
-     bfd * abfd;
+coff_arm_link_hash_table_create (bfd * abfd)

 {
   struct coff_arm_link_hash_table * ret;
   bfd_size_type amt = sizeof (struct coff_arm_link_hash_table);
 
 {
   struct coff_arm_link_hash_table * ret;
   bfd_size_type amt = sizeof (struct coff_arm_link_hash_table);
 

-  ret = (struct coff_arm_link_hash_table *) bfd_malloc (amt);
-  if (ret == (struct coff_arm_link_hash_table *) NULL)
+  ret = bfd_zmalloc (amt);
+  if (ret == NULL)

     return NULL;
 
     return NULL;
 

-  if (! _bfd_coff_link_hash_table_init
-      (& ret->root, abfd, _bfd_coff_link_hash_newfunc))
+  if (!_bfd_coff_link_hash_table_init (&ret->root,
+                                      abfd,
+                                      _bfd_coff_link_hash_newfunc,
+                                      sizeof (struct coff_link_hash_entry)))

     {
       free (ret);
     {
       free (ret);

-      return (struct bfd_link_hash_table *) NULL;
+      return NULL;

     }
 
     }
 

-  ret->thumb_glue_size   = 0;
-  ret->arm_glue_size     = 0;
-  ret->bfd_of_glue_owner = NULL;
-

   return & ret->root.root;
 }
 
   return & ret->root.root;
 }
 

-static void
-arm_emit_base_file_entry (info, output_bfd, input_section, reloc_offset)
-      struct bfd_link_info *info;
-      bfd *output_bfd;
-      asection *input_section;
-      bfd_vma reloc_offset;
+static bfd_boolean
+arm_emit_base_file_entry (struct bfd_link_info *info,
+                         bfd *output_bfd,
+                         asection *input_section,
+                         bfd_vma reloc_offset)

 {
 {

-  bfd_vma addr = reloc_offset
-                - input_section->vma
-                + input_section->output_offset
-                  + input_section->output_section->vma;
+  bfd_vma addr = (reloc_offset
+                 - input_section->vma
+                 + input_section->output_offset
+                 + input_section->output_section->vma);

 
   if (coff_data (output_bfd)->pe)
      addr -= pe_data (output_bfd)->pe_opthdr.ImageBase;
 
   if (coff_data (output_bfd)->pe)
      addr -= pe_data (output_bfd)->pe_opthdr.ImageBase;

-  fwrite (& addr, 1, sizeof (addr), (FILE *) info->base_file);
+  if (fwrite (&addr, sizeof (addr), 1, (FILE *) info->base_file) == 1)
+    return TRUE;

 
 

+  bfd_set_error (bfd_error_system_call);
+  return FALSE;

 }
 \f
 #ifndef ARM_WINCE
 }
 \f
 #ifndef ARM_WINCE


@@ -1016,18 +985,16 @@ arm_emit_base_file_entry (info, output_bfd, input_section, reloc_offset)
 #define HI_LOW_ORDER 0xF000F800
 
 static insn32
 #define HI_LOW_ORDER 0xF000F800
 
 static insn32

-insert_thumb_branch (br_insn, rel_off)
-     insn32 br_insn;
-     int rel_off;
+insert_thumb_branch (insn32 br_insn, int rel_off)

 {
   unsigned int low_bits;
   unsigned int high_bits;
 
 {
   unsigned int low_bits;
   unsigned int high_bits;
 

-  BFD_ASSERT((rel_off & 1) != 1);
+  BFD_ASSERT ((rel_off & 1) != 1);

 
 

-  rel_off >>= 1;                              /* half word aligned address */
-  low_bits = rel_off & 0x000007FF;            /* the bottom 11 bits */
-  high_bits = (rel_off >> 11) & 0x000007FF;   /* the top 11 bits */
+  rel_off >>= 1;                              /* Half word aligned address.  */
+  low_bits = rel_off & 0x000007FF;            /* The bottom 11 bits.  */
+  high_bits = (rel_off >> 11) & 0x000007FF;   /* The top 11 bits.  */

 
   if ((br_insn & LOW_HI_ORDER) == LOW_HI_ORDER)
     br_insn = LOW_HI_ORDER | (low_bits << 16) | high_bits;
 
   if ((br_insn & LOW_HI_ORDER) == LOW_HI_ORDER)
     br_insn = LOW_HI_ORDER | (low_bits << 16) | high_bits;


@@ -1043,16 +1010,15 @@ insert_thumb_branch (br_insn, rel_off)
 
 \f
 static struct coff_link_hash_entry *
 
 \f
 static struct coff_link_hash_entry *

-find_thumb_glue (info, name, input_bfd)
-     struct bfd_link_info *info;
-     const char *name;
-     bfd *input_bfd;
+find_thumb_glue (struct bfd_link_info *info,
+                const char *name,
+                bfd *input_bfd)

 {
   char *tmp_name;
   struct coff_link_hash_entry *myh;
   bfd_size_type amt = strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1;
 
 {
   char *tmp_name;
   struct coff_link_hash_entry *myh;
   bfd_size_type amt = strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1;
 

-  tmp_name = (char *) bfd_malloc (amt);
+  tmp_name = bfd_malloc (amt);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -1063,8 +1029,8 @@ find_thumb_glue (info, name, input_bfd)
 
   if (myh == NULL)
     /* xgettext:c-format */
 
   if (myh == NULL)
     /* xgettext:c-format */

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

 
   free (tmp_name);
 
 
   free (tmp_name);
 


@@ -1073,16 +1039,15 @@ find_thumb_glue (info, name, input_bfd)
 #endif /* not ARM_WINCE */
 
 static struct coff_link_hash_entry *
 #endif /* not ARM_WINCE */
 
 static struct coff_link_hash_entry *

-find_arm_glue (info, name, input_bfd)
-     struct bfd_link_info *info;
-     const char *name;
-     bfd *input_bfd;
+find_arm_glue (struct bfd_link_info *info,
+              const char *name,
+              bfd *input_bfd)

 {
   char *tmp_name;
   struct coff_link_hash_entry * myh;
   bfd_size_type amt = strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1;
 
 {
   char *tmp_name;
   struct coff_link_hash_entry * myh;
   bfd_size_type amt = strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1;
 

-  tmp_name = (char *) bfd_malloc (amt);
+  tmp_name = bfd_malloc (amt);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -1093,8 +1058,8 @@ find_arm_glue (info, name, input_bfd)
 
   if (myh == NULL)
     /* xgettext:c-format */
 
   if (myh == NULL)
     /* xgettext:c-format */

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

 
   free (tmp_name);
 
 
   free (tmp_name);
 


@@ -1136,6 +1101,7 @@ static const insn32 a2t3_func_addr_insn = 0x00000001;
 */
 
 #define THUMB2ARM_GLUE_SIZE (globals->support_old_code ? 20 : 8)
 */
 
 #define THUMB2ARM_GLUE_SIZE (globals->support_old_code ? 20 : 8)

+#ifndef ARM_WINCE

 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 t2a1_bx_pc_insn = 0x4778;
 static const insn16 t2a2_noop_insn  = 0x46c0;
 static const insn32 t2a3_b_insn     = 0xea000000;


@@ -1146,6 +1112,7 @@ 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;
 static const insn16 t2a4_bx_insn    = 0x4730;
 static const insn32 t2a5_pop_insn   = 0xe8bd4040;
 static const insn32 t2a6_bx_insn    = 0xe12fff1e;

+#endif

 
 /* TODO:
      We should really create new local (static) symbols in destination
 
 /* TODO:
      We should really create new local (static) symbols in destination


@@ -1189,19 +1156,20 @@ static const insn32 t2a6_bx_insn    = 0xe12fff1e;
    is different from the original.  */
 
 static bfd_boolean
    is different from the original.  */
 
 static bfd_boolean

-coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
-                           contents, relocs, syms, sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
+coff_arm_relocate_section (bfd *output_bfd,
+                          struct bfd_link_info *info,
+                          bfd *input_bfd,
+                          asection *input_section,
+                          bfd_byte *contents,
+                          struct internal_reloc *relocs,
+                          struct internal_syment *syms,
+                          asection **sections)

 {
   struct internal_reloc * rel;
   struct internal_reloc * relend;
 {
   struct internal_reloc * rel;
   struct internal_reloc * relend;

+#ifndef ARM_WINCE
+  bfd_vma high_address = bfd_get_section_limit (input_bfd, input_section);
+#endif

 
   rel = relocs;
   relend = rel + input_section->reloc_count;
 
   rel = relocs;
   relend = rel + input_section->reloc_count;


@@ -1250,7 +1218,8 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
          when doing a relocatable link.  However, we want to convert
          ARM_26 to ARM_26D relocs if possible.  We return a fake howto in
          this case without pcrel_offset set, and adjust the addend to
          when doing a relocatable link.  However, we want to convert
          ARM_26 to ARM_26D relocs if possible.  We return a fake howto in
          this case without pcrel_offset set, and adjust the addend to

-         compensate.  */
+         compensate.  'partial_inplace' is also set, since we want 'done'
+         relocations to be reflected in section's data.  */

       if (rel->r_type == ARM_26
           && h != NULL
           && info->relocatable
       if (rel->r_type == ARM_26
           && h != NULL
           && info->relocatable


@@ -1269,23 +1238,25 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
               complain_overflow_signed,
               aoutarm_fix_pcrel_26 ,
               "ARM_26",
               complain_overflow_signed,
               aoutarm_fix_pcrel_26 ,
               "ARM_26",

-              FALSE,
+              TRUE,

               0x00ffffff,
               0x00ffffff,
               FALSE);
 
           addend -= rel->r_vaddr - input_section->vma;
               0x00ffffff,
               0x00ffffff,
               FALSE);
 
           addend -= rel->r_vaddr - input_section->vma;

-          howto = &fake_arm26_reloc;
+#ifdef ARM_WINCE
+          /* FIXME: I don't know why, but the hack is necessary for correct
+                    generation of bl's instruction offset.  */
+          addend -= 8;
+#endif
+          howto = & fake_arm26_reloc;

         }
 
 #ifdef ARM_WINCE
       /* MS ARM-CE makes the reloc relative to the opcode's pc, not
         the next opcode's pc, so is off by one.  */
         }
 
 #ifdef ARM_WINCE
       /* MS ARM-CE makes the reloc relative to the opcode's pc, not
         the next opcode's pc, so is off by one.  */

-#if 0 /* This appears to have been true for WINCE 2.0, but it is not
-        true for WINCE 3.0.  */

       if (howto->pc_relative && !info->relocatable)
        addend -= 8;
       if (howto->pc_relative && !info->relocatable)
        addend -= 8;

-#endif

 #endif
 
       /* If we are doing a relocatable link, then we can just ignore
 #endif
 
       /* If we are doing a relocatable link, then we can just ignore


@@ -1335,7 +1306,6 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
        }
       else
        {
        }
       else
        {

-#if 1 /* THUMBEXTENSION */

           /* We don't output the stubs if we are generating a
              relocatable output file, since we may as well leave the
              stub generation to the final linker pass. If we fail to
           /* We don't output the stubs if we are generating a
              relocatable output file, since we may as well leave the
              stub generation to the final linker pass. If we fail to


@@ -1355,8 +1325,8 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 
               if (howto->type == ARM_26)
                 {
 
               if (howto->type == ARM_26)
                 {

-                  if (   h->class == C_THUMBSTATFUNC
-                     || h->class == C_THUMBEXTFUNC)
+                  if (   h->symbol_class == C_THUMBSTATFUNC
+                     || h->symbol_class == C_THUMBEXTFUNC)

                    {
                      /* Arm code calling a Thumb function.  */
                      unsigned long int                 tmp;
                    {
                      /* Arm code calling a Thumb function.  */
                      unsigned long int                 tmp;


@@ -1388,16 +1358,11 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                          if (h_sec->owner != NULL
                              && INTERWORK_SET (h_sec->owner)
                              && ! INTERWORK_FLAG (h_sec->owner))
                          if (h_sec->owner != NULL
                              && INTERWORK_SET (h_sec->owner)
                              && ! INTERWORK_FLAG (h_sec->owner))

-                           {
-                             _bfd_error_handler
-                               /* xgettext:c-format */
-                               (_("%s(%s): warning: interworking not enabled."),
-                                bfd_archive_filename (h_sec->owner), name);
-                             _bfd_error_handler
-                               /* xgettext:c-format */
-                               (_("  first occurrence: %s: arm call to thumb"),
-                                bfd_archive_filename (input_bfd));
-                           }
+                           _bfd_error_handler
+                             /* xgettext:c-format */
+                             (_("%B(%s): warning: interworking not enabled.\n"
+                                "  first occurrence: %B: arm call to thumb"),
+                              h_sec->owner, input_bfd, name);

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


@@ -1412,10 +1377,10 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                          bfd_put_32 (output_bfd, h_val | a2t3_func_addr_insn,
                                      s->contents + my_offset + 8);
 
                          bfd_put_32 (output_bfd, h_val | a2t3_func_addr_insn,
                                      s->contents + my_offset + 8);
 

-                          if (info->base_file)
-                            arm_emit_base_file_entry (info, output_bfd, s,
-                                                      my_offset + 8);
-
+                          if (info->base_file
+                             && !arm_emit_base_file_entry (info, output_bfd,
+                                                           s, my_offset + 8))
+                           return FALSE;

                        }
 
                      BFD_ASSERT (my_offset <= globals->arm_glue_size);
                        }
 
                      BFD_ASSERT (my_offset <= globals->arm_glue_size);


@@ -1447,11 +1412,11 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
              /* Note: We used to check for ARM_THUMB9 and ARM_THUMB12.  */
               else if (howto->type == ARM_THUMB23)
                 {
              /* Note: We used to check for ARM_THUMB9 and ARM_THUMB12.  */
               else if (howto->type == ARM_THUMB23)
                 {

-                  if (   h->class == C_EXT
-                     || h->class == C_STAT
-                     || h->class == C_LABEL)
+                  if (   h->symbol_class == C_EXT
+                     || h->symbol_class == C_STAT
+                     || h->symbol_class == C_LABEL)

                    {
                    {

-                     /* Thumb code calling an ARM function */
+                     /* Thumb code calling an ARM function.  */

                      asection *                         s = 0;
                      bfd_vma                            my_offset;
                      unsigned long int                  tmp;
                      asection *                         s = 0;
                      bfd_vma                            my_offset;
                      unsigned long int                  tmp;


@@ -1483,18 +1448,12 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                              && INTERWORK_SET (h_sec->owner)
                              && ! INTERWORK_FLAG (h_sec->owner)
                              && ! globals->support_old_code)
                              && INTERWORK_SET (h_sec->owner)
                              && ! INTERWORK_FLAG (h_sec->owner)
                              && ! globals->support_old_code)

-                           {
-                             _bfd_error_handler
-                               /* xgettext:c-format */
-                               (_("%s(%s): warning: interworking not enabled."),
-                                bfd_archive_filename (h_sec->owner), name);
-                             _bfd_error_handler
-                               /* xgettext:c-format */
-                               (_("  first occurrence: %s: thumb call to arm"),
-                                bfd_archive_filename (input_bfd));
-                             _bfd_error_handler
-                               (_("  consider relinking with --support-old-code enabled"));
-                           }
+                           _bfd_error_handler
+                             /* xgettext:c-format */
+                             (_("%B(%s): warning: interworking not enabled.\n"
+                                "  first occurrence: %B: thumb call to arm\n"
+                                "  consider relinking with --support-old-code enabled"),
+                              h_sec->owner, input_bfd, name);

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


@@ -1523,9 +1482,11 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                              bfd_put_32 (output_bfd, h_val,
                                          s->contents + my_offset + 16);
 
                              bfd_put_32 (output_bfd, h_val,
                                          s->contents + my_offset + 16);
 

-                              if (info->base_file)
-                                arm_emit_base_file_entry (info, output_bfd, s,
-                                                         my_offset + 16);
+                              if (info->base_file
+                                 && !arm_emit_base_file_entry (info,
+                                                               output_bfd, s,
+                                                               my_offset + 16))
+                               return FALSE;

                            }
                          else
                            {
                            }
                          else
                            {


@@ -1536,13 +1497,19 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                                          s->contents + my_offset + 2);
 
                              ret_offset =
                                          s->contents + my_offset + 2);
 
                              ret_offset =

-                               ((bfd_signed_vma) h_val)        /* Address of destination of the stub.  */
+               /* Address of destination of the stub.  */
+                               ((bfd_signed_vma) h_val)

                                - ((bfd_signed_vma)
                                - ((bfd_signed_vma)

-                                  (s->output_offset            /* Offset from the start of the current section to the start of the stubs.  */
-                                   + my_offset                 /* Offset of the start of this stub from the start of the stubs.  */
-                                   + s->output_section->vma)   /* Address of the start of the current section.  */
-                                  + 4                          /* The branch instruction is 4 bytes into the stub.  */
-                                  + 8);                        /* ARM branches work from the pc of the instruction + 8.  */
+               /* Offset from the start of the current section to the start of the stubs.  */
+                                  (s->output_offset
+               /* Offset of the start of this stub from the start of the stubs.  */
+                                   + my_offset
+               /* Address of the start of the current section.  */
+                                   + s->output_section->vma)
+               /* The branch instruction is 4 bytes into the stub.  */
+                                  + 4
+               /* ARM branches work from the pc of the instruction + 8.  */
+                                  + 8);

 
                              bfd_put_32 (output_bfd,
                                          (bfd_vma) t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),
 
                              bfd_put_32 (output_bfd,
                                          (bfd_vma) t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),


@@ -1583,7 +1550,6 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
          if (done)
            rstat = bfd_reloc_ok;
          else
          if (done)
            rstat = bfd_reloc_ok;
          else

-#endif /* THUMBEXTENSION */

            if (   h->root.type == bfd_link_hash_defined
                || h->root.type == bfd_link_hash_defweak)
            {
            if (   h->root.type == bfd_link_hash_defined
                || h->root.type == bfd_link_hash_defweak)
            {


@@ -1604,19 +1570,18 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
            }
        }
 
            }
        }
 

-      if (info->base_file)
-       {
-         /* Emit a reloc if the backend thinks it needs it.  */
-         if (sym && pe_data(output_bfd)->in_reloc_p(output_bfd, howto))
-            arm_emit_base_file_entry (info, output_bfd, input_section,
-                                     rel->r_vaddr);
-       }
+      /* Emit a reloc if the backend thinks it needs it.  */
+      if (info->base_file
+         && sym
+         && pe_data(output_bfd)->in_reloc_p(output_bfd, howto)
+         && !arm_emit_base_file_entry (info, output_bfd, input_section,
+                                       rel->r_vaddr))
+       return FALSE;

 
 

-#if 1 /* THUMBEXTENSION */

       if (done)
        rstat = bfd_reloc_ok;
 #ifndef ARM_WINCE
       if (done)
        rstat = bfd_reloc_ok;
 #ifndef ARM_WINCE

-      /* Only perform this fix during the final link, not a relocatable link.  nickc@cygnus.com  */
+      /* Only perform this fix during the final link, not a relocatable link.  */

       else if (! info->relocatable
               && howto->type == ARM_THUMB23)
         {
       else if (! info->relocatable
               && howto->type == ARM_THUMB23)
         {


@@ -1630,7 +1595,7 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 
           bfd_vma address = rel->r_vaddr - input_section->vma;
 
 
           bfd_vma address = rel->r_vaddr - input_section->vma;
 

-          if (address > input_section->_raw_size)
+         if (address > high_address)

            rstat = bfd_reloc_outofrange;
           else
             {
            rstat = bfd_reloc_outofrange;
           else
             {


@@ -1733,27 +1698,24 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
         }
 #endif
       else
         }
 #endif
       else

-#endif /* THUMBEXTENSION */
-        rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
-                                          contents,
-                                          rel->r_vaddr - input_section->vma,
-                                          val, addend);
-#if 1 /* THUMBEXTENSION */
-      /* FIXME:
-        Is this the best way to fix up thumb addresses? krk@cygnus.com
-        Probably not, but it works, and if it works it don't need fixing!  nickc@cygnus.com */
-      /* Only perform this fix during the final link, not a relocatable link.  nickc@cygnus.com  */
+        if (info->relocatable && ! howto->partial_inplace)
+            rstat = bfd_reloc_ok;
+        else
+         rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
+                                           contents,
+                                           rel->r_vaddr - input_section->vma,
+                                           val, addend);
+      /* Only perform this fix during the final link, not a relocatable link.  */

       if (! info->relocatable
          && (rel->r_type == ARM_32 || rel->r_type == ARM_RVA32))
        {
          /* Determine if we need to set the bottom bit of a relocated address
             because the address is the address of a Thumb code symbol.  */
       if (! info->relocatable
          && (rel->r_type == ARM_32 || rel->r_type == ARM_RVA32))
        {
          /* Determine if we need to set the bottom bit of a relocated address
             because the address is the address of a Thumb code symbol.  */

-

          int patchit = FALSE;
 
          if (h != NULL
          int patchit = FALSE;
 
          if (h != NULL

-             && (   h->class == C_THUMBSTATFUNC
-                 || h->class == C_THUMBEXTFUNC))
+             && (   h->symbol_class == C_THUMBSTATFUNC
+                 || h->symbol_class == C_THUMBEXTFUNC))

            {
              patchit = TRUE;
            }
            {
              patchit = TRUE;
            }


@@ -1761,7 +1723,6 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
                   && sym->n_scnum > N_UNDEF)
            {
              /* No hash entry - use the symbol instead.  */
                   && sym->n_scnum > N_UNDEF)
            {
              /* No hash entry - use the symbol instead.  */

-

              if (   sym->n_sclass == C_THUMBSTATFUNC
                  || sym->n_sclass == C_THUMBEXTFUNC)
                patchit = TRUE;
              if (   sym->n_sclass == C_THUMBSTATFUNC
                  || sym->n_sclass == C_THUMBEXTFUNC)
                patchit = TRUE;


@@ -1775,7 +1736,6 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
              bfd_put_32 (input_bfd, x | 1, location);
            }
        }
              bfd_put_32 (input_bfd, x | 1, location);
            }
        }

-#endif /* THUMBEXTENSION */

 
       switch (rstat)
        {
 
       switch (rstat)
        {


@@ -1785,10 +1745,8 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
          break;
        case bfd_reloc_outofrange:
          (*_bfd_error_handler)
          break;
        case bfd_reloc_outofrange:
          (*_bfd_error_handler)

-           (_("%s: bad reloc address 0x%lx in section `%s'"),
-            bfd_archive_filename (input_bfd),
-            (unsigned long) rel->r_vaddr,
-            bfd_get_section_name (input_bfd, input_section));
+           (_("%B: bad reloc address 0x%lx in section `%A'"),
+            input_bfd, input_section, (unsigned long) rel->r_vaddr);

          return FALSE;
        case bfd_reloc_overflow:
          {
          return FALSE;
        case bfd_reloc_overflow:
          {


@@ -1798,7 +1756,7 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
            if (symndx == -1)
              name = "*ABS*";
            else if (h != NULL)
            if (symndx == -1)
              name = "*ABS*";
            else if (h != NULL)

-             name = h->root.root.string;
+             name = NULL;

            else
              {
                name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
            else
              {
                name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);


@@ -1807,8 +1765,9 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
              }
 
            if (! ((*info->callbacks->reloc_overflow)
              }
 
            if (! ((*info->callbacks->reloc_overflow)

-                  (info, name, howto->name, (bfd_vma) 0, input_bfd,
-                   input_section, rel->r_vaddr - input_section->vma)))
+                  (info, (h ? &h->root : NULL), name, howto->name,
+                   (bfd_vma) 0, input_bfd, input_section,
+                   rel->r_vaddr - input_section->vma)))

              return FALSE;
          }
        }
              return FALSE;
          }
        }


@@ -1820,15 +1779,11 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
 #ifndef COFF_IMAGE_WITH_PE
 
 bfd_boolean
 #ifndef COFF_IMAGE_WITH_PE
 
 bfd_boolean

-bfd_arm_allocate_interworking_sections (info)
-     struct bfd_link_info * info;
+bfd_arm_allocate_interworking_sections (struct bfd_link_info * info)

 {
   asection *                        s;
   bfd_byte *                        foo;
   struct coff_arm_link_hash_table * globals;
 {
   asection *                        s;
   bfd_byte *                        foo;
   struct coff_arm_link_hash_table * globals;

-#if 0
-  static char                       test_char = '1';
-#endif

 
   globals = coff_arm_hash_table (info);
 
 
   globals = coff_arm_hash_table (info);
 


@@ -1843,13 +1798,9 @@ bfd_arm_allocate_interworking_sections (info)
 
       BFD_ASSERT (s != NULL);
 
 
       BFD_ASSERT (s != NULL);
 

-      foo = (bfd_byte *) bfd_alloc (globals->bfd_of_glue_owner,
-                                   globals->arm_glue_size);
-#if 0
-      memset (foo, test_char, (size_t) globals->arm_glue_size);
-#endif
+      foo = bfd_alloc (globals->bfd_of_glue_owner, globals->arm_glue_size);

 
 

-      s->_raw_size = s->_cooked_size = globals->arm_glue_size;
+      s->size = globals->arm_glue_size;

       s->contents = foo;
     }
 
       s->contents = foo;
     }
 


@@ -1862,13 +1813,9 @@ bfd_arm_allocate_interworking_sections (info)
 
       BFD_ASSERT (s != NULL);
 
 
       BFD_ASSERT (s != NULL);
 

-      foo = (bfd_byte *) bfd_alloc (globals->bfd_of_glue_owner,
-                                   globals->thumb_glue_size);
-#if 0
-      memset (foo, test_char, (size_t) globals->thumb_glue_size);
-#endif
+      foo = bfd_alloc (globals->bfd_of_glue_owner, globals->thumb_glue_size);

 
 

-      s->_raw_size = s->_cooked_size = globals->thumb_glue_size;
+      s->size = globals->thumb_glue_size;

       s->contents = foo;
     }
 
       s->contents = foo;
     }
 


@@ -1876,9 +1823,8 @@ bfd_arm_allocate_interworking_sections (info)
 }
 
 static void
 }
 
 static void

-record_arm_to_thumb_glue (info, h)
-     struct bfd_link_info *        info;
-     struct coff_link_hash_entry * h;
+record_arm_to_thumb_glue (struct bfd_link_info *        info,
+                         struct coff_link_hash_entry * h)

 {
   const char *                      name = h->root.root.string;
   register asection *               s;
 {
   const char *                      name = h->root.root.string;
   register asection *               s;


@@ -1900,7 +1846,7 @@ record_arm_to_thumb_glue (info, h)
   BFD_ASSERT (s != NULL);
 
   amt = strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1;
   BFD_ASSERT (s != NULL);
 
   amt = strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1;

-  tmp_name = (char *) bfd_malloc (amt);
+  tmp_name = bfd_malloc (amt);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -1912,13 +1858,13 @@ record_arm_to_thumb_glue (info, h)
   if (myh != NULL)
     {
       free (tmp_name);
   if (myh != NULL)
     {
       free (tmp_name);

-      return; /* we've already seen this guy */
+      /* We've already seen this guy.  */
+      return;

     }
 
   /* The only trick here is using globals->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 globals->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_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
   bh = NULL;
   val = globals->arm_glue_size + 1;
   bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,


@@ -1933,12 +1879,11 @@ record_arm_to_thumb_glue (info, h)
 
 #ifndef ARM_WINCE
 static void
 
 #ifndef ARM_WINCE
 static void

-record_thumb_to_arm_glue (info, h)
-     struct bfd_link_info *        info;
-     struct coff_link_hash_entry * h;
+record_thumb_to_arm_glue (struct bfd_link_info *        info,
+                         struct coff_link_hash_entry * h)

 {
   const char *                       name = h->root.root.string;
 {
   const char *                       name = h->root.root.string;

-  register asection *                s;
+  asection *                         s;

   char *                             tmp_name;
   struct coff_link_hash_entry *      myh;
   struct bfd_link_hash_entry *       bh;
   char *                             tmp_name;
   struct coff_link_hash_entry *      myh;
   struct bfd_link_hash_entry *       bh;


@@ -1957,7 +1902,7 @@ record_thumb_to_arm_glue (info, h)
   BFD_ASSERT (s != NULL);
 
   amt = strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1;
   BFD_ASSERT (s != NULL);
 
   amt = strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1;

-  tmp_name = (char *) bfd_malloc (amt);
+  tmp_name = bfd_malloc (amt);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -1969,7 +1914,8 @@ record_thumb_to_arm_glue (info, h)
   if (myh != NULL)
     {
       free (tmp_name);
   if (myh != NULL)
     {
       free (tmp_name);

-      return; /* we've already seen this guy */
+      /* We've already seen this guy.  */
+      return;

     }
 
   bh = NULL;
     }
 
   bh = NULL;


@@ -1979,7 +1925,7 @@ record_thumb_to_arm_glue (info, h)
 
   /* If we mark it 'thumb', the disassembler will do a better job.  */
   myh = (struct coff_link_hash_entry *) bh;
 
   /* If we mark it 'thumb', the disassembler will do a better job.  */
   myh = (struct coff_link_hash_entry *) bh;

-  myh->class = C_THUMBEXTFUNC;
+  myh->symbol_class = C_THUMBEXTFUNC;

 
   free (tmp_name);
 
 
   free (tmp_name);
 


@@ -1989,7 +1935,7 @@ record_thumb_to_arm_glue (info, h)
 #define BACK_FROM_ARM "__%s_back_from_arm"
 
   amt = strlen (name) + strlen (CHANGE_TO_ARM) + 1;
 #define BACK_FROM_ARM "__%s_back_from_arm"
 
   amt = strlen (name) + strlen (CHANGE_TO_ARM) + 1;

-  tmp_name = (char *) bfd_malloc (amt);
+  tmp_name = bfd_malloc (amt);

 
   BFD_ASSERT (tmp_name);
 
 
   BFD_ASSERT (tmp_name);
 


@@ -2013,9 +1959,8 @@ record_thumb_to_arm_glue (info, h)
    {armcoff/pe}.em  */
 
 bfd_boolean
    {armcoff/pe}.em  */
 
 bfd_boolean

-bfd_arm_get_bfd_for_interworking (abfd, info)
-     bfd *                 abfd;
-     struct bfd_link_info * info;
+bfd_arm_get_bfd_for_interworking (bfd *                 abfd,
+                                 struct bfd_link_info * info)

 {
   struct coff_arm_link_hash_table * globals;
   flagword                         flags;
 {
   struct coff_arm_link_hash_table * globals;
   flagword                         flags;


@@ -2037,12 +1982,11 @@ bfd_arm_get_bfd_for_interworking (abfd, info)
 
   if (sec == NULL)
     {
 
   if (sec == NULL)
     {

-      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_CODE | SEC_READONLY;
-
-      sec = bfd_make_section (abfd, ARM2THUMB_GLUE_SECTION_NAME);
-
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+              | SEC_CODE | SEC_READONLY);
+      sec = bfd_make_section_with_flags (abfd, ARM2THUMB_GLUE_SECTION_NAME,
+                                        flags);

       if (sec == NULL
       if (sec == NULL

-         || ! bfd_set_section_flags (abfd, sec, flags)

          || ! bfd_set_section_alignment (abfd, sec, 2))
        return FALSE;
     }
          || ! bfd_set_section_alignment (abfd, sec, 2))
        return FALSE;
     }


@@ -2051,12 +1995,12 @@ bfd_arm_get_bfd_for_interworking (abfd, info)
 
   if (sec == NULL)
     {
 
   if (sec == NULL)
     {

-      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_CODE | SEC_READONLY;
-
-      sec = bfd_make_section (abfd, THUMB2ARM_GLUE_SECTION_NAME);
+      flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
+              | SEC_CODE | SEC_READONLY);
+      sec = bfd_make_section_with_flags (abfd, THUMB2ARM_GLUE_SECTION_NAME,
+                                        flags);

 
       if (sec == NULL
 
       if (sec == NULL

-         || ! bfd_set_section_flags (abfd, sec, flags)

          || ! bfd_set_section_alignment (abfd, sec, 2))
        return FALSE;
     }
          || ! bfd_set_section_alignment (abfd, sec, 2))
        return FALSE;
     }


@@ -2068,10 +2012,9 @@ bfd_arm_get_bfd_for_interworking (abfd, info)
 }
 
 bfd_boolean
 }
 
 bfd_boolean

-bfd_arm_process_before_allocation (abfd, info, support_old_code)
-     bfd *                   abfd;
-     struct bfd_link_info *  info;
-     int                    support_old_code;
+bfd_arm_process_before_allocation (bfd *                   abfd,
+                                  struct bfd_link_info *  info,
+                                  int                     support_old_code)

 {
   asection * sec;
   struct coff_arm_link_hash_table * globals;
 {
   asection * sec;
   struct coff_arm_link_hash_table * globals;


@@ -2083,7 +2026,6 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
 
   /* 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.  */

-

   _bfd_coff_get_external_symbols (abfd);
 
   globals = coff_arm_hash_table (info);
   _bfd_coff_get_external_symbols (abfd);
 
   globals = coff_arm_hash_table (info);


@@ -2109,7 +2051,6 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
 
       /* Load the relocs.  */
       /* FIXME: there may be a storage leak here.  */
 
       /* Load the relocs.  */
       /* FIXME: there may be a storage leak here.  */

-

       i = _bfd_coff_read_internal_relocs (abfd, sec, 1, 0, 0, 0);
 
       BFD_ASSERT (i != 0);
       i = _bfd_coff_read_internal_relocs (abfd, sec, 1, 0, 0, 0);
 
       BFD_ASSERT (i != 0);


@@ -2129,8 +2070,8 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
          /* If the index is outside of the range of our table, something has gone wrong.  */
          if (symndx >= obj_conv_table_size (abfd))
            {
          /* If the index is outside of the range of our table, something has gone wrong.  */
          if (symndx >= obj_conv_table_size (abfd))
            {

-             _bfd_error_handler (_("%s: illegal symbol index in reloc: %d"),
-                                 bfd_archive_filename (abfd), symndx);
+             _bfd_error_handler (_("%B: illegal symbol index in reloc: %d"),
+                                 abfd, symndx);

              continue;
            }
 
              continue;
            }
 


@@ -2148,7 +2089,7 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
                 the target of the call. If it is a thumb target, we
                 insert glue.  */
 
                 the target of the call. If it is a thumb target, we
                 insert glue.  */
 

-             if (h->class == C_THUMBEXTFUNC)
+             if (h->symbol_class == C_THUMBEXTFUNC)

                record_arm_to_thumb_glue (info, h);
              break;
 
                record_arm_to_thumb_glue (info, h);
              break;
 


@@ -2162,7 +2103,7 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
                 for it.  This is not really a problem, since the link
                 is doomed anyway.  */
 
                 for it.  This is not really a problem, since the link
                 is doomed anyway.  */
 

-             switch (h->class)
+             switch (h->symbol_class)

                {
                case C_EXT:
                case C_STAT:
                {
                case C_EXT:
                case C_STAT:


@@ -2187,6 +2128,7 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
 #endif /* ! defined (COFF_IMAGE_WITH_PE) */
 
 #define coff_bfd_reloc_type_lookup             coff_arm_reloc_type_lookup
 #endif /* ! defined (COFF_IMAGE_WITH_PE) */
 
 #define coff_bfd_reloc_type_lookup             coff_arm_reloc_type_lookup

+#define coff_bfd_reloc_name_lookup     coff_arm_reloc_name_lookup

 #define coff_relocate_section                  coff_arm_relocate_section
 #define coff_bfd_is_local_label_name           coff_arm_is_local_label_name
 #define coff_adjust_symndx                     coff_arm_adjust_symndx
 #define coff_relocate_section                  coff_arm_relocate_section
 #define coff_bfd_is_local_label_name           coff_arm_is_local_label_name
 #define coff_adjust_symndx                     coff_arm_adjust_symndx


@@ -2202,13 +2144,12 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
    into ARM_26D relocs.  */
 
 static bfd_boolean
    into ARM_26D relocs.  */
 
 static bfd_boolean

-coff_arm_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
-     bfd *obfd ATTRIBUTE_UNUSED;
-     struct bfd_link_info *info ATTRIBUTE_UNUSED;
-     bfd *ibfd;
-     asection *sec;
-     struct internal_reloc *irel;
-     bfd_boolean *adjustedp;
+coff_arm_adjust_symndx (bfd *obfd ATTRIBUTE_UNUSED,
+                       struct bfd_link_info *info ATTRIBUTE_UNUSED,
+                       bfd *ibfd,
+                       asection *sec,
+                       struct internal_reloc *irel,
+                       bfd_boolean *adjustedp)

 {
   if (irel->r_type == ARM_26)
     {
 {
   if (irel->r_type == ARM_26)
     {


@@ -2231,9 +2172,7 @@ coff_arm_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
    targets, eg different CPUs or different APCS's.     */
 
 static bfd_boolean
    targets, eg different CPUs or different APCS's.     */
 
 static bfd_boolean

-coff_arm_merge_private_bfd_data (ibfd, obfd)
-     bfd *   ibfd;
-     bfd *   obfd;
+coff_arm_merge_private_bfd_data (bfd * ibfd, bfd * obfd)

 {
   BFD_ASSERT (ibfd != NULL && obfd != NULL);
 
 {
   BFD_ASSERT (ibfd != NULL && obfd != NULL);
 


@@ -2262,9 +2201,10 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
            {
              _bfd_error_handler
                /* xgettext: c-format */
            {
              _bfd_error_handler
                /* xgettext: c-format */

-               (_("ERROR: %s is compiled for APCS-%d, whereas %s is compiled for APCS-%d"),
-                bfd_archive_filename (ibfd), APCS_26_FLAG (ibfd) ? 26 : 32,
-                bfd_get_filename (obfd), APCS_26_FLAG (obfd) ? 26 : 32
+               (_("error: %B is compiled for APCS-%d, whereas %B is compiled for APCS-%d"),
+                ibfd, obfd,
+                APCS_26_FLAG (ibfd) ? 26 : 32,
+                APCS_26_FLAG (obfd) ? 26 : 32

                 );
 
              bfd_set_error (bfd_error_wrong_format);
                 );
 
              bfd_set_error (bfd_error_wrong_format);


@@ -2277,13 +2217,12 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
 
              if (APCS_FLOAT_FLAG (ibfd))
                /* xgettext: c-format */
 
              if (APCS_FLOAT_FLAG (ibfd))
                /* xgettext: c-format */

-               msg = _("ERROR: %s passes floats in float registers, whereas %s passes them in integer registers");
+               msg = _("error: %B passes floats in float registers, whereas %B passes them in integer registers");

              else
                /* xgettext: c-format */
              else
                /* xgettext: c-format */

-               msg = _("ERROR: %s passes floats in integer registers, whereas %s passes them in float registers");
+               msg = _("error: %B passes floats in integer registers, whereas %B passes them in float registers");

 
 

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

 
              bfd_set_error (bfd_error_wrong_format);
              return FALSE;
 
              bfd_set_error (bfd_error_wrong_format);
              return FALSE;


@@ -2295,12 +2234,11 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
 
              if (PIC_FLAG (ibfd))
                /* xgettext: c-format */
 
              if (PIC_FLAG (ibfd))
                /* xgettext: c-format */

-               msg = _("ERROR: %s is compiled as position independent code, whereas target %s is absolute position");
+               msg = _("error: %B is compiled as position independent code, whereas target %B is absolute position");

              else
                /* xgettext: c-format */
              else
                /* xgettext: c-format */

-               msg = _("ERROR: %s is compiled as absolute position code, whereas target %s is position independent");
-             _bfd_error_handler (msg, bfd_archive_filename (ibfd),
-                                 bfd_get_filename (obfd));
+               msg = _("error: %B is compiled as absolute position code, whereas target %B is position independent");
+             _bfd_error_handler (msg, ibfd, obfd);

 
              bfd_set_error (bfd_error_wrong_format);
              return FALSE;
 
              bfd_set_error (bfd_error_wrong_format);
              return FALSE;


@@ -2327,13 +2265,12 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
 
              if (INTERWORK_FLAG (ibfd))
                /* xgettext: c-format */
 
              if (INTERWORK_FLAG (ibfd))
                /* xgettext: c-format */

-               msg = _("Warning: %s supports interworking, whereas %s does not");
+               msg = _("Warning: %B supports interworking, whereas %B does not");

              else
                /* xgettext: c-format */
              else
                /* xgettext: c-format */

-               msg = _("Warning: %s does not support interworking, whereas %s does");
+               msg = _("Warning: %B does not support interworking, whereas %B does");

 
 

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

            }
        }
       else
            }
        }
       else


@@ -2348,9 +2285,7 @@ coff_arm_merge_private_bfd_data (ibfd, obfd)
 /* Display the flags field.  */
 
 static bfd_boolean
 /* Display the flags field.  */
 
 static bfd_boolean

-coff_arm_print_private_bfd_data (abfd, ptr)
-     bfd *   abfd;
-     PTR     ptr;
+coff_arm_print_private_bfd_data (bfd * abfd, void * ptr)

 {
   FILE * file = (FILE *) ptr;
 
 {
   FILE * file = (FILE *) ptr;
 


@@ -2395,9 +2330,7 @@ coff_arm_print_private_bfd_data (abfd, ptr)
    called from both coffcode.h and peicode.h.  */
 
 static bfd_boolean
    called from both coffcode.h and peicode.h.  */
 
 static bfd_boolean

-_bfd_coff_arm_set_private_flags (abfd, flags)
-       bfd *      abfd;
-       flagword   flags;
+_bfd_coff_arm_set_private_flags (bfd * abfd, flagword flags)

 {
   flagword flag;
 
 {
   flagword flag;
 


@@ -2428,12 +2361,12 @@ _bfd_coff_arm_set_private_flags (abfd, flags)
     {
       if (flag)
        /* xgettext: c-format */
     {
       if (flag)
        /* xgettext: c-format */

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

       else
        /* xgettext: c-format */
       else
        /* xgettext: c-format */

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

       flag = 0;
     }
 
       flag = 0;
     }
 


@@ -2446,9 +2379,7 @@ _bfd_coff_arm_set_private_flags (abfd, flags)
    from one instance of a BFD to another.  */
 
 static bfd_boolean
    from one instance of a BFD to another.  */
 
 static bfd_boolean

-coff_arm_copy_private_bfd_data (src, dest)
-     bfd *  src;
-     bfd *  dest;
+coff_arm_copy_private_bfd_data (bfd * src, bfd * dest)

 {
   BFD_ASSERT (src != NULL && dest != NULL);
 
 {
   BFD_ASSERT (src != NULL && dest != NULL);
 


@@ -2460,7 +2391,7 @@ coff_arm_copy_private_bfd_data (src, dest)
   if (src->xvec != dest->xvec)
     return TRUE;
 
   if (src->xvec != dest->xvec)
     return TRUE;
 

-  /* copy the flags field */
+  /* Copy the flags field.  */

   if (APCS_SET (src))
     {
       if (APCS_SET (dest))
   if (APCS_SET (src))
     {
       if (APCS_SET (dest))


@@ -2492,9 +2423,8 @@ coff_arm_copy_private_bfd_data (src, dest)
                {
                  /* xgettext:c-format */
                  _bfd_error_handler (("\
                {
                  /* xgettext:c-format */
                  _bfd_error_handler (("\

-Warning: Clearing the interworking flag of %s because non-interworking code in %s has been linked with it"),
-                                     bfd_get_filename (dest),
-                                     bfd_archive_filename (src));
+Warning: Clearing the interworking flag of %B because non-interworking code in %B has been linked with it"),
+                                     dest, src);

                }
 
              SET_INTERWORK_FLAG (dest, 0);
                }
 
              SET_INTERWORK_FLAG (dest, 0);


@@ -2511,7 +2441,9 @@ Warning: Clearing the interworking flag of %s because non-interworking code in %
 
 /* Note:  the definitions here of LOCAL_LABEL_PREFIX and USER_LABEL_PREIFX
    *must* match the definitions in gcc/config/arm/{coff|semi|aout}.h.  */
 
 /* Note:  the definitions here of LOCAL_LABEL_PREFIX and USER_LABEL_PREIFX
    *must* match the definitions in gcc/config/arm/{coff|semi|aout}.h.  */

+#ifndef LOCAL_LABEL_PREFIX

 #define LOCAL_LABEL_PREFIX ""
 #define LOCAL_LABEL_PREFIX ""

+#endif

 #ifndef USER_LABEL_PREFIX
 #define USER_LABEL_PREFIX "_"
 #endif
 #ifndef USER_LABEL_PREFIX
 #define USER_LABEL_PREFIX "_"
 #endif


@@ -2521,15 +2453,17 @@ Warning: Clearing the interworking flag of %s because non-interworking code in %
       non-local.
    b) Allow other prefixes than ".", e.g. an empty prefix would cause all
       labels of the form Lxxx to be stripped.  */
       non-local.
    b) Allow other prefixes than ".", e.g. an empty prefix would cause all
       labels of the form Lxxx to be stripped.  */

+

 static bfd_boolean
 static bfd_boolean

-coff_arm_is_local_label_name (abfd, name)
-     bfd *        abfd ATTRIBUTE_UNUSED;
-     const char * name;
+coff_arm_is_local_label_name (bfd *        abfd ATTRIBUTE_UNUSED,
+                             const char * name)

 {
 #ifdef USER_LABEL_PREFIX
   if (USER_LABEL_PREFIX[0] != 0)
     {
 {
 #ifdef USER_LABEL_PREFIX
   if (USER_LABEL_PREFIX[0] != 0)
     {

-      if (strncmp (name, USER_LABEL_PREFIX, strlen (USER_LABEL_PREFIX)) == 0)
+      size_t len = strlen (USER_LABEL_PREFIX);
+
+      if (strncmp (name, USER_LABEL_PREFIX, len) == 0)

        return FALSE;
     }
 #endif
        return FALSE;
     }
 #endif


@@ -2557,23 +2491,18 @@ coff_arm_is_local_label_name (abfd, name)
    the glue section is written last.
 
    This does depend on bfd_make_section attaching a new section to the
    the glue section is written last.
 
    This does depend on bfd_make_section attaching a new section to the

-   end of the section list for the bfd.
-
-   krk@cygnus.com  */
+   end of the section list for the bfd.  */

 
 static bfd_boolean
 
 static bfd_boolean

-coff_arm_link_output_has_begun (sub, info)
-     bfd * sub;
-     struct coff_final_link_info * info;
+coff_arm_link_output_has_begun (bfd * sub, struct coff_final_link_info * info)

 {
   return (sub->output_has_begun
          || sub == coff_arm_hash_table (info->info)->bfd_of_glue_owner);
 }
 
 static bfd_boolean
 {
   return (sub->output_has_begun
          || sub == coff_arm_hash_table (info->info)->bfd_of_glue_owner);
 }
 
 static bfd_boolean

-coff_arm_final_link_postscript (abfd, pfinfo)
-     bfd * abfd ATTRIBUTE_UNUSED;
-     struct coff_final_link_info * pfinfo;
+coff_arm_final_link_postscript (bfd * abfd ATTRIBUTE_UNUSED,
+                               struct coff_final_link_info * pfinfo)

 {
   struct coff_arm_link_hash_table * globals;
 
 {
   struct coff_arm_link_hash_table * globals;
 


@@ -2592,16 +2521,20 @@ coff_arm_final_link_postscript (abfd, pfinfo)
   return bfd_arm_update_notes (abfd, ARM_NOTE_SECTION);
 }
 
   return bfd_arm_update_notes (abfd, ARM_NOTE_SECTION);
 }
 

+#ifndef bfd_pe_print_pdata
+#define bfd_pe_print_pdata     NULL
+#endif
+

 #include "coffcode.h"
 
 #ifndef TARGET_LITTLE_SYM
 #include "coffcode.h"
 
 #ifndef TARGET_LITTLE_SYM

-#define TARGET_LITTLE_SYM armcoff_little_vec
+#define TARGET_LITTLE_SYM arm_coff_le_vec

 #endif
 #ifndef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME "coff-arm-little"
 #endif
 #ifndef TARGET_BIG_SYM
 #endif
 #ifndef TARGET_LITTLE_NAME
 #define TARGET_LITTLE_NAME "coff-arm-little"
 #endif
 #ifndef TARGET_BIG_SYM

-#define TARGET_BIG_SYM armcoff_big_vec
+#define TARGET_BIG_SYM arm_coff_be_vec

 #endif
 #ifndef TARGET_BIG_NAME
 #define TARGET_BIG_NAME "coff-arm-big"
 #endif
 #ifndef TARGET_BIG_NAME
 #define TARGET_BIG_NAME "coff-arm-big"