Touches most files in bfd/, so likely will be blamed for everything..
[deliverable/binutils-gdb.git] / bfd / coff-rs6000.c
index 69230001e49bae619446f67476912bab2dfecac6..44ede2534a4ddafdd7aa487d14fc92ba7c586032 100644 (file)
@@ -1,11 +1,12 @@
 /* BFD back-end for IBM RS/6000 "XCOFF" files.
 /* BFD back-end for IBM RS/6000 "XCOFF" files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001
    Free Software Foundation, Inc.
    FIXME: Can someone provide a transliteration of this name into ASCII?
    Using the following chars caused a compiler warning on HIUX (so I replaced
    them with octal escapes), and isn't useful without an understanding of what
    character set it is.
    Free Software Foundation, Inc.
    FIXME: Can someone provide a transliteration of this name into ASCII?
    Using the following chars caused a compiler warning on HIUX (so I replaced
    them with octal escapes), and isn't useful without an understanding of what
    character set it is.
-   Written by Metin G. Ozisik, Mimi Ph\373\364ng-Th\345o V\365, 
+   Written by Metin G. Ozisik, Mimi Ph\373\364ng-Th\345o V\365,
      and John Gilmore.
    Archive support from Damon A. Permezel.
    Contributed by IBM Corporation and Cygnus Support.
      and John Gilmore.
    Archive support from Damon A. Permezel.
    Contributed by IBM Corporation and Cygnus Support.
@@ -26,48 +27,137 @@ 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.  */
 
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* Internalcoff.h and coffcode.h modify themselves based on this flag.  */
-#define RS6000COFF_C 1
-
 #include "bfd.h"
 #include "sysdep.h"
 #include "bfd.h"
 #include "sysdep.h"
+#include "bfdlink.h"
 #include "libbfd.h"
 #include "coff/internal.h"
 #include "libbfd.h"
 #include "coff/internal.h"
+#include "coff/xcoff.h"
 #include "coff/rs6000.h"
 #include "libcoff.h"
 #include "coff/rs6000.h"
 #include "libcoff.h"
+#include "libxcoff.h"
+
+extern boolean _bfd_xcoff_mkobject PARAMS ((bfd *));
+extern boolean _bfd_xcoff_copy_private_bfd_data PARAMS ((bfd *, bfd *));
+extern boolean _bfd_xcoff_is_local_label_name PARAMS ((bfd *, const char *));
+extern reloc_howto_type *_bfd_xcoff_reloc_type_lookup
+  PARAMS ((bfd *, bfd_reloc_code_real_type));
+extern boolean _bfd_xcoff_slurp_armap PARAMS ((bfd *));
+extern const bfd_target *_bfd_xcoff_archive_p PARAMS ((bfd *));
+extern PTR _bfd_xcoff_read_ar_hdr PARAMS ((bfd *));
+extern bfd *_bfd_xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *));
+extern int _bfd_xcoff_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
+extern boolean _bfd_xcoff_write_armap
+  PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
+extern boolean _bfd_xcoff_write_archive_contents PARAMS ((bfd *));
+extern int _bfd_xcoff_sizeof_headers PARAMS ((bfd *, boolean));
+extern void _bfd_xcoff_swap_sym_in PARAMS ((bfd *, PTR, PTR));
+extern unsigned int _bfd_xcoff_swap_sym_out PARAMS ((bfd *, PTR, PTR));
+extern void _bfd_xcoff_swap_aux_in PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+extern unsigned int _bfd_xcoff_swap_aux_out PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+
+/* Forward declare _bfd_xcoff_rtype2howto for coffcode.h macro.  */
+void _bfd_xcoff_rtype2howto PARAMS ((arelent *, struct internal_reloc *));
+
+/* coffcode.h needs these to be defined.  */
+#define RS6000COFF_C 1
+
+#define SELECT_RELOC(internal, howto)                                  \
+  {                                                                    \
+    internal.r_type = howto->type;                                     \
+    internal.r_size =                                                  \
+      ((howto->complain_on_overflow == complain_overflow_signed                \
+       ? 0x80                                                          \
+       : 0)                                                            \
+       | (howto->bitsize - 1));                                                \
+  }
+
+#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
+#define COFF_LONG_FILENAMES
+#define NO_COFF_SYMBOLS
+#define RTYPE2HOWTO(cache_ptr, dst) _bfd_xcoff_rtype2howto (cache_ptr, dst)
+#define coff_mkobject _bfd_xcoff_mkobject
+#define coff_bfd_copy_private_bfd_data _bfd_xcoff_copy_private_bfd_data
+#define coff_bfd_is_local_label_name _bfd_xcoff_is_local_label_name
+#define coff_bfd_reloc_type_lookup _bfd_xcoff_reloc_type_lookup
+#ifdef AIX_CORE
+extern const bfd_target * rs6000coff_core_p ();
+extern boolean rs6000coff_core_file_matches_executable_p ();
+extern char *rs6000coff_core_file_failing_command PARAMS ((bfd *abfd));
+extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd));
+#define CORE_FILE_P rs6000coff_core_p
+#define coff_core_file_failing_command \
+  rs6000coff_core_file_failing_command
+#define coff_core_file_failing_signal \
+  rs6000coff_core_file_failing_signal
+#define coff_core_file_matches_executable_p \
+  rs6000coff_core_file_matches_executable_p
+#else
+#define CORE_FILE_P _bfd_dummy_target
+#define coff_core_file_failing_command \
+  _bfd_nocore_core_file_failing_command
+#define coff_core_file_failing_signal \
+  _bfd_nocore_core_file_failing_signal
+#define coff_core_file_matches_executable_p \
+  _bfd_nocore_core_file_matches_executable_p
+#endif
+#define coff_SWAP_sym_in _bfd_xcoff_swap_sym_in
+#define coff_SWAP_sym_out _bfd_xcoff_swap_sym_out
+#define coff_SWAP_aux_in _bfd_xcoff_swap_aux_in
+#define coff_SWAP_aux_out _bfd_xcoff_swap_aux_out
+
+#include "coffcode.h"
 
 /* The main body of code is in coffcode.h.  */
 
 
 /* The main body of code is in coffcode.h.  */
 
-static boolean xcoff_mkobject PARAMS ((bfd *));
-static boolean xcoff_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-static boolean xcoff_is_local_label_name PARAMS ((bfd *, const char *));
-static void xcoff_rtype2howto
-  PARAMS ((arelent *, struct internal_reloc *));
-static reloc_howto_type *xcoff_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static boolean xcoff_slurp_armap PARAMS ((bfd *));
-static const bfd_target *xcoff_archive_p PARAMS ((bfd *));
-static PTR xcoff_read_ar_hdr PARAMS ((bfd *));
-static bfd *xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *));
-static int xcoff_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
 static const char *normalize_filename PARAMS ((bfd *));
 static const char *normalize_filename PARAMS ((bfd *));
-static boolean xcoff_write_armap
+static boolean xcoff_write_armap_old
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
   PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-static boolean xcoff_write_archive_contents PARAMS ((bfd *));
-static int _bfd_xcoff_sizeof_headers PARAMS ((bfd *, boolean));
-\f
+static boolean xcoff_write_one_armap_big
+  PARAMS ((bfd *, struct orl *, unsigned int, unsigned int, unsigned int,
+          int, const char *, char *));
+static boolean xcoff_write_armap_big
+  PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
+static boolean xcoff_write_archive_contents_old PARAMS ((bfd *));
+static boolean xcoff_write_archive_contents_big PARAMS ((bfd *));
+static void xcoff_swap_ldhdr_in
+  PARAMS ((bfd *, const PTR, struct internal_ldhdr *));
+static void xcoff_swap_ldhdr_out
+  PARAMS ((bfd *, const struct internal_ldhdr *, PTR));
+static void xcoff_swap_ldsym_in
+  PARAMS ((bfd *, const PTR, struct internal_ldsym *));
+static void xcoff_swap_ldsym_out
+  PARAMS ((bfd *, const struct internal_ldsym *, PTR));
+static void xcoff_swap_ldrel_in
+  PARAMS ((bfd *, const PTR, struct internal_ldrel *));
+static void xcoff_swap_ldrel_out
+  PARAMS ((bfd *, const struct internal_ldrel *, PTR));
+static boolean xcoff_ppc_relocate_section
+  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+          struct internal_reloc *, struct internal_syment *, asection **));
+static boolean _bfd_xcoff_put_ldsymbol_name
+  PARAMS ((bfd *, struct xcoff_loader_info *, struct internal_ldsym *,
+          const char *));
+static asection *xcoff_create_csect_from_smclas
+  PARAMS ((bfd *, union internal_auxent *, const char *));
+static boolean xcoff_is_lineno_count_overflow PARAMS ((bfd *, bfd_vma));
+static boolean xcoff_is_reloc_count_overflow PARAMS ((bfd *, bfd_vma));
+static bfd_vma xcoff_loader_symbol_offset
+  PARAMS ((bfd *, struct internal_ldhdr *));
+static bfd_vma xcoff_loader_reloc_offset
+  PARAMS ((bfd *, struct internal_ldhdr *));
+
 /* We use our own tdata type.  Its first field is the COFF tdata type,
    so the COFF routines are compatible.  */
 
 /* We use our own tdata type.  Its first field is the COFF tdata type,
    so the COFF routines are compatible.  */
 
-static boolean
-xcoff_mkobject (abfd)
+boolean
+_bfd_xcoff_mkobject (abfd)
      bfd *abfd;
 {
   coff_data_type *coff;
      bfd *abfd;
 {
   coff_data_type *coff;
+  bfd_size_type amt = sizeof (struct xcoff_tdata);
 
 
-  abfd->tdata.xcoff_obj_data =
-    ((struct xcoff_tdata *)
-     bfd_zalloc (abfd, sizeof (struct xcoff_tdata)));
+  abfd->tdata.xcoff_obj_data = (struct xcoff_tdata *) bfd_zalloc (abfd, amt);
   if (abfd->tdata.xcoff_obj_data == NULL)
     return false;
   coff = coff_data (abfd);
   if (abfd->tdata.xcoff_obj_data == NULL)
     return false;
   coff = coff_data (abfd);
@@ -85,13 +175,16 @@ xcoff_mkobject (abfd)
   xcoff_data (abfd)->csects = NULL;
   xcoff_data (abfd)->debug_indices = NULL;
 
   xcoff_data (abfd)->csects = NULL;
   xcoff_data (abfd)->debug_indices = NULL;
 
+  /* text section alignment is different than the default */
+  /* xcoff_data (abfd)->text_align_power = 5; */
+
   return true;
 }
 
 /* Copy XCOFF data from one BFD to another.  */
 
   return true;
 }
 
 /* Copy XCOFF data from one BFD to another.  */
 
-static boolean
-xcoff_copy_private_bfd_data (ibfd, obfd)
+boolean
+_bfd_xcoff_copy_private_bfd_data (ibfd, obfd)
      bfd *ibfd;
      bfd *obfd;
 {
      bfd *ibfd;
      bfd *obfd;
 {
@@ -138,13 +231,281 @@ xcoff_copy_private_bfd_data (ibfd, obfd)
    The AIX native linker does not have a -X option, and it ignores the
    -x option.  */
 
    The AIX native linker does not have a -X option, and it ignores the
    -x option.  */
 
-static boolean
-xcoff_is_local_label_name (abfd, name)
+boolean
+_bfd_xcoff_is_local_label_name (abfd, name)
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
 {
   return false;
 }
      bfd *abfd ATTRIBUTE_UNUSED;
      const char *name ATTRIBUTE_UNUSED;
 {
   return false;
 }
+\f
+void
+_bfd_xcoff_swap_sym_in (abfd, ext1, in1)
+     bfd            *abfd;
+     PTR ext1;
+     PTR in1;
+{
+  SYMENT *ext = (SYMENT *)ext1;
+  struct internal_syment * in = (struct internal_syment *)in1;
+
+  if (ext->e.e_name[0] != 0)
+    {
+      memcpy(in->_n._n_name, ext->e.e_name, SYMNMLEN);
+    }
+  else
+    {
+      in->_n._n_n._n_zeroes = 0;
+      in->_n._n_n._n_offset = H_GET_32 (abfd, ext->e.e.e_offset);
+    }
+
+  in->n_value = H_GET_32 (abfd, ext->e_value);
+  in->n_scnum = H_GET_16 (abfd, ext->e_scnum);
+  in->n_type = H_GET_16 (abfd, ext->e_type);
+  in->n_sclass = H_GET_8 (abfd, ext->e_sclass);
+  in->n_numaux = H_GET_8 (abfd, ext->e_numaux);
+}
+
+unsigned int
+_bfd_xcoff_swap_sym_out (abfd, inp, extp)
+     bfd       *abfd;
+     PTR       inp;
+     PTR       extp;
+{
+  struct internal_syment *in = (struct internal_syment *)inp;
+  SYMENT *ext =(SYMENT *)extp;
+
+  if (in->_n._n_name[0] != 0)
+    {
+      memcpy(ext->e.e_name, in->_n._n_name, SYMNMLEN);
+    }
+  else
+    {
+      H_PUT_32 (abfd, 0, ext->e.e.e_zeroes);
+      H_PUT_32 (abfd, in->_n._n_n._n_offset, ext->e.e.e_offset);
+    }
+
+  H_PUT_32 (abfd, in->n_value, ext->e_value);
+  H_PUT_16 (abfd, in->n_scnum, ext->e_scnum);
+  H_PUT_16 (abfd, in->n_type, ext->e_type);
+  H_PUT_8 (abfd, in->n_sclass, ext->e_sclass);
+  H_PUT_8 (abfd, in->n_numaux, ext->e_numaux);
+  return bfd_coff_symesz (abfd);
+}
+
+void
+_bfd_xcoff_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
+     bfd            *abfd;
+     PTR             ext1;
+     int             type;
+     int             class;
+     int             indx;
+     int             numaux;
+     PTR             in1;
+{
+  AUXENT * ext = (AUXENT *)ext1;
+  union internal_auxent *in = (union internal_auxent *)in1;
+
+  switch (class)
+    {
+    case C_FILE:
+      if (ext->x_file.x_fname[0] == 0)
+       {
+         in->x_file.x_n.x_zeroes = 0;
+         in->x_file.x_n.x_offset =
+           H_GET_32 (abfd, ext->x_file.x_n.x_offset);
+       }
+      else
+       {
+         if (numaux > 1)
+           {
+             if (indx == 0)
+               memcpy (in->x_file.x_fname, ext->x_file.x_fname,
+                       numaux * sizeof (AUXENT));
+           }
+         else
+           {
+             memcpy (in->x_file.x_fname, ext->x_file.x_fname, FILNMLEN);
+           }
+       }
+      goto end;
+
+      /* RS/6000 "csect" auxents */
+    case C_EXT:
+    case C_HIDEXT:
+      if (indx + 1 == numaux)
+       {
+         in->x_csect.x_scnlen.l = H_GET_32 (abfd, ext->x_csect.x_scnlen);
+         in->x_csect.x_parmhash = H_GET_32 (abfd, ext->x_csect.x_parmhash);
+         in->x_csect.x_snhash   = H_GET_16 (abfd, ext->x_csect.x_snhash);
+         /* We don't have to hack bitfields in x_smtyp because it's
+            defined by shifts-and-ands, which are equivalent on all
+            byte orders.  */
+         in->x_csect.x_smtyp    = H_GET_8 (abfd, ext->x_csect.x_smtyp);
+         in->x_csect.x_smclas   = H_GET_8 (abfd, ext->x_csect.x_smclas);
+         in->x_csect.x_stab     = H_GET_32 (abfd, ext->x_csect.x_stab);
+         in->x_csect.x_snstab   = H_GET_16 (abfd, ext->x_csect.x_snstab);
+         goto end;
+       }
+      break;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+       {
+         in->x_scn.x_scnlen = H_GET_32 (abfd, ext->x_scn.x_scnlen);
+         in->x_scn.x_nreloc = H_GET_16 (abfd, ext->x_scn.x_nreloc);
+         in->x_scn.x_nlinno = H_GET_16 (abfd, ext->x_scn.x_nlinno);
+         /* PE defines some extra fields; we zero them out for
+             safety.  */
+         in->x_scn.x_checksum = 0;
+         in->x_scn.x_associated = 0;
+         in->x_scn.x_comdat = 0;
+
+         goto end;
+       }
+      break;
+    }
+
+  in->x_sym.x_tagndx.l = H_GET_32 (abfd, ext->x_sym.x_tagndx);
+  in->x_sym.x_tvndx = H_GET_16 (abfd, ext->x_sym.x_tvndx);
+
+  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
+    {
+      in->x_sym.x_fcnary.x_fcn.x_lnnoptr =
+       H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
+      in->x_sym.x_fcnary.x_fcn.x_endndx.l =
+       H_GET_32 (abfd, ext->x_sym.x_fcnary.x_fcn.x_endndx);
+    }
+  else
+    {
+      in->x_sym.x_fcnary.x_ary.x_dimen[0] =
+       H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[1] =
+       H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[2] =
+       H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
+      in->x_sym.x_fcnary.x_ary.x_dimen[3] =
+       H_GET_16 (abfd, ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
+    }
+
+  if (ISFCN (type))
+    {
+      in->x_sym.x_misc.x_fsize = H_GET_32 (abfd, ext->x_sym.x_misc.x_fsize);
+    }
+  else
+    {
+      in->x_sym.x_misc.x_lnsz.x_lnno =
+       H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_lnno);
+      in->x_sym.x_misc.x_lnsz.x_size =
+       H_GET_16 (abfd, ext->x_sym.x_misc.x_lnsz.x_size);
+    }
+
+ end: ;
+  /* The semicolon is because MSVC doesn't like labels at
+     end of block.  */
+}
+
+
+unsigned int _bfd_xcoff_swap_aux_out PARAMS ((bfd *, PTR, int, int, int, int, PTR));
+
+unsigned int
+_bfd_xcoff_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
+     bfd * abfd;
+     PTR   inp;
+     int   type;
+     int   class;
+     int   indx ATTRIBUTE_UNUSED;
+     int   numaux ATTRIBUTE_UNUSED;
+     PTR   extp;
+{
+  union internal_auxent *in = (union internal_auxent *)inp;
+  AUXENT *ext = (AUXENT *)extp;
+
+  memset((PTR)ext, 0, bfd_coff_auxesz (abfd));
+  switch (class)
+    {
+    case C_FILE:
+      if (in->x_file.x_fname[0] == 0)
+       {
+         H_PUT_32 (abfd, 0, ext->x_file.x_n.x_zeroes);
+         H_PUT_32 (abfd, in->x_file.x_n.x_offset, ext->x_file.x_n.x_offset);
+       }
+      else
+       {
+         memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN);
+       }
+      goto end;
+
+      /* RS/6000 "csect" auxents */
+    case C_EXT:
+    case C_HIDEXT:
+      if (indx + 1 == numaux)
+       {
+         H_PUT_32 (abfd, in->x_csect.x_scnlen.l, ext->x_csect.x_scnlen);
+         H_PUT_32 (abfd, in->x_csect.x_parmhash, ext->x_csect.x_parmhash);
+         H_PUT_16 (abfd, in->x_csect.x_snhash, ext->x_csect.x_snhash);
+         /* We don't have to hack bitfields in x_smtyp because it's
+            defined by shifts-and-ands, which are equivalent on all
+            byte orders.  */
+         H_PUT_8 (abfd, in->x_csect.x_smtyp, ext->x_csect.x_smtyp);
+         H_PUT_8 (abfd, in->x_csect.x_smclas, ext->x_csect.x_smclas);
+         H_PUT_32 (abfd, in->x_csect.x_stab, ext->x_csect.x_stab);
+         H_PUT_16 (abfd, in->x_csect.x_snstab, ext->x_csect.x_snstab);
+         goto end;
+       }
+      break;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+       {
+         H_PUT_32 (abfd, in->x_scn.x_scnlen, ext->x_scn.x_scnlen);
+         H_PUT_16 (abfd, in->x_scn.x_nreloc, ext->x_scn.x_nreloc);
+         H_PUT_16 (abfd, in->x_scn.x_nlinno, ext->x_scn.x_nlinno);
+         goto end;
+       }
+      break;
+    }
+
+  H_PUT_32 (abfd, in->x_sym.x_tagndx.l, ext->x_sym.x_tagndx);
+  H_PUT_16 (abfd, in->x_sym.x_tvndx, ext->x_sym.x_tvndx);
+
+  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
+    {
+      H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr,
+               ext->x_sym.x_fcnary.x_fcn.x_lnnoptr);
+      H_PUT_32 (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l,
+               ext->x_sym.x_fcnary.x_fcn.x_endndx);
+    }
+  else
+    {
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[0],
+               ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[1],
+               ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[2],
+               ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
+      H_PUT_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[3],
+               ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
+    }
+
+  if (ISFCN (type))
+    H_PUT_32 (abfd, in->x_sym.x_misc.x_fsize, ext->x_sym.x_misc.x_fsize);
+  else
+    {
+      H_PUT_16 (abfd, in->x_sym.x_misc.x_lnsz.x_lnno,
+               ext->x_sym.x_misc.x_lnsz.x_lnno);
+      H_PUT_16 (abfd, in->x_sym.x_misc.x_lnsz.x_size,
+               ext->x_sym.x_misc.x_lnsz.x_size);
+    }
+
+end:
+  return bfd_coff_auxesz (abfd);
+}
+
+
 \f
 /* The XCOFF reloc table.  Actually, XCOFF relocations specify the
    bitsize and whether they are signed or not, along with a
 \f
 /* The XCOFF reloc table.  Actually, XCOFF relocations specify the
    bitsize and whether they are signed or not, along with a
@@ -152,362 +513,388 @@ xcoff_is_local_label_name (abfd, name)
    different algorithms for putting in the reloc.  Many of these
    relocs need special_function entries, which I have not written.  */
 
    different algorithms for putting in the reloc.  Many of these
    relocs need special_function entries, which I have not written.  */
 
-static reloc_howto_type xcoff_howto_table[] =
+
+reloc_howto_type xcoff_howto_table[] =
 {
   /* Standard 32 bit relocation.  */
 {
   /* Standard 32 bit relocation.  */
-  HOWTO (0,                    /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0,                    /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_POS",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        0,                     /* special_function */
+        "R_POS",               /* name */
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */
         false),                /* pcrel_offset */
 
   /* 32 bit relocation, but store negative value.  */
         false),                /* pcrel_offset */
 
   /* 32 bit relocation, but store negative value.  */
-  HOWTO (1,                    /* type */                                 
-        0,                     /* rightshift */                           
-        -2,                    /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (1,                    /* type */
+        0,                     /* rightshift */
+        -2,                    /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_NEG",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        0,                     /* special_function */
+        "R_NEG",               /* name */
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */
         false),                /* pcrel_offset */
 
   /* 32 bit PC relative relocation.  */
         false),                /* pcrel_offset */
 
   /* 32 bit PC relative relocation.  */
-  HOWTO (2,                    /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        true,                  /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (2,                    /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        true,                  /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_REL",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        0,                     /* special_function */
+        "R_REL",               /* name */
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* 16 bit TOC relative relocation.  */
   /* 16 bit TOC relative relocation.  */
-  HOWTO (3,                    /* type */                                 
-        0,                     /* rightshift */                           
-        1,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (3,                    /* type */
+        0,                     /* rightshift */
+        1,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_TOC",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_TOC",               /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* I don't really know what this is.  */
   /* I don't really know what this is.  */
-  HOWTO (4,                    /* type */                                 
-        1,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (4,                    /* type */
+        1,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_RTB",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        0,                     /* special_function */
+        "R_RTB",               /* name */
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* External TOC relative symbol.  */
   /* External TOC relative symbol.  */
-  HOWTO (5,                    /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (5,                    /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_GL",                /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_GL",                /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Local TOC relative symbol.  */
   /* Local TOC relative symbol.  */
-  HOWTO (6,                    /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (6,                    /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_TCL",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_TCL",               /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   EMPTY_HOWTO (7),
   EMPTY_HOWTO (7),
-  
+
   /* Non modifiable absolute branch.  */
   /* Non modifiable absolute branch.  */
-  HOWTO (8,                    /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        26,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (8,                    /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        26,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_BA",                /* name */                                 
-        true,                  /* partial_inplace */                      
-        0x3fffffc,             /* src_mask */                             
-        0x3fffffc,             /* dst_mask */                             
+        0,                     /* special_function */
+        "R_BA",                /* name */
+        true,                  /* partial_inplace */
+        0x3fffffc,             /* src_mask */
+        0x3fffffc,             /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   EMPTY_HOWTO (9),
 
   /* Non modifiable relative branch.  */
   EMPTY_HOWTO (9),
 
   /* Non modifiable relative branch.  */
-  HOWTO (0xa,                  /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        26,                    /* bitsize */                   
-        true,                  /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0xa,                  /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        26,                    /* bitsize */
+        true,                  /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_BR",                /* name */                                 
-        true,                  /* partial_inplace */                      
-        0x3fffffc,             /* src_mask */                             
-        0x3fffffc,             /* dst_mask */                             
+        0,                     /* special_function */
+        "R_BR",                /* name */
+        true,                  /* partial_inplace */
+        0x3fffffc,             /* src_mask */
+        0x3fffffc,             /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   EMPTY_HOWTO (0xb),
 
   /* Indirect load.  */
   EMPTY_HOWTO (0xb),
 
   /* Indirect load.  */
-  HOWTO (0xc,                  /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0xc,                  /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_RL",                /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_RL",                /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Load address.  */
   /* Load address.  */
-  HOWTO (0xd,                  /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0xd,                  /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_RLA",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_RLA",               /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   EMPTY_HOWTO (0xe),
   EMPTY_HOWTO (0xe),
-  
+
   /* Non-relocating reference.  */
   /* Non-relocating reference.  */
-  HOWTO (0xf,                  /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0xf,                  /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_REF",               /* name */                                 
-        false,                 /* partial_inplace */                      
-        0,                     /* src_mask */                             
-        0,                     /* dst_mask */                             
+        0,                     /* special_function */
+        "R_REF",               /* name */
+        false,                 /* partial_inplace */
+        0,                     /* src_mask */
+        0,                     /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   EMPTY_HOWTO (0x10),
   EMPTY_HOWTO (0x11),
   EMPTY_HOWTO (0x10),
   EMPTY_HOWTO (0x11),
-  
+
   /* TOC relative indirect load.  */
   /* TOC relative indirect load.  */
-  HOWTO (0x12,                 /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x12,                 /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_TRL",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_TRL",               /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* TOC relative load address.  */
   /* TOC relative load address.  */
-  HOWTO (0x13,                 /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x13,                 /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_TRLA",              /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_TRLA",              /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Modifiable relative branch.  */
   /* Modifiable relative branch.  */
-  HOWTO (0x14,                 /* type */                                 
-        1,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x14,                 /* type */
+        1,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_RRTBI",             /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        0,                     /* special_function */
+        "R_RRTBI",             /* name */
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Modifiable absolute branch.  */
   /* Modifiable absolute branch.  */
-  HOWTO (0x15,                 /* type */                                 
-        1,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        32,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x15,                 /* type */
+        1,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_RRTBA",             /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffffffff,            /* src_mask */                             
-        0xffffffff,            /* dst_mask */                             
+        0,                     /* special_function */
+        "R_RRTBA",             /* name */
+        true,                  /* partial_inplace */
+        0xffffffff,            /* src_mask */
+        0xffffffff,            /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Modifiable call absolute indirect.  */
   /* Modifiable call absolute indirect.  */
-  HOWTO (0x16,                 /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x16,                 /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_CAI",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_CAI",               /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Modifiable call relative.  */
   /* Modifiable call relative.  */
-  HOWTO (0x17,                 /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x17,                 /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_CREL",              /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_CREL",              /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Modifiable branch absolute.  */
   /* Modifiable branch absolute.  */
-  HOWTO (0x18,                 /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x18,                 /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        26,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_RBA",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_RBA",               /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Modifiable branch absolute.  */
   /* Modifiable branch absolute.  */
-  HOWTO (0x19,                 /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x19,                 /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        32,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_RBAC",              /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_RBAC",              /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Modifiable branch relative.  */
   /* Modifiable branch relative.  */
-  HOWTO (0x1a,                 /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        26,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x1a,                 /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        26,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_signed, /* complain_on_overflow */
         complain_overflow_signed, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_RBR",               /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_RBR",               /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
         false),                /* pcrel_offset */
         false),                /* pcrel_offset */
-  
+
   /* Modifiable branch absolute.  */
   /* Modifiable branch absolute.  */
-  HOWTO (0x1b,                 /* type */                                 
-        0,                     /* rightshift */                           
-        2,                     /* size (0 = byte, 1 = short, 2 = long) */ 
-        16,                    /* bitsize */                   
-        false,                 /* pc_relative */                          
-        0,                     /* bitpos */                               
+  HOWTO (0x1b,                 /* type */
+        0,                     /* rightshift */
+        2,                     /* size (0 = byte, 1 = short, 2 = long) */
+        16,                    /* bitsize */
+        false,                 /* pc_relative */
+        0,                     /* bitpos */
         complain_overflow_bitfield, /* complain_on_overflow */
         complain_overflow_bitfield, /* complain_on_overflow */
-        0,                     /* special_function */                     
-        "R_RBRC",              /* name */                                 
-        true,                  /* partial_inplace */                      
-        0xffff,                /* src_mask */                             
-        0xffff,                /* dst_mask */                             
+        0,                     /* special_function */
+        "R_RBRC",              /* name */
+        true,                  /* partial_inplace */
+        0xffff,                /* src_mask */
+        0xffff,                /* dst_mask */
+        false),                /* pcrel_offset */
+
+  HOWTO (0,                     /* type */
+         0,                     /* rightshift */
+         4,                     /* size (0 = byte, 1 = short, 2 = long) */
+         64,                    /* bitsize */
+         false,                 /* pc_relative */
+         0,                     /* bitpos */
+         complain_overflow_bitfield, /* complain_on_overflow */
+         0,                     /* special_function */
+         "R_POS",               /* name */
+         true,                  /* partial_inplace */
+         MINUS_ONE,             /* src_mask */
+        MINUS_ONE,             /* dst_mask */
         false)                 /* pcrel_offset */
         false)                 /* pcrel_offset */
+
 };
 
 };
 
-static void
-xcoff_rtype2howto (relent, internal)
+void
+_bfd_xcoff_rtype2howto (relent, internal)
      arelent *relent;
      struct internal_reloc *internal;
 {
   relent->howto = xcoff_howto_table + internal->r_type;
 
      arelent *relent;
      struct internal_reloc *internal;
 {
   relent->howto = xcoff_howto_table + internal->r_type;
 
+  /* Check for relocs we don't know of.  */
+  if (internal->r_type
+      >= sizeof (xcoff_howto_table) / sizeof (xcoff_howto_table[0]))
+    abort ();
+  if (internal->r_type != relent->howto->type)
+    abort ();
+
   /* The r_size field of an XCOFF reloc encodes the bitsize of the
      relocation, as well as indicating whether it is signed or not.
      Doublecheck that the relocation information gathered from the
   /* The r_size field of an XCOFF reloc encodes the bitsize of the
      relocation, as well as indicating whether it is signed or not.
      Doublecheck that the relocation information gathered from the
-     type matches this information.  */
-  if (relent->howto->bitsize != ((unsigned int) internal->r_size & 0x1f) + 1)
+     type matches this information.  The bitsize is not significant
+     for R_REF relocs.  */
+  if (relent->howto->dst_mask != 0
+      && (relent->howto->bitsize
+         != ((unsigned int) internal->r_size & 0x3f) + 1))
     abort ();
 #if 0
   if ((internal->r_size & 0x80) != 0
     abort ();
 #if 0
   if ((internal->r_size & 0x80) != 0
@@ -517,8 +904,8 @@ xcoff_rtype2howto (relent, internal)
 #endif
 }
 
 #endif
 }
 
-static reloc_howto_type *
-xcoff_reloc_type_lookup (abfd, code)
+reloc_howto_type *
+_bfd_xcoff_reloc_type_lookup (abfd, code)
      bfd *abfd ATTRIBUTE_UNUSED;
      bfd_reloc_code_real_type code;
 {
      bfd *abfd ATTRIBUTE_UNUSED;
      bfd_reloc_code_real_type code;
 {
@@ -533,34 +920,13 @@ xcoff_reloc_type_lookup (abfd, code)
     case BFD_RELOC_32:
     case BFD_RELOC_CTOR:
       return &xcoff_howto_table[0];
     case BFD_RELOC_32:
     case BFD_RELOC_CTOR:
       return &xcoff_howto_table[0];
+    case BFD_RELOC_64:
+      return &xcoff_howto_table[0x1c];
     default:
       return NULL;
     }
 }
 
     default:
       return NULL;
     }
 }
 
-#define SELECT_RELOC(internal, howto)                                  \
-  {                                                                    \
-    internal.r_type = howto->type;                                     \
-    internal.r_size =                                                  \
-      ((howto->complain_on_overflow == complain_overflow_signed                \
-       ? 0x80                                                          \
-       : 0)                                                            \
-       | (howto->bitsize - 1));                                                \
-  }
-\f
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
-
-#define COFF_LONG_FILENAMES
-
-#define RTYPE2HOWTO(cache_ptr, dst) xcoff_rtype2howto (cache_ptr, dst)
-
-#define coff_mkobject xcoff_mkobject
-#define coff_bfd_copy_private_bfd_data xcoff_copy_private_bfd_data
-#define coff_bfd_is_local_label_name xcoff_is_local_label_name
-#define coff_bfd_reloc_type_lookup xcoff_reloc_type_lookup
-#define coff_relocate_section _bfd_ppc_xcoff_relocate_section
-
-#include "coffcode.h"
 \f
 /* XCOFF archive support.  The original version of this code was by
    Damon A. Permezel.  It was enhanced to permit cross support, and
 \f
 /* XCOFF archive support.  The original version of this code was by
    Damon A. Permezel.  It was enhanced to permit cross support, and
@@ -591,122 +957,35 @@ xcoff_reloc_type_lookup (abfd, code)
    binary number which is the number of entries.  This is followed by
    a that many four byte binary numbers; each is the file offset of an
    entry in the archive.  These numbers are followed by a series of
    binary number which is the number of entries.  This is followed by
    a that many four byte binary numbers; each is the file offset of an
    entry in the archive.  These numbers are followed by a series of
-   null terminated strings, which are symbol names.  */
-
-/* XCOFF archives use this as a magic string.  */
-
-#define XCOFFARMAG "<aiaff>\012"
-#define SXCOFFARMAG 8
-
-/* This terminates an XCOFF archive member name.  */
-
-#define XCOFFARFMAG "`\012"
-#define SXCOFFARFMAG 2
-
-/* XCOFF archives start with this (printable) structure.  */
-
-struct xcoff_ar_file_hdr
-{
-  /* Magic string.  */
-  char magic[SXCOFFARMAG];
-
-  /* Offset of the member table (decimal ASCII string).  */
-  char memoff[12];
-
-  /* Offset of the global symbol table (decimal ASCII string).  */
-  char symoff[12];
-
-  /* Offset of the first member in the archive (decimal ASCII string).  */
-  char firstmemoff[12];
-
-  /* Offset of the last member in the archive (decimal ASCII string).  */
-  char lastmemoff[12];
-
-  /* Offset of the first member on the free list (decimal ASCII
-     string).  */
-  char freeoff[12];
-};
+   null terminated strings, which are symbol names.
 
 
-#define SIZEOF_AR_FILE_HDR (5 * 12 + SXCOFFARMAG)
+   AIX 4.3 introduced a new archive format which can handle larger
+   files and also 32- and 64-bit objects in the same archive.  The
+   things said above remain true except that there is now more than
+   one global symbol table.  The one is used to index 32-bit objects,
+   the other for 64-bit objects.
 
 
-/* Each XCOFF archive member starts with this (printable) structure.  */
+   The new archives (recognizable by the new ARMAG string) has larger
+   field lengths so that we cannot really share any code.  Also we have
+   to take care that we are not generating the new form of archives
+   on AIX 4.2 or earlier systems.  */
 
 
-struct xcoff_ar_hdr
-{
-  /* File size not including the header (decimal ASCII string).  */
-  char size[12];
-
-  /* File offset of next archive member (decimal ASCII string).  */
-  char nextoff[12];
-
-  /* File offset of previous archive member (decimal ASCII string).  */
-  char prevoff[12];
-
-  /* File mtime (decimal ASCII string).  */
-  char date[12];
-
-  /* File UID (decimal ASCII string).  */
-  char uid[12];
-
-  /* File GID (decimal ASCII string).  */
-  char gid[12];
-
-  /* File mode (octal ASCII string).  */
-  char mode[12];
-
-  /* Length of file name (decimal ASCII string).  */
-  char namlen[4];
-
-  /* This structure is followed by the file name.  The length of the
-     name is given in the namlen field.  If the length of the name is
-     odd, the name is followed by a null byte.  The name and optional
-     null byte are followed by XCOFFARFMAG, which is not included in
-     namlen.  The contents of the archive member follow; the number of
-     bytes is given in the size field.  */
-};
-
-#define SIZEOF_AR_HDR (7 * 12 + 4)
-
-/* We store a copy of the xcoff_ar_file_hdr in the tdata field of the
-   artdata structure.  */
-#define xcoff_ardata(abfd) \
-  ((struct xcoff_ar_file_hdr *) bfd_ardata (abfd)->tdata)
-
-/* We store a copy of the xcoff_ar_hdr in the arelt_data field of an
-   archive element.  */
-#define arch_eltdata(bfd) ((struct areltdata *) ((bfd)->arelt_data))
-#define arch_xhdr(bfd) \
-  ((struct xcoff_ar_hdr *) arch_eltdata (bfd)->arch_header)
-
-/* XCOFF archives do not have anything which corresponds to an
-   extended name table.  */
-
-#define xcoff_slurp_extended_name_table bfd_false
-#define xcoff_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
-   bfd_false)
-#define xcoff_truncate_arname bfd_dont_truncate_arname
-
-/* We can use the standard get_elt_at_index routine.  */
+/* XCOFF archives use this as a magic string.  Note that both strings
+   have the same length.  */
 
 
-#define xcoff_get_elt_at_index _bfd_generic_get_elt_at_index
 
 
-/* XCOFF archives do not have a timestamp.  */
-
-#define xcoff_update_armap_timestamp bfd_true
 
 /* Read in the armap of an XCOFF archive.  */
 
 
 /* Read in the armap of an XCOFF archive.  */
 
-static boolean
-xcoff_slurp_armap (abfd)
+boolean
+_bfd_xcoff_slurp_armap (abfd)
      bfd *abfd;
 {
   file_ptr off;
      bfd *abfd;
 {
   file_ptr off;
-  struct xcoff_ar_hdr hdr;
   size_t namlen;
   bfd_size_type sz;
   bfd_byte *contents, *cend;
   size_t namlen;
   bfd_size_type sz;
   bfd_byte *contents, *cend;
-  unsigned int c, i;
+  bfd_vma c, i;
   carsym *arsym;
   bfd_byte *p;
 
   carsym *arsym;
   bfd_byte *p;
 
@@ -716,90 +995,158 @@ xcoff_slurp_armap (abfd)
       return true;
     }
 
       return true;
     }
 
-  off = strtol (xcoff_ardata (abfd)->symoff, (char **) NULL, 10);
-  if (off == 0)
+  if (! xcoff_big_format_p (abfd))
     {
     {
-      bfd_has_map (abfd) = false;
-      return true;
-    }
-
-  if (bfd_seek (abfd, off, SEEK_SET) != 0)
-    return false;
+      /* This is for the old format.  */
+      struct xcoff_ar_hdr hdr;
 
 
-  /* The symbol table starts with a normal archive header.  */
-  if (bfd_read ((PTR) &hdr, SIZEOF_AR_HDR, 1, abfd) != SIZEOF_AR_HDR)
-    return false;
+      off = strtol (xcoff_ardata (abfd)->symoff, (char **) NULL, 10);
+      if (off == 0)
+       {
+         bfd_has_map (abfd) = false;
+         return true;
+       }
 
 
-  /* Skip the name (normally empty).  */
-  namlen = strtol (hdr.namlen, (char **) NULL, 10);
-  if (bfd_seek (abfd, ((namlen + 1) & ~1) + SXCOFFARFMAG, SEEK_CUR) != 0)
-    return false;
+      if (bfd_seek (abfd, off, SEEK_SET) != 0)
+       return false;
 
 
-  /* Read in the entire symbol table.  */
-  sz = strtol (hdr.size, (char **) NULL, 10);
-  contents = (bfd_byte *) bfd_alloc (abfd, sz);
-  if (contents == NULL)
-    return false;
-  if (bfd_read ((PTR) contents, 1, sz, abfd) != sz)
-    return false;
+      /* The symbol table starts with a normal archive header.  */
+      if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd)
+         != SIZEOF_AR_HDR)
+       return false;
 
 
-  /* The symbol table starts with a four byte count.  */
-  c = bfd_h_get_32 (abfd, contents);
+      /* Skip the name (normally empty).  */
+      namlen = strtol (hdr.namlen, (char **) NULL, 10);
+      off = ((namlen + 1) & ~ (size_t) 1) + SXCOFFARFMAG;
+      if (bfd_seek (abfd, off, SEEK_CUR) != 0)
+       return false;
 
 
-  if (c * 4 >= sz)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
+      sz = strtol (hdr.size, (char **) NULL, 10);
 
 
-  bfd_ardata (abfd)->symdefs = ((carsym *)
-                               bfd_alloc (abfd, c * sizeof (carsym)));
-  if (bfd_ardata (abfd)->symdefs == NULL)
-    return false;
+      /* Read in the entire symbol table.  */
+      contents = (bfd_byte *) bfd_alloc (abfd, sz);
+      if (contents == NULL)
+       return false;
+      if (bfd_bread ((PTR) contents, sz, abfd) != sz)
+       return false;
 
 
-  /* After the count comes a list of four byte file offsets.  */
-  for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 4;
-       i < c;
-       ++i, ++arsym, p += 4)
-    arsym->file_offset = bfd_h_get_32 (abfd, p);
+      /* The symbol table starts with a four byte count.  */
+      c = H_GET_32 (abfd, contents);
 
 
-  /* After the file offsets come null terminated symbol names.  */
-  cend = contents + sz;
-  for (i = 0, arsym = bfd_ardata (abfd)->symdefs;
-       i < c;
-       ++i, ++arsym, p += strlen ((char *) p) + 1)
-    {
-      if (p >= cend)
+      if (c * 4 >= sz)
        {
          bfd_set_error (bfd_error_bad_value);
          return false;
        }
        {
          bfd_set_error (bfd_error_bad_value);
          return false;
        }
-      arsym->name = (char *) p;
-    }
 
 
-  bfd_ardata (abfd)->symdef_count = c;
-  bfd_has_map (abfd) = true;
+      bfd_ardata (abfd)->symdefs =
+       ((carsym *) bfd_alloc (abfd, c * sizeof (carsym)));
+      if (bfd_ardata (abfd)->symdefs == NULL)
+       return false;
 
 
-  return true;
-}
+      /* After the count comes a list of four byte file offsets.  */
+      for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 4;
+          i < c;
+          ++i, ++arsym, p += 4)
+       arsym->file_offset = H_GET_32 (abfd, p);
+    }
+  else
+    {
+      /* This is for the new format.  */
+      struct xcoff_ar_hdr_big hdr;
 
 
-/* See if this is an XCOFF archive.  */
+      off = strtol (xcoff_ardata_big (abfd)->symoff, (char **) NULL, 10);
+      if (off == 0)
+       {
+         bfd_has_map (abfd) = false;
+         return true;
+       }
 
 
-static const bfd_target *
-xcoff_archive_p (abfd)
-     bfd *abfd;
-{
-  struct xcoff_ar_file_hdr hdr;
+      if (bfd_seek (abfd, off, SEEK_SET) != 0)
+       return false;
 
 
-  if (bfd_read ((PTR) &hdr, SIZEOF_AR_FILE_HDR, 1, abfd)
-      != SIZEOF_AR_FILE_HDR)
-    {
+      /* The symbol table starts with a normal archive header.  */
+      if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
+         != SIZEOF_AR_HDR_BIG)
+       return false;
+
+      /* Skip the name (normally empty).  */
+      namlen = strtol (hdr.namlen, (char **) NULL, 10);
+      off = ((namlen + 1) & ~ (size_t) 1) + SXCOFFARFMAG;
+      if (bfd_seek (abfd, off, SEEK_CUR) != 0)
+       return false;
+
+      /* XXX This actually has to be a call to strtoll (at least on 32-bit
+        machines) since the field width is 20 and there numbers with more
+        than 32 bits can be represented.  */
+      sz = strtol (hdr.size, (char **) NULL, 10);
+
+      /* Read in the entire symbol table.  */
+      contents = (bfd_byte *) bfd_alloc (abfd, sz);
+      if (contents == NULL)
+       return false;
+      if (bfd_bread ((PTR) contents, sz, abfd) != sz)
+       return false;
+
+      /* The symbol table starts with an eight byte count.  */
+      c = H_GET_64 (abfd, contents);
+
+      if (c * 8 >= sz)
+       {
+         bfd_set_error (bfd_error_bad_value);
+         return false;
+       }
+
+      bfd_ardata (abfd)->symdefs =
+       ((carsym *) bfd_alloc (abfd, c * sizeof (carsym)));
+      if (bfd_ardata (abfd)->symdefs == NULL)
+       return false;
+
+      /* After the count comes a list of eight byte file offsets.  */
+      for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 8;
+          i < c;
+          ++i, ++arsym, p += 8)
+       arsym->file_offset = H_GET_64 (abfd, p);
+    }
+
+  /* After the file offsets come null terminated symbol names.  */
+  cend = contents + sz;
+  for (i = 0, arsym = bfd_ardata (abfd)->symdefs;
+       i < c;
+       ++i, ++arsym, p += strlen ((char *) p) + 1)
+    {
+      if (p >= cend)
+       {
+         bfd_set_error (bfd_error_bad_value);
+         return false;
+       }
+      arsym->name = (char *) p;
+    }
+
+  bfd_ardata (abfd)->symdef_count = c;
+  bfd_has_map (abfd) = true;
+
+  return true;
+}
+
+/* See if this is an XCOFF archive.  */
+
+const bfd_target *
+_bfd_xcoff_archive_p (abfd)
+     bfd *abfd;
+{
+  char magic[SXCOFFARMAG];
+  bfd_size_type amt;
+
+  if (bfd_bread ((PTR) magic, (bfd_size_type) SXCOFFARMAG, abfd) != SXCOFFARMAG)
+    {
       if (bfd_get_error () != bfd_error_system_call)
        bfd_set_error (bfd_error_wrong_format);
       return NULL;
     }
 
       if (bfd_get_error () != bfd_error_system_call)
        bfd_set_error (bfd_error_wrong_format);
       return NULL;
     }
 
-  if (strncmp (hdr.magic, XCOFFARMAG, SXCOFFARMAG) != 0)
+  if (strncmp (magic, XCOFFARMAG, SXCOFFARMAG) != 0
+      && strncmp (magic, XCOFFARMAGBIG, SXCOFFARMAG) != 0)
     {
       bfd_set_error (bfd_error_wrong_format);
       return NULL;
     {
       bfd_set_error (bfd_error_wrong_format);
       return NULL;
@@ -808,26 +1155,78 @@ xcoff_archive_p (abfd)
   /* We are setting bfd_ardata(abfd) here, but since bfd_ardata
      involves a cast, we can't do it as the left operand of
      assignment.  */
   /* We are setting bfd_ardata(abfd) here, but since bfd_ardata
      involves a cast, we can't do it as the left operand of
      assignment.  */
-  abfd->tdata.aout_ar_data =
-    (struct artdata *) bfd_zalloc (abfd, sizeof (struct artdata));
-
+  amt = sizeof (struct artdata);
+  abfd->tdata.aout_ar_data = (struct artdata *) bfd_zalloc (abfd, amt);
   if (bfd_ardata (abfd) == (struct artdata *) NULL)
     return NULL;
 
   if (bfd_ardata (abfd) == (struct artdata *) NULL)
     return NULL;
 
-  bfd_ardata (abfd)->first_file_filepos = strtol (hdr.firstmemoff,
-                                                 (char **) NULL, 10);
   bfd_ardata (abfd)->cache = NULL;
   bfd_ardata (abfd)->archive_head = NULL;
   bfd_ardata (abfd)->symdefs = NULL;
   bfd_ardata (abfd)->extended_names = NULL;
 
   bfd_ardata (abfd)->cache = NULL;
   bfd_ardata (abfd)->archive_head = NULL;
   bfd_ardata (abfd)->symdefs = NULL;
   bfd_ardata (abfd)->extended_names = NULL;
 
-  bfd_ardata (abfd)->tdata = bfd_zalloc (abfd, SIZEOF_AR_FILE_HDR);
-  if (bfd_ardata (abfd)->tdata == NULL)
-    return NULL;
+  /* Now handle the two formats.  */
+  if (magic[1] != 'b')
+    {
+      /* This is the old format.  */
+      struct xcoff_ar_file_hdr hdr;
+
+      /* Copy over the magic string.  */
+      memcpy (hdr.magic, magic, SXCOFFARMAG);
+
+      /* Now read the rest of the file header.  */
+      if (bfd_bread ((PTR) &hdr.memoff,
+                   (bfd_size_type) SIZEOF_AR_FILE_HDR - SXCOFFARMAG, abfd)
+         != SIZEOF_AR_FILE_HDR - SXCOFFARMAG)
+       {
+         if (bfd_get_error () != bfd_error_system_call)
+           bfd_set_error (bfd_error_wrong_format);
+         return NULL;
+       }
+
+      bfd_ardata (abfd)->first_file_filepos = strtol (hdr.firstmemoff,
+                                                     (char **) NULL, 10);
+
+      amt = SIZEOF_AR_FILE_HDR;
+      bfd_ardata (abfd)->tdata = bfd_zalloc (abfd, amt);
+      if (bfd_ardata (abfd)->tdata == NULL)
+       return NULL;
+
+      memcpy (bfd_ardata (abfd)->tdata, &hdr, SIZEOF_AR_FILE_HDR);
+    }
+  else
+    {
+      /* This is the new format.  */
+      struct xcoff_ar_file_hdr_big hdr;
+
+      /* Copy over the magic string.  */
+      memcpy (hdr.magic, magic, SXCOFFARMAG);
+
+      /* Now read the rest of the file header.  */
+      if (bfd_bread ((PTR) &hdr.memoff,
+                   (bfd_size_type) SIZEOF_AR_FILE_HDR_BIG - SXCOFFARMAG, abfd)
+         != SIZEOF_AR_FILE_HDR_BIG - SXCOFFARMAG)
+       {
+         if (bfd_get_error () != bfd_error_system_call)
+           bfd_set_error (bfd_error_wrong_format);
+         return NULL;
+       }
+
+      /* XXX This actually has to be a call to strtoll (at least on 32-bit
+        machines) since the field width is 20 and there numbers with more
+        than 32 bits can be represented.  */
+      bfd_ardata (abfd)->first_file_filepos = strtol (hdr.firstmemoff,
+                                                     (char **) NULL, 10);
+
+      amt = SIZEOF_AR_FILE_HDR_BIG;
+      bfd_ardata (abfd)->tdata = bfd_zalloc (abfd, amt);
+      if (bfd_ardata (abfd)->tdata == NULL)
+       return NULL;
 
 
-  memcpy (bfd_ardata (abfd)->tdata, &hdr, SIZEOF_AR_FILE_HDR);
+      memcpy (bfd_ardata (abfd)->tdata, &hdr, SIZEOF_AR_FILE_HDR_BIG);
+    }
 
 
-  if (! xcoff_slurp_armap (abfd))
+  if (! _bfd_xcoff_slurp_armap (abfd))
     {
       bfd_release (abfd, bfd_ardata (abfd));
       abfd->tdata.aout_ar_data = (struct artdata *) NULL;
     {
       bfd_release (abfd, bfd_ardata (abfd));
       abfd->tdata.aout_ar_data = (struct artdata *) NULL;
@@ -839,36 +1238,88 @@ xcoff_archive_p (abfd)
 
 /* Read the archive header in an XCOFF archive.  */
 
 
 /* Read the archive header in an XCOFF archive.  */
 
-static PTR
-xcoff_read_ar_hdr (abfd)
+PTR
+_bfd_xcoff_read_ar_hdr (abfd)
      bfd *abfd;
 {
      bfd *abfd;
 {
-  struct xcoff_ar_hdr hdr;
-  size_t namlen;
-  struct xcoff_ar_hdr *hdrp;
+  bfd_size_type namlen;
   struct areltdata *ret;
   struct areltdata *ret;
+  bfd_size_type amt = sizeof (struct areltdata);
 
 
-  if (bfd_read ((PTR) &hdr, SIZEOF_AR_HDR, 1, abfd) != SIZEOF_AR_HDR)
+  ret = (struct areltdata *) bfd_alloc (abfd, amt);
+  if (ret == NULL)
     return NULL;
 
     return NULL;
 
-  namlen = strtol (hdr.namlen, (char **) NULL, 10);
-  hdrp = (struct xcoff_ar_hdr *) bfd_alloc (abfd, SIZEOF_AR_HDR + namlen + 1);
-  if (hdrp == NULL)
-    return NULL;
-  memcpy (hdrp, &hdr, SIZEOF_AR_HDR);
-  if (bfd_read ((char *) hdrp + SIZEOF_AR_HDR, 1, namlen, abfd) != namlen)
-    return NULL;
-  ((char *) hdrp)[SIZEOF_AR_HDR + namlen] = '\0';
+  if (! xcoff_big_format_p (abfd))
+    {
+      struct xcoff_ar_hdr hdr;
+      struct xcoff_ar_hdr *hdrp;
 
 
-  ret = (struct areltdata *) bfd_alloc (abfd, sizeof (struct areltdata));
-  if (ret == NULL)
-    return NULL;
-  ret->arch_header = (char *) hdrp;
-  ret->parsed_size = strtol (hdr.size, (char **) NULL, 10);
-  ret->filename = (char *) hdrp + SIZEOF_AR_HDR;
+      if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd)
+         != SIZEOF_AR_HDR)
+       {
+         free (ret);
+         return NULL;
+       }
+
+      namlen = strtol (hdr.namlen, (char **) NULL, 10);
+      amt = SIZEOF_AR_HDR + namlen + 1;
+      hdrp = (struct xcoff_ar_hdr *) bfd_alloc (abfd, amt);
+      if (hdrp == NULL)
+       {
+         free (ret);
+         return NULL;
+       }
+      memcpy (hdrp, &hdr, SIZEOF_AR_HDR);
+      if (bfd_bread ((char *) hdrp + SIZEOF_AR_HDR, namlen, abfd) != namlen)
+       {
+         free (ret);
+         return NULL;
+       }
+      ((char *) hdrp)[SIZEOF_AR_HDR + namlen] = '\0';
+
+      ret->arch_header = (char *) hdrp;
+      ret->parsed_size = strtol (hdr.size, (char **) NULL, 10);
+      ret->filename = (char *) hdrp + SIZEOF_AR_HDR;
+    }
+  else
+    {
+      struct xcoff_ar_hdr_big hdr;
+      struct xcoff_ar_hdr_big *hdrp;
+
+      if (bfd_bread ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
+         != SIZEOF_AR_HDR_BIG)
+       {
+         free (ret);
+         return NULL;
+       }
+
+      namlen = strtol (hdr.namlen, (char **) NULL, 10);
+      amt = SIZEOF_AR_HDR_BIG + namlen + 1;
+      hdrp = (struct xcoff_ar_hdr_big *) bfd_alloc (abfd, amt);
+      if (hdrp == NULL)
+       {
+         free (ret);
+         return NULL;
+       }
+      memcpy (hdrp, &hdr, SIZEOF_AR_HDR_BIG);
+      if (bfd_bread ((char *) hdrp + SIZEOF_AR_HDR_BIG, namlen, abfd) != namlen)
+       {
+         free (ret);
+         return NULL;
+       }
+      ((char *) hdrp)[SIZEOF_AR_HDR_BIG + namlen] = '\0';
+
+      ret->arch_header = (char *) hdrp;
+      /* XXX This actually has to be a call to strtoll (at least on 32-bit
+        machines) since the field width is 20 and there numbers with more
+        than 32 bits can be represented.  */
+      ret->parsed_size = strtol (hdr.size, (char **) NULL, 10);
+      ret->filename = (char *) hdrp + SIZEOF_AR_HDR_BIG;
+    }
 
   /* Skip over the XCOFFARFMAG at the end of the file name.  */
 
   /* Skip over the XCOFFARFMAG at the end of the file name.  */
-  if (bfd_seek (abfd, (namlen & 1) + SXCOFFARFMAG, SEEK_CUR) != 0)
+  if (bfd_seek (abfd, (file_ptr) ((namlen & 1) + SXCOFFARFMAG), SEEK_CUR) != 0)
     return NULL;
 
   return (PTR) ret;
     return NULL;
 
   return (PTR) ret;
@@ -876,8 +1327,8 @@ xcoff_read_ar_hdr (abfd)
 
 /* Open the next element in an XCOFF archive.  */
 
 
 /* Open the next element in an XCOFF archive.  */
 
-static bfd *
-xcoff_openr_next_archived_file (archive, last_file)
+bfd *
+_bfd_xcoff_openr_next_archived_file (archive, last_file)
      bfd *archive;
      bfd *last_file;
 {
      bfd *archive;
      bfd *last_file;
 {
@@ -889,19 +1340,47 @@ xcoff_openr_next_archived_file (archive, last_file)
       return NULL;
     }
 
       return NULL;
     }
 
-  if (last_file == NULL)
-    filestart = bfd_ardata (archive)->first_file_filepos;
+  if (! xcoff_big_format_p (archive))
+    {
+      if (last_file == NULL)
+       filestart = bfd_ardata (archive)->first_file_filepos;
+      else
+       filestart = strtol (arch_xhdr (last_file)->nextoff, (char **) NULL,
+                           10);
+
+      if (filestart == 0
+         || filestart == strtol (xcoff_ardata (archive)->memoff,
+                                 (char **) NULL, 10)
+         || filestart == strtol (xcoff_ardata (archive)->symoff,
+                                 (char **) NULL, 10))
+       {
+         bfd_set_error (bfd_error_no_more_archived_files);
+         return NULL;
+       }
+    }
   else
   else
-    filestart = strtol (arch_xhdr (last_file)->nextoff, (char **) NULL, 10);
-
-  if (filestart == 0
-      || filestart == strtol (xcoff_ardata (archive)->memoff,
-                             (char **) NULL, 10)
-      || filestart == strtol (xcoff_ardata (archive)->symoff,
-                             (char **) NULL, 10))
     {
     {
-      bfd_set_error (bfd_error_no_more_archived_files);
-      return NULL;
+      if (last_file == NULL)
+       filestart = bfd_ardata (archive)->first_file_filepos;
+      else
+       /* XXX These actually have to be a calls to strtoll (at least
+          on 32-bit machines) since the fields's width is 20 and
+          there numbers with more than 32 bits can be represented.  */
+       filestart = strtol (arch_xhdr_big (last_file)->nextoff, (char **) NULL,
+                           10);
+
+      /* XXX These actually have to be calls to strtoll (at least on 32-bit
+        machines) since the fields's width is 20 and there numbers with more
+        than 32 bits can be represented.  */
+      if (filestart == 0
+         || filestart == strtol (xcoff_ardata_big (archive)->memoff,
+                                 (char **) NULL, 10)
+         || filestart == strtol (xcoff_ardata_big (archive)->symoff,
+                                 (char **) NULL, 10))
+       {
+         bfd_set_error (bfd_error_no_more_archived_files);
+         return NULL;
+       }
     }
 
   return _bfd_get_elt_at_filepos (archive, filestart);
     }
 
   return _bfd_get_elt_at_filepos (archive, filestart);
@@ -909,26 +1388,37 @@ xcoff_openr_next_archived_file (archive, last_file)
 
 /* Stat an element in an XCOFF archive.  */
 
 
 /* Stat an element in an XCOFF archive.  */
 
-static int
-xcoff_generic_stat_arch_elt (abfd, s)
+int
+_bfd_xcoff_generic_stat_arch_elt (abfd, s)
      bfd *abfd;
      struct stat *s;
 {
      bfd *abfd;
      struct stat *s;
 {
-  struct xcoff_ar_hdr *hdrp;
-
   if (abfd->arelt_data == NULL)
     {
       bfd_set_error (bfd_error_invalid_operation);
       return -1;
     }
 
   if (abfd->arelt_data == NULL)
     {
       bfd_set_error (bfd_error_invalid_operation);
       return -1;
     }
 
-  hdrp = arch_xhdr (abfd);
+  if (! xcoff_big_format_p (abfd))
+    {
+      struct xcoff_ar_hdr *hdrp = arch_xhdr (abfd);
+
+      s->st_mtime = strtol (hdrp->date, (char **) NULL, 10);
+      s->st_uid = strtol (hdrp->uid, (char **) NULL, 10);
+      s->st_gid = strtol (hdrp->gid, (char **) NULL, 10);
+      s->st_mode = strtol (hdrp->mode, (char **) NULL, 8);
+      s->st_size = arch_eltdata (abfd)->parsed_size;
+    }
+  else
+    {
+      struct xcoff_ar_hdr_big *hdrp = arch_xhdr_big (abfd);
 
 
-  s->st_mtime = strtol (hdrp->date, (char **) NULL, 10);
-  s->st_uid = strtol (hdrp->uid, (char **) NULL, 10);
-  s->st_gid = strtol (hdrp->gid, (char **) NULL, 10);
-  s->st_mode = strtol (hdrp->mode, (char **) NULL, 8);
-  s->st_size = arch_eltdata (abfd)->parsed_size;
+      s->st_mtime = strtol (hdrp->date, (char **) NULL, 10);
+      s->st_uid = strtol (hdrp->uid, (char **) NULL, 10);
+      s->st_gid = strtol (hdrp->gid, (char **) NULL, 10);
+      s->st_mode = strtol (hdrp->mode, (char **) NULL, 8);
+      s->st_size = arch_eltdata (abfd)->parsed_size;
+    }
 
   return 0;
 }
 
   return 0;
 }
@@ -955,7 +1445,7 @@ normalize_filename (abfd)
 
 /*ARGSUSED*/
 static boolean
 
 /*ARGSUSED*/
 static boolean
-xcoff_write_armap (abfd, elength, map, orl_count, stridx)
+xcoff_write_armap_old (abfd, elength, map, orl_count, stridx)
      bfd *abfd;
      unsigned int elength ATTRIBUTE_UNUSED;
      struct orl *map;
      bfd *abfd;
      unsigned int elength ATTRIBUTE_UNUSED;
      struct orl *map;
@@ -984,12 +1474,14 @@ xcoff_write_armap (abfd, elength, map, orl_count, stridx)
     if (*p == '\0')
       *p = ' ';
 
     if (*p == '\0')
       *p = ' ';
 
-  if (bfd_write ((PTR) &hdr, SIZEOF_AR_HDR, 1, abfd) != SIZEOF_AR_HDR
-      || bfd_write (XCOFFARFMAG, 1, SXCOFFARFMAG, abfd) != SXCOFFARFMAG)
+  if (bfd_bwrite ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR, abfd)
+      != SIZEOF_AR_HDR
+      || (bfd_bwrite (XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
+         != SXCOFFARFMAG))
     return false;
     return false;
-  
-  bfd_h_put_32 (abfd, orl_count, buf);
-  if (bfd_write (buf, 1, 4, abfd) != 4)
+
+  H_PUT_32 (abfd, orl_count, buf);
+  if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
     return false;
 
   sub = abfd->archive_head;
     return false;
 
   sub = abfd->archive_head;
@@ -999,15 +1491,15 @@ xcoff_write_armap (abfd, elength, map, orl_count, stridx)
     {
       size_t namlen;
 
     {
       size_t namlen;
 
-      while (((bfd *) (map[i]).pos) == sub)
+      while (map[i].u.abfd == sub)
        {
        {
-         bfd_h_put_32 (abfd, fileoff, buf);
-         if (bfd_write (buf, 1, 4, abfd) != 4)
+         H_PUT_32 (abfd, fileoff, buf);
+         if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
            return false;
          ++i;
        }
       namlen = strlen (normalize_filename (sub));
            return false;
          ++i;
        }
       namlen = strlen (normalize_filename (sub));
-      namlen = (namlen + 1) &~ 1;
+      namlen = (namlen + 1) &~ (size_t) 1;
       fileoff += (SIZEOF_AR_HDR
                  + namlen
                  + SXCOFFARFMAG
       fileoff += (SIZEOF_AR_HDR
                  + namlen
                  + SXCOFFARFMAG
@@ -1023,7 +1515,129 @@ xcoff_write_armap (abfd, elength, map, orl_count, stridx)
 
       name = *map[i].name;
       namlen = strlen (name);
 
       name = *map[i].name;
       namlen = strlen (name);
-      if (bfd_write (name, 1, namlen + 1, abfd) != namlen + 1)
+      if (bfd_bwrite (name, (bfd_size_type) (namlen + 1), abfd) != namlen + 1)
+       return false;
+    }
+
+  if ((stridx & 1) != 0)
+    {
+      char b;
+
+      b = '\0';
+      if (bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
+       return false;
+    }
+
+  return true;
+}
+
+/* Write a single armap in the big format.  */
+
+static boolean
+xcoff_write_one_armap_big (abfd, map, orl_count, orl_ccount, stridx, bits64,
+                          prevoff, nextoff)
+     bfd *abfd;
+     struct orl *map;
+     unsigned int orl_count;
+     unsigned int orl_ccount;
+     unsigned int stridx;
+     int bits64;
+     const char *prevoff;
+     char *nextoff;
+{
+  struct xcoff_ar_hdr_big hdr;
+  char *p;
+  unsigned char buf[4];
+  bfd *sub;
+  file_ptr fileoff;
+  const bfd_arch_info_type *arch_info = NULL;
+  bfd *object_bfd;
+  unsigned int i;
+
+  memset (&hdr, 0, sizeof hdr);
+  /* XXX This call actually should use %lld (at least on 32-bit
+     machines) since the fields's width is 20 and there numbers with
+     more than 32 bits can be represented.  */
+  sprintf (hdr.size, "%ld", (long) (4 + orl_ccount * 4 + stridx));
+  if (bits64)
+    {
+      sprintf (hdr.nextoff, "%d", 0);
+    }
+  else
+    {
+      /* Do explict cast to long to remove compiler warning.  */
+      sprintf (hdr.nextoff, "%ld", (strtol (prevoff, (char **) NULL, 10)
+                                   + (long) (4 + orl_ccount * 4 + stridx)));
+    }
+
+  memcpy (hdr.prevoff, prevoff, sizeof (hdr.prevoff));
+  sprintf (hdr.date, "%d", 0);
+  sprintf (hdr.uid, "%d", 0);
+  sprintf (hdr.gid, "%d", 0);
+  sprintf (hdr.mode, "%d", 0);
+  sprintf (hdr.namlen, "%d", 0);
+
+  /* We need spaces, not null bytes, in the header.  */
+  for (p = (char *) &hdr; p < (char *) &hdr + SIZEOF_AR_HDR_BIG; p++)
+    if (*p == '\0')
+      *p = ' ';
+
+  memcpy (nextoff, hdr.nextoff, sizeof (hdr.nextoff));
+
+  if ((bfd_bwrite ((PTR) &hdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
+       != SIZEOF_AR_HDR_BIG)
+      || (bfd_bwrite (XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
+         != SXCOFFARFMAG))
+    return false;
+
+  H_PUT_32 (abfd, orl_ccount, buf);
+  if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
+    return false;
+
+  sub = abfd->archive_head;
+  fileoff = SIZEOF_AR_FILE_HDR_BIG;
+  i = 0;
+  while (sub != NULL && i < orl_count)
+    {
+      size_t namlen;
+
+      if ((bfd_arch_bits_per_address (map[i].u.abfd) == 64) == bits64)
+       while (map[i].u.abfd == sub)
+         {
+           H_PUT_32 (abfd, fileoff, buf);
+           if (bfd_bwrite (buf, (bfd_size_type) 4, abfd) != 4)
+             return false;
+           i++;
+         }
+      else
+       while (map[i].u.abfd == sub)
+         i++;
+
+      namlen = strlen (normalize_filename (sub));
+      namlen = (namlen + 1) &~ (size_t) 1;
+      fileoff += (SIZEOF_AR_HDR_BIG
+                 + namlen
+                 + SXCOFFARFMAG
+                 + arelt_size (sub));
+      fileoff = (fileoff + 1) &~ 1;
+      sub = sub->next;
+    }
+
+  object_bfd = NULL;
+  for (i = 0; i < orl_count; i++)
+    {
+      const char *name;
+      size_t namlen;
+      bfd *ob = map[i].u.abfd;
+
+      if (ob != object_bfd)
+       arch_info = bfd_get_arch_info (ob);
+      if ((arch_info->bits_per_address == 64) != bits64)
+       continue;
+
+      name = *map[i].name;
+      namlen = strlen (name);
+      if (bfd_bwrite (name, (bfd_size_type) (namlen + 1), abfd) != namlen + 1)
        return false;
     }
 
        return false;
     }
 
@@ -1032,29 +1646,103 @@ xcoff_write_armap (abfd, elength, map, orl_count, stridx)
       char b;
 
       b = '\0';
       char b;
 
       b = '\0';
-      if (bfd_write (&b, 1, 1, abfd) != 1)
+      if (bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
        return false;
     }
 
   return true;
 }
 
        return false;
     }
 
   return true;
 }
 
+static boolean
+xcoff_write_armap_big (abfd, elength, map, orl_count, stridx)
+     bfd *abfd;
+     unsigned int elength ATTRIBUTE_UNUSED;
+     struct orl *map;
+     unsigned int orl_count;
+     int stridx;
+{
+  unsigned int i;
+  unsigned int orl_count_32, orl_count_64;
+  unsigned int stridx_32, stridx_64;
+  const bfd_arch_info_type *arch_info = NULL;
+  bfd *object_bfd;
+
+  /* First, we look through the symbols and work out which are
+     from 32-bit objects and which from 64-bit ones.  */
+  orl_count_32 = 0;
+  orl_count_64 = 0;
+  stridx_32 = 0;
+  stridx_64 = 0;
+  object_bfd = NULL;
+  for (i = 0; i < orl_count; i++)
+    {
+      bfd *ob = map[i].u.abfd;
+      unsigned int len;
+      if (ob != object_bfd)
+       arch_info = bfd_get_arch_info (ob);
+      len = strlen (*map[i].name) + 1;
+      if (arch_info->bits_per_address == 64)
+       {
+         orl_count_64++;
+         stridx_64 += len;
+       }
+      else
+       {
+         orl_count_32++;
+         stridx_32 += len;
+       }
+      object_bfd = ob;
+    }
+  /* A quick sanity check... */
+  BFD_ASSERT (orl_count_64 + orl_count_32 == orl_count);
+  /* Explicit cast to int for compiler.  */
+  BFD_ASSERT ((int)(stridx_64 + stridx_32) == stridx);
+
+  /* Now write out each map.  */
+  if (! xcoff_write_one_armap_big (abfd, map, orl_count, orl_count_32,
+                                  stridx_32, false,
+                                  xcoff_ardata_big (abfd)->memoff,
+                                  xcoff_ardata_big (abfd)->symoff))
+    return false;
+  if (! xcoff_write_one_armap_big (abfd, map, orl_count, orl_count_64,
+                                  stridx_64, true,
+                                  xcoff_ardata_big (abfd)->symoff,
+                                  xcoff_ardata_big (abfd)->symoff64))
+    return false;
+
+  return true;
+}
+
+boolean
+_bfd_xcoff_write_armap (abfd, elength, map, orl_count, stridx)
+     bfd *abfd;
+     unsigned int elength ATTRIBUTE_UNUSED;
+     struct orl *map;
+     unsigned int orl_count;
+     int stridx;
+{
+  if (! xcoff_big_format_p (abfd))
+    return xcoff_write_armap_old (abfd, elength, map, orl_count, stridx);
+  else
+    return xcoff_write_armap_big (abfd, elength, map, orl_count, stridx);
+}
+
 /* Write out an XCOFF archive.  We always write an entire archive,
    rather than fussing with the freelist and so forth.  */
 
 static boolean
 /* Write out an XCOFF archive.  We always write an entire archive,
    rather than fussing with the freelist and so forth.  */
 
 static boolean
-xcoff_write_archive_contents (abfd)
+xcoff_write_archive_contents_old (abfd)
      bfd *abfd;
 {
   struct xcoff_ar_file_hdr fhdr;
      bfd *abfd;
 {
   struct xcoff_ar_file_hdr fhdr;
-  size_t count;
-  size_t total_namlen;
+  bfd_size_type count;
+  bfd_size_type total_namlen;
   file_ptr *offsets;
   boolean makemap;
   boolean hasobjects;
   file_ptr *offsets;
   boolean makemap;
   boolean hasobjects;
-  file_ptr prevoff, nextoff;
+  ufile_ptr prevoff, nextoff;
   bfd *sub;
   bfd *sub;
-  unsigned int i;
+  size_t i;
   struct xcoff_ar_hdr ahdr;
   bfd_size_type size;
   char *p;
   struct xcoff_ar_hdr ahdr;
   bfd_size_type size;
   char *p;
@@ -1076,7 +1764,7 @@ xcoff_write_archive_contents (abfd)
   if (offsets == NULL)
     return false;
 
   if (offsets == NULL)
     return false;
 
-  if (bfd_seek (abfd, SIZEOF_AR_FILE_HDR, SEEK_SET) != 0)
+  if (bfd_seek (abfd, (file_ptr) SIZEOF_AR_FILE_HDR, SEEK_SET) != 0)
     return false;
 
   makemap = bfd_has_map (abfd);
     return false;
 
   makemap = bfd_has_map (abfd);
@@ -1086,7 +1774,7 @@ xcoff_write_archive_contents (abfd)
   for (sub = abfd->archive_head, i = 0; sub != NULL; sub = sub->next, i++)
     {
       const char *name;
   for (sub = abfd->archive_head, i = 0; sub != NULL; sub = sub->next, i++)
     {
       const char *name;
-      size_t namlen;
+      bfd_size_type namlen;
       struct xcoff_ar_hdr *ahdrp;
       bfd_size_type remaining;
 
       struct xcoff_ar_hdr *ahdrp;
       bfd_size_type remaining;
 
@@ -1124,7 +1812,8 @@ xcoff_write_archive_contents (abfd)
 
          if (sub->arelt_data == NULL)
            {
 
          if (sub->arelt_data == NULL)
            {
-             sub->arelt_data = bfd_alloc (sub, sizeof (struct areltdata));
+             size = sizeof (struct areltdata);
+             sub->arelt_data = bfd_alloc (sub, size);
              if (sub->arelt_data == NULL)
                return false;
            }
              if (sub->arelt_data == NULL)
                return false;
            }
@@ -1137,7 +1826,7 @@ xcoff_write_archive_contents (abfd)
 
       /* If the length of the name is odd, we write out the null byte
          after the name as well.  */
 
       /* If the length of the name is odd, we write out the null byte
          after the name as well.  */
-      namlen = (namlen + 1) &~ 1;
+      namlen = (namlen + 1) &~ (bfd_size_type) 1;
 
       remaining = arelt_size (sub);
       size = (SIZEOF_AR_HDR
 
       remaining = arelt_size (sub);
       size = (SIZEOF_AR_HDR
@@ -1159,9 +1848,10 @@ xcoff_write_archive_contents (abfd)
        if (*p == '\0')
          *p = ' ';
 
        if (*p == '\0')
          *p = ' ';
 
-      if (bfd_write ((PTR) ahdrp, 1, SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR
-         || bfd_write ((PTR) name, 1, namlen, abfd) != namlen
-         || (bfd_write ((PTR) XCOFFARFMAG, 1, SXCOFFARFMAG, abfd)
+      if ((bfd_bwrite ((PTR) ahdrp, (bfd_size_type) SIZEOF_AR_HDR, abfd)
+          != SIZEOF_AR_HDR)
+         || (bfd_bwrite ((PTR) name, namlen, abfd) != namlen)
+         || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
              != SXCOFFARFMAG))
        return false;
 
              != SXCOFFARFMAG))
        return false;
 
@@ -1175,8 +1865,8 @@ xcoff_write_archive_contents (abfd)
          amt = sizeof buffer;
          if (amt > remaining)
            amt = remaining;
          amt = sizeof buffer;
          if (amt > remaining)
            amt = remaining;
-         if (bfd_read (buffer, 1, amt, sub) != amt
-             || bfd_write (buffer, 1, amt, abfd) != amt)
+         if (bfd_bread (buffer, amt, sub) != amt
+             || bfd_bwrite (buffer, amt, abfd) != amt)
            return false;
          remaining -= amt;
        }
            return false;
          remaining -= amt;
        }
@@ -1186,7 +1876,7 @@ xcoff_write_archive_contents (abfd)
          bfd_byte b;
 
          b = '\0';
          bfd_byte b;
 
          b = '\0';
-         if (bfd_write (&b, 1, 1, abfd) != 1)
+         if (bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
            return false;
        }
     }
            return false;
        }
     }
@@ -1226,28 +1916,29 @@ xcoff_write_archive_contents (abfd)
     if (*p == '\0')
       *p = ' ';
 
     if (*p == '\0')
       *p = ' ';
 
-  if (bfd_write ((PTR) &ahdr, 1, SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR
-      || (bfd_write ((PTR) XCOFFARFMAG, 1, SXCOFFARFMAG, abfd)
+  if ((bfd_bwrite ((PTR) &ahdr, (bfd_size_type) SIZEOF_AR_HDR, abfd)
+       != SIZEOF_AR_HDR)
+      || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
          != SXCOFFARFMAG))
     return false;
 
   sprintf (decbuf, "%-12ld", (long) count);
          != SXCOFFARFMAG))
     return false;
 
   sprintf (decbuf, "%-12ld", (long) count);
-  if (bfd_write ((PTR) decbuf, 1, 12, abfd) != 12)
+  if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) 12, abfd) != 12)
     return false;
     return false;
-  for (i = 0; i < count; i++)
+  for (i = 0; i < (size_t) count; i++)
     {
       sprintf (decbuf, "%-12ld", (long) offsets[i]);
     {
       sprintf (decbuf, "%-12ld", (long) offsets[i]);
-      if (bfd_write ((PTR) decbuf, 1, 12, abfd) != 12)
+      if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) 12, abfd) != 12)
        return false;
     }
   for (sub = abfd->archive_head; sub != NULL; sub = sub->next)
     {
       const char *name;
        return false;
     }
   for (sub = abfd->archive_head; sub != NULL; sub = sub->next)
     {
       const char *name;
-      size_t namlen;
+      bfd_size_type namlen;
 
       name = normalize_filename (sub);
       namlen = strlen (name);
 
       name = normalize_filename (sub);
       namlen = strlen (name);
-      if (bfd_write ((PTR) name, 1, namlen + 1, abfd) != namlen + 1)
+      if (bfd_bwrite ((PTR) name, namlen + 1, abfd) != namlen + 1)
        return false;
     }
   if ((size & 1) != 0)
        return false;
     }
   if ((size & 1) != 0)
@@ -1255,7 +1946,7 @@ xcoff_write_archive_contents (abfd)
       bfd_byte b;
 
       b = '\0';
       bfd_byte b;
 
       b = '\0';
-      if (bfd_write ((PTR) &b, 1, 1, abfd) != 1)
+      if (bfd_bwrite ((PTR) &b, (bfd_size_type) 1, abfd) != 1)
        return false;
     }
 
        return false;
     }
 
@@ -1280,105 +1971,1087 @@ xcoff_write_archive_contents (abfd)
       *p = ' ';
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
       *p = ' ';
 
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || (bfd_write ((PTR) &fhdr, SIZEOF_AR_FILE_HDR, 1, abfd) !=
-         SIZEOF_AR_FILE_HDR))
+      || (bfd_bwrite ((PTR) &fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR, abfd)
+         != SIZEOF_AR_FILE_HDR))
     return false;
 
   return true;
 }
     return false;
 
   return true;
 }
-\f
-/* We can't use the usual coff_sizeof_headers routine, because AIX
-   always uses an a.out header.  */
 
 
-/*ARGSUSED*/
-static int
-_bfd_xcoff_sizeof_headers (abfd, reloc)
+static boolean
+xcoff_write_archive_contents_big (abfd)
      bfd *abfd;
      bfd *abfd;
-     boolean reloc ATTRIBUTE_UNUSED;
 {
 {
-  int size;
-
-  size = FILHSZ;
-  if (xcoff_data (abfd)->full_aouthdr)
-    size += AOUTSZ;
-  else
-    size += SMALL_AOUTSZ;
-  size += abfd->section_count * SCNHSZ;
-  return size;
-}
-\f
-#define CORE_FILE_P _bfd_dummy_target
-
-#define coff_core_file_failing_command _bfd_nocore_core_file_failing_command
-#define coff_core_file_failing_signal _bfd_nocore_core_file_failing_signal
-#define coff_core_file_matches_executable_p \
-  _bfd_nocore_core_file_matches_executable_p
-
-#ifdef AIX_CORE
-#undef CORE_FILE_P
-#define CORE_FILE_P rs6000coff_core_p
-extern const bfd_target * rs6000coff_core_p ();
-extern boolean rs6000coff_get_section_contents ();
-extern boolean rs6000coff_core_file_matches_executable_p ();
+  struct xcoff_ar_file_hdr_big fhdr;
+  bfd_size_type count;
+  bfd_size_type total_namlen;
+  file_ptr *offsets;
+  boolean makemap;
+  boolean hasobjects;
+  ufile_ptr prevoff, nextoff;
+  bfd *sub;
+  size_t i;
+  struct xcoff_ar_hdr_big ahdr;
+  bfd_size_type size;
+  char *p;
+  char decbuf[13];
 
 
-#undef coff_core_file_matches_executable_p
-#define coff_core_file_matches_executable_p  \
-                                    rs6000coff_core_file_matches_executable_p
+  memset (&fhdr, 0, sizeof fhdr);
+  strncpy (fhdr.magic, XCOFFARMAGBIG, SXCOFFARMAG);
+  sprintf (fhdr.firstmemoff, "%d", SIZEOF_AR_FILE_HDR_BIG);
+  sprintf (fhdr.freeoff, "%d", 0);
 
 
-extern char *rs6000coff_core_file_failing_command PARAMS ((bfd *abfd));
-#undef coff_core_file_failing_command
-#define coff_core_file_failing_command rs6000coff_core_file_failing_command
+  count = 0;
+  total_namlen = 0;
+  for (sub = abfd->archive_head; sub != NULL; sub = sub->next)
+    {
+      ++count;
+      total_namlen += strlen (normalize_filename (sub)) + 1;
+    }
+  offsets = (file_ptr *) bfd_alloc (abfd, count * sizeof (file_ptr));
+  if (offsets == NULL)
+    return false;
 
 
-extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd));
-#undef coff_core_file_failing_signal
-#define coff_core_file_failing_signal rs6000coff_core_file_failing_signal
+  if (bfd_seek (abfd, (file_ptr) SIZEOF_AR_FILE_HDR_BIG, SEEK_SET) != 0)
+    return false;
 
 
-#undef coff_get_section_contents
-#define        coff_get_section_contents       rs6000coff_get_section_contents
-#endif /* AIX_CORE */
+  makemap = bfd_has_map (abfd);
+  hasobjects = false;
+  prevoff = 0;
+  nextoff = SIZEOF_AR_FILE_HDR_BIG;
+  for (sub = abfd->archive_head, i = 0; sub != NULL; sub = sub->next, i++)
+    {
+      const char *name;
+      bfd_size_type namlen;
+      struct xcoff_ar_hdr_big *ahdrp;
+      bfd_size_type remaining;
 
 
-#ifdef LYNX_CORE
+      if (makemap && ! hasobjects)
+       {
+         if (bfd_check_format (sub, bfd_object))
+           hasobjects = true;
+       }
 
 
-#undef CORE_FILE_P
-#define CORE_FILE_P lynx_core_file_p
-extern const bfd_target *lynx_core_file_p PARAMS ((bfd *abfd));
+      name = normalize_filename (sub);
+      namlen = strlen (name);
 
 
-extern boolean lynx_core_file_matches_executable_p PARAMS ((bfd *core_bfd,
-                                                           bfd *exec_bfd));
-#undef coff_core_file_matches_executable_p
-#define coff_core_file_matches_executable_p lynx_core_file_matches_executable_p
+      if (sub->arelt_data != NULL)
+       ahdrp = arch_xhdr_big (sub);
+      else
+       ahdrp = NULL;
 
 
-extern char *lynx_core_file_failing_command PARAMS ((bfd *abfd));
-#undef coff_core_file_failing_command
-#define coff_core_file_failing_command lynx_core_file_failing_command
+      if (ahdrp == NULL)
+       {
+         struct stat s;
 
 
-extern int lynx_core_file_failing_signal PARAMS ((bfd *abfd));
-#undef coff_core_file_failing_signal
-#define coff_core_file_failing_signal lynx_core_file_failing_signal
+         memset (&ahdr, 0, sizeof ahdr);
+         ahdrp = &ahdr;
+         /* XXX This should actually be a call to stat64 (at least on
+            32-bit machines).  */
+         if (stat (bfd_get_filename (sub), &s) != 0)
+           {
+             bfd_set_error (bfd_error_system_call);
+             return false;
+           }
 
 
-#endif /* LYNX_CORE */
+         /* XXX This call actually should use %lld (at least on 32-bit
+            machines) since the fields's width is 20 and there numbers with
+            more than 32 bits can be represented.  */
+         sprintf (ahdrp->size, "%ld", (long) s.st_size);
+         sprintf (ahdrp->date, "%ld", (long) s.st_mtime);
+         sprintf (ahdrp->uid, "%ld", (long) s.st_uid);
+         sprintf (ahdrp->gid, "%ld", (long) s.st_gid);
+         sprintf (ahdrp->mode, "%o", (unsigned int) s.st_mode);
 
 
-#define _bfd_xcoff_bfd_get_relocated_section_contents \
-  coff_bfd_get_relocated_section_contents
-#define _bfd_xcoff_bfd_relax_section coff_bfd_relax_section
-#define _bfd_xcoff_bfd_gc_sections coff_bfd_gc_sections
-#define _bfd_xcoff_bfd_link_split_section coff_bfd_link_split_section
+         if (sub->arelt_data == NULL)
+           {
+             size = sizeof (struct areltdata);
+             sub->arelt_data = bfd_alloc (sub, size);
+             if (sub->arelt_data == NULL)
+               return false;
+           }
 
 
-/* The transfer vector that leads the outside world to all of the above. */
+         arch_eltdata (sub)->parsed_size = s.st_size;
+       }
 
 
-const bfd_target
-#ifdef TARGET_SYM
-  TARGET_SYM =
-#else
-  rs6000coff_vec =
-#endif
+      /* XXX These calls actually should use %lld (at least on 32-bit
+        machines) since the fields's width is 20 and there numbers with
+        more than 32 bits can be represented.  */
+      sprintf (ahdrp->prevoff, "%ld", (long) prevoff);
+      sprintf (ahdrp->namlen, "%ld", (long) namlen);
+
+      /* If the length of the name is odd, we write out the null byte
+         after the name as well.  */
+      namlen = (namlen + 1) &~ (bfd_size_type) 1;
+
+      remaining = arelt_size (sub);
+      size = (SIZEOF_AR_HDR_BIG
+             + namlen
+             + SXCOFFARFMAG
+             + remaining);
+
+      BFD_ASSERT (nextoff == bfd_tell (abfd));
+
+      offsets[i] = nextoff;
+
+      prevoff = nextoff;
+      nextoff += size + (size & 1);
+
+      sprintf (ahdrp->nextoff, "%ld", (long) nextoff);
+
+      /* We need spaces, not null bytes, in the header.  */
+      for (p = (char *) ahdrp; p < (char *) ahdrp + SIZEOF_AR_HDR_BIG; p++)
+       if (*p == '\0')
+         *p = ' ';
+
+      if ((bfd_bwrite ((PTR) ahdrp, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
+          != SIZEOF_AR_HDR_BIG)
+         || bfd_bwrite ((PTR) name, (bfd_size_type) namlen, abfd) != namlen
+         || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
+             != SXCOFFARFMAG))
+       return false;
+
+      if (bfd_seek (sub, (file_ptr) 0, SEEK_SET) != 0)
+       return false;
+      while (remaining != 0)
+       {
+         bfd_size_type amt;
+         bfd_byte buffer[DEFAULT_BUFFERSIZE];
+
+         amt = sizeof buffer;
+         if (amt > remaining)
+           amt = remaining;
+         if (bfd_bread (buffer, amt, sub) != amt
+             || bfd_bwrite (buffer, amt, abfd) != amt)
+           return false;
+         remaining -= amt;
+       }
+
+      if ((size & 1) != 0)
+       {
+         bfd_byte b;
+
+         b = '\0';
+         if (bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
+           return false;
+       }
+    }
+
+  /* XXX This call actually should use %lld (at least on 32-bit
+     machines) since the fields's width is 20 and there numbers with
+     more than 32 bits can be represented.  */
+  sprintf (fhdr.lastmemoff, "%ld", (long) prevoff);
+
+  /* Write out the member table.  */
+
+  BFD_ASSERT (nextoff == bfd_tell (abfd));
+  /* XXX This call actually should use %lld (at least on 32-bit
+     machines) since the fields's width is 20 and there numbers with
+     more than 32 bits can be represented.  */
+  sprintf (fhdr.memoff, "%ld", (long) nextoff);
+
+  memset (&ahdr, 0, sizeof ahdr);
+  /* XXX The next two calls actually should use %lld (at least on 32-bit
+     machines) since the fields's width is 20 and there numbers with
+     more than 32 bits can be represented.  */
+  sprintf (ahdr.size, "%ld", (long) (12 + count * 12 + total_namlen));
+  sprintf (ahdr.prevoff, "%ld", (long) prevoff);
+  sprintf (ahdr.date, "%d", 0);
+  sprintf (ahdr.uid, "%d", 0);
+  sprintf (ahdr.gid, "%d", 0);
+  sprintf (ahdr.mode, "%d", 0);
+  sprintf (ahdr.namlen, "%d", 0);
+
+  size = (SIZEOF_AR_HDR_BIG
+         + 12
+         + count * 12
+         + total_namlen
+         + SXCOFFARFMAG);
+
+  prevoff = nextoff;
+  nextoff += size + (size & 1);
+
+  if (makemap && hasobjects)
+    /* XXX This call actually should use %lld (at least on 32-bit
+       machines) since the fields's width is 20 and there numbers with
+       more than 32 bits can be represented.  */
+    sprintf (ahdr.nextoff, "%ld", (long) nextoff);
+  else
+    sprintf (ahdr.nextoff, "%d", 0);
+
+  /* We need spaces, not null bytes, in the header.  */
+  for (p = (char *) &ahdr; p < (char *) &ahdr + SIZEOF_AR_HDR_BIG; p++)
+    if (*p == '\0')
+      *p = ' ';
+
+  if ((bfd_bwrite ((PTR) &ahdr, (bfd_size_type) SIZEOF_AR_HDR_BIG, abfd)
+       != SIZEOF_AR_HDR_BIG)
+      || (bfd_bwrite ((PTR) XCOFFARFMAG, (bfd_size_type) SXCOFFARFMAG, abfd)
+         != SXCOFFARFMAG))
+    return false;
+
+  sprintf (decbuf, "%-12ld", (long) count);
+  if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) 12, abfd) != 12)
+    return false;
+  for (i = 0; i < (size_t) count; i++)
+    {
+      sprintf (decbuf, "%-12ld", (long) offsets[i]);
+      if (bfd_bwrite ((PTR) decbuf, (bfd_size_type) 12, abfd) != 12)
+       return false;
+    }
+  for (sub = abfd->archive_head; sub != NULL; sub = sub->next)
+    {
+      const char *name;
+      size_t namlen;
+
+      name = normalize_filename (sub);
+      namlen = strlen (name);
+      if (bfd_bwrite ((PTR) name, (bfd_size_type) (namlen + 1), abfd)
+         != namlen + 1)
+       return false;
+    }
+  if ((size & 1) != 0)
+    {
+      bfd_byte b;
+
+      b = '\0';
+      if (bfd_bwrite ((PTR) &b, (bfd_size_type) 1, abfd) != 1)
+       return false;
+    }
+
+  /* Write out the armap, if appropriate.  */
+
+  if (! makemap || ! hasobjects)
+    sprintf (fhdr.symoff, "%d", 0);
+  else
+    {
+      BFD_ASSERT (nextoff == bfd_tell (abfd));
+      /* XXX This call actually should use %lld (at least on 32-bit
+        machines) since the fields's width is 20 and there numbers with
+        more than 32 bits can be represented.  */
+      bfd_ardata (abfd)->tdata = (PTR) &fhdr;
+      if (! _bfd_compute_and_write_armap (abfd, 0))
+       return false;
+    }
+
+  /* Write out the archive file header.  */
+
+  /* We need spaces, not null bytes, in the header.  */
+  for (p = (char *) &fhdr; p < (char *) &fhdr + SIZEOF_AR_FILE_HDR_BIG; p++)
+    if (*p == '\0')
+      *p = ' ';
+
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
+      || (bfd_bwrite ((PTR) &fhdr, (bfd_size_type) SIZEOF_AR_FILE_HDR_BIG, abfd)
+         != SIZEOF_AR_FILE_HDR_BIG))
+    return false;
+
+  return true;
+}
+
+boolean
+_bfd_xcoff_write_archive_contents (abfd)
+     bfd *abfd;
 {
 {
-#ifdef TARGET_NAME
-  TARGET_NAME,
-#else
-  "aixcoff-rs6000",            /* name */
-#endif
-  bfd_target_coff_flavour,     
+  if (! xcoff_big_format_p (abfd))
+    return xcoff_write_archive_contents_old (abfd);
+  else
+    return xcoff_write_archive_contents_big (abfd);
+}
+\f
+/* We can't use the usual coff_sizeof_headers routine, because AIX
+   always uses an a.out header.  */
+
+int
+_bfd_xcoff_sizeof_headers (abfd, reloc)
+     bfd *abfd;
+     boolean reloc ATTRIBUTE_UNUSED;
+{
+  int size;
+
+  size = FILHSZ;
+  if (xcoff_data (abfd)->full_aouthdr)
+    size += AOUTSZ;
+  else
+    size += SMALL_AOUTSZ;
+  size += abfd->section_count * SCNHSZ;
+  return size;
+}
+\f
+/* Routines to swap information in the XCOFF .loader section.  If we
+   ever need to write an XCOFF loader, this stuff will need to be
+   moved to another file shared by the linker (which XCOFF calls the
+   ``binder'') and the loader.  */
+
+/* Swap in the ldhdr structure.  */
+
+static void
+xcoff_swap_ldhdr_in (abfd, s, dst)
+     bfd *abfd;
+     const PTR s;
+     struct internal_ldhdr *dst;
+{
+  const struct external_ldhdr *src = (const struct external_ldhdr *) s;
+
+  dst->l_version = bfd_get_32 (abfd, src->l_version);
+  dst->l_nsyms = bfd_get_32 (abfd, src->l_nsyms);
+  dst->l_nreloc = bfd_get_32 (abfd, src->l_nreloc);
+  dst->l_istlen = bfd_get_32 (abfd, src->l_istlen);
+  dst->l_nimpid = bfd_get_32 (abfd, src->l_nimpid);
+  dst->l_impoff = bfd_get_32 (abfd, src->l_impoff);
+  dst->l_stlen = bfd_get_32 (abfd, src->l_stlen);
+  dst->l_stoff = bfd_get_32 (abfd, src->l_stoff);
+}
+
+/* Swap out the ldhdr structure.  */
+
+static void
+xcoff_swap_ldhdr_out (abfd, src, d)
+     bfd *abfd;
+     const struct internal_ldhdr *src;
+     PTR d;
+{
+  struct external_ldhdr *dst = (struct external_ldhdr *) d;
+
+  bfd_put_32 (abfd, (bfd_vma) src->l_version, dst->l_version);
+  bfd_put_32 (abfd, src->l_nsyms, dst->l_nsyms);
+  bfd_put_32 (abfd, src->l_nreloc, dst->l_nreloc);
+  bfd_put_32 (abfd, src->l_istlen, dst->l_istlen);
+  bfd_put_32 (abfd, src->l_nimpid, dst->l_nimpid);
+  bfd_put_32 (abfd, src->l_impoff, dst->l_impoff);
+  bfd_put_32 (abfd, src->l_stlen, dst->l_stlen);
+  bfd_put_32 (abfd, src->l_stoff, dst->l_stoff);
+}
+
+/* Swap in the ldsym structure.  */
+
+static void
+xcoff_swap_ldsym_in (abfd, s, dst)
+     bfd *abfd;
+     const PTR s;
+     struct internal_ldsym *dst;
+{
+  const struct external_ldsym *src = (const struct external_ldsym *) s;
+
+  if (bfd_get_32 (abfd, src->_l._l_l._l_zeroes) != 0) {
+    memcpy (dst->_l._l_name, src->_l._l_name, SYMNMLEN);
+  } else {
+    dst->_l._l_l._l_zeroes = 0;
+    dst->_l._l_l._l_offset = bfd_get_32 (abfd, src->_l._l_l._l_offset);
+  }
+  dst->l_value = bfd_get_32 (abfd, src->l_value);
+  dst->l_scnum = bfd_get_16 (abfd, src->l_scnum);
+  dst->l_smtype = bfd_get_8 (abfd, src->l_smtype);
+  dst->l_smclas = bfd_get_8 (abfd, src->l_smclas);
+  dst->l_ifile = bfd_get_32 (abfd, src->l_ifile);
+  dst->l_parm = bfd_get_32 (abfd, src->l_parm);
+}
+
+/* Swap out the ldsym structure.  */
+
+static void
+xcoff_swap_ldsym_out (abfd, src, d)
+     bfd *abfd;
+     const struct internal_ldsym *src;
+     PTR d;
+{
+  struct external_ldsym *dst = (struct external_ldsym *) d;
+
+  if (src->_l._l_l._l_zeroes != 0)
+    memcpy (dst->_l._l_name, src->_l._l_name, SYMNMLEN);
+  else
+    {
+      bfd_put_32 (abfd, (bfd_vma) 0, dst->_l._l_l._l_zeroes);
+      bfd_put_32 (abfd, (bfd_vma) src->_l._l_l._l_offset,
+                 dst->_l._l_l._l_offset);
+    }
+  bfd_put_32 (abfd, src->l_value, dst->l_value);
+  bfd_put_16 (abfd, (bfd_vma) src->l_scnum, dst->l_scnum);
+  bfd_put_8 (abfd, src->l_smtype, dst->l_smtype);
+  bfd_put_8 (abfd, src->l_smclas, dst->l_smclas);
+  bfd_put_32 (abfd, src->l_ifile, dst->l_ifile);
+  bfd_put_32 (abfd, src->l_parm, dst->l_parm);
+}
+
+/* Swap in the ldrel structure.  */
+
+static void
+xcoff_swap_ldrel_in (abfd, s, dst)
+     bfd *abfd;
+     const PTR s;
+     struct internal_ldrel *dst;
+{
+  const struct external_ldrel *src = (const struct external_ldrel *) s;
+
+  dst->l_vaddr = bfd_get_32 (abfd, src->l_vaddr);
+  dst->l_symndx = bfd_get_32 (abfd, src->l_symndx);
+  dst->l_rtype = bfd_get_16 (abfd, src->l_rtype);
+  dst->l_rsecnm = bfd_get_16 (abfd, src->l_rsecnm);
+}
+
+/* Swap out the ldrel structure.  */
+
+static void
+xcoff_swap_ldrel_out (abfd, src, d)
+     bfd *abfd;
+     const struct internal_ldrel *src;
+     PTR d;
+{
+  struct external_ldrel *dst = (struct external_ldrel *) d;
+
+  bfd_put_32 (abfd, src->l_vaddr, dst->l_vaddr);
+  bfd_put_32 (abfd, src->l_symndx, dst->l_symndx);
+  bfd_put_16 (abfd, (bfd_vma) src->l_rtype, dst->l_rtype);
+  bfd_put_16 (abfd, (bfd_vma) src->l_rsecnm, dst->l_rsecnm);
+}
+\f
+
+
+/* This is the relocation function for the RS/6000/POWER/PowerPC.
+   This is currently the only processor which uses XCOFF; I hope that
+   will never change.  */
+
+static boolean
+xcoff_ppc_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;
+{
+  struct internal_reloc *rel;
+  struct internal_reloc *relend;
+
+  rel = relocs;
+  relend = rel + input_section->reloc_count;
+
+  for (; rel < relend; rel++)
+    {
+      long symndx;
+      struct xcoff_link_hash_entry *h;
+      struct internal_syment *sym;
+      bfd_vma addend;
+      bfd_vma val;
+      struct reloc_howto_struct howto;
+      bfd_reloc_status_type rstat;
+
+      /* Relocation type R_REF is a special relocation type which is
+         merely used to prevent garbage collection from occurring for
+         the csect including the symbol which it references.  */
+      if (rel->r_type == R_REF)
+       continue;
+
+      symndx = rel->r_symndx;
+
+      if (symndx == -1)
+       {
+         h = NULL;
+         sym = NULL;
+         addend = 0;
+       }
+      else
+       {
+         h = obj_xcoff_sym_hashes (input_bfd)[symndx];
+         sym = syms + symndx;
+         addend = - sym->n_value;
+
+       }
+
+      /* We build the howto information on the fly.  */
+
+      howto.type = rel->r_type;
+      howto.rightshift = 0;
+      howto.size = 2;
+      howto.bitsize = (rel->r_size & 0x1f) + 1;
+      howto.pc_relative = false;
+      howto.bitpos = 0;
+      if ((rel->r_size & 0x80) != 0)
+       howto.complain_on_overflow = complain_overflow_signed;
+      else
+       howto.complain_on_overflow = complain_overflow_bitfield;
+      howto.special_function = NULL;
+      howto.name = "internal";
+      howto.partial_inplace = true;
+      if (howto.bitsize == 32)
+       howto.src_mask = howto.dst_mask = 0xffffffff;
+      else
+       {
+         howto.src_mask = howto.dst_mask = (1 << howto.bitsize) - 1;
+         if (howto.bitsize == 16)
+           howto.size = 1;
+       }
+      howto.pcrel_offset = false;
+
+      val = 0;
+
+      if (h == NULL)
+       {
+         asection *sec;
+
+         if (symndx == -1)
+           {
+             sec = bfd_abs_section_ptr;
+             val = 0;
+           }
+         else
+           {
+             sec = sections[symndx];
+             /* Hack to make sure we use the right TOC anchor value
+                 if this reloc is against the TOC anchor.  */
+
+             if (sec->name[3] == '0'
+                         && strcmp (sec->name, ".tc0") == 0)
+               {
+                 val = xcoff_data (output_bfd)->toc;
+               }
+             else
+               {
+                 val = (sec->output_section->vma
+                        + sec->output_offset
+                        + sym->n_value
+                        - sec->vma);
+               }
+           }
+       }
+      else
+       {
+         if (h->root.type == bfd_link_hash_defined
+             || h->root.type == bfd_link_hash_defweak)
+           {
+             asection *sec;
+
+             sec = h->root.u.def.section;
+             val = (h->root.u.def.value
+                    + sec->output_section->vma
+                    + sec->output_offset);
+           }
+         else if (h->root.type == bfd_link_hash_common)
+           {
+             asection *sec;
+
+             sec = h->root.u.c.p->section;
+             val = (sec->output_section->vma
+                    + sec->output_offset);
+           }
+         else if ((h->flags & XCOFF_DEF_DYNAMIC) != 0
+                  || (h->flags & XCOFF_IMPORT) != 0)
+           {
+             /* Every symbol in a shared object is defined somewhere.  */
+             val = 0;
+           }
+         else if (! info->relocateable)
+           {
+             if (! ((*info->callbacks->undefined_symbol)
+                    (info, h->root.root.string, input_bfd, input_section,
+                     rel->r_vaddr - input_section->vma, true)))
+               return false;
+
+             /* Don't try to process the reloc.  It can't help, and
+                 it may generate another error.  */
+             continue;
+           }
+       }
+
+      /* I took the relocation type definitions from two documents:
+        the PowerPC AIX Version 4 Application Binary Interface, First
+        Edition (April 1992), and the PowerOpen ABI, Big-Endian
+        32-Bit Hardware Implementation (June 30, 1994).  Differences
+        between the documents are noted below.  */
+
+      switch (rel->r_type)
+       {
+       case R_RTB:
+       case R_RRTBI:
+       case R_RRTBA:
+         /* These relocs are defined by the PowerPC ABI to be
+             relative branches which use half of the difference
+             between the symbol and the program counter.  I can't
+             quite figure out when this is useful.  These relocs are
+             not defined by the PowerOpen ABI.  */
+       default:
+         (*_bfd_error_handler)
+           (_("%s: unsupported relocation type 0x%02x"),
+            bfd_get_filename (input_bfd), (unsigned int) rel->r_type);
+         bfd_set_error (bfd_error_bad_value);
+         return false;
+       case R_POS:
+         /* Simple positive relocation.  */
+         break;
+       case R_NEG:
+         /* Simple negative relocation.  */
+         val = - val;
+         break;
+       case R_REL:
+         /* Simple PC relative relocation.  */
+         howto.pc_relative = true;
+         break;
+       case R_TOC:
+         /* TOC relative relocation.  The value in the instruction in
+             the input file is the offset from the input file TOC to
+             the desired location.  We want the offset from the final
+             TOC to the desired location.  We have:
+                isym = iTOC + in
+                iinsn = in + o
+                osym = oTOC + on
+                oinsn = on + o
+            so we must change insn by on - in.
+            */
+       case R_GL:
+         /* Global linkage relocation.  The value of this relocation
+             is the address of the entry in the TOC section.  */
+       case R_TCL:
+         /* Local object TOC address.  I can't figure out the
+             difference between this and case R_GL.  */
+       case R_TRL:
+         /* TOC relative relocation.  A TOC relative load instruction
+             which may be changed to a load address instruction.
+             FIXME: We don't currently implement this optimization.  */
+       case R_TRLA:
+         /* TOC relative relocation.  This is a TOC relative load
+             address instruction which may be changed to a load
+             instruction.  FIXME: I don't know if this is the correct
+             implementation.  */
+         if (h != NULL && h->smclas != XMC_TD)
+           {
+             if (h->toc_section == NULL)
+               {
+                 (*_bfd_error_handler)
+                   (_("%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"),
+                    bfd_get_filename (input_bfd), rel->r_vaddr,
+                    h->root.root.string);
+                 bfd_set_error (bfd_error_bad_value);
+                 return false;
+               }
+
+             BFD_ASSERT ((h->flags & XCOFF_SET_TOC) == 0);
+             val = (h->toc_section->output_section->vma
+                    + h->toc_section->output_offset);
+           }
+
+         val = ((val - xcoff_data (output_bfd)->toc)
+                - (sym->n_value - xcoff_data (input_bfd)->toc));
+         addend = 0;
+         break;
+       case R_BA:
+         /* Absolute branch.  We don't want to mess with the lower
+             two bits of the instruction.  */
+       case R_CAI:
+         /* The PowerPC ABI defines this as an absolute call which
+             may be modified to become a relative call.  The PowerOpen
+             ABI does not define this relocation type.  */
+       case R_RBA:
+         /* Absolute branch which may be modified to become a
+             relative branch.  */
+       case R_RBAC:
+         /* The PowerPC ABI defines this as an absolute branch to a
+             fixed address which may be modified to an absolute branch
+             to a symbol.  The PowerOpen ABI does not define this
+             relocation type.  */
+       case R_RBRC:
+         /* The PowerPC ABI defines this as an absolute branch to a
+             fixed address which may be modified to a relative branch.
+             The PowerOpen ABI does not define this relocation type.  */
+         howto.src_mask &= ~3;
+         howto.dst_mask = howto.src_mask;
+         break;
+       case R_BR:
+         /* Relative branch.  We don't want to mess with the lower
+             two bits of the instruction.  */
+       case R_CREL:
+         /* The PowerPC ABI defines this as a relative call which may
+             be modified to become an absolute call.  The PowerOpen
+             ABI does not define this relocation type.  */
+       case R_RBR:
+         /* A relative branch which may be modified to become an
+             absolute branch.  FIXME: We don't implement this,
+             although we should for symbols of storage mapping class
+             XMC_XO.  */
+         howto.pc_relative = true;
+         howto.src_mask &= ~3;
+         howto.dst_mask = howto.src_mask;
+         break;
+       case R_RL:
+         /* The PowerPC AIX ABI describes this as a load which may be
+             changed to a load address.  The PowerOpen ABI says this
+             is the same as case R_POS.  */
+         break;
+       case R_RLA:
+         /* The PowerPC AIX ABI describes this as a load address
+             which may be changed to a load.  The PowerOpen ABI says
+             this is the same as R_POS.  */
+         break;
+       }
+
+      /* If we see an R_BR or R_RBR reloc which is jumping to global
+         linkage code, and it is followed by an appropriate cror nop
+         instruction, we replace the cror with lwz r2,20(r1).  This
+         restores the TOC after the glink code.  Contrariwise, if the
+         call is followed by a lwz r2,20(r1), but the call is not
+         going to global linkage code, we can replace the load with a
+         cror.  */
+      if ((rel->r_type == R_BR || rel->r_type == R_RBR)
+         && h != NULL
+         && h->root.type == bfd_link_hash_defined
+         && (rel->r_vaddr - input_section->vma + 8
+             <= input_section->_cooked_size))
+       {
+         bfd_byte *pnext;
+         unsigned long next;
+
+         pnext = contents + (rel->r_vaddr - input_section->vma) + 4;
+         next = bfd_get_32 (input_bfd, pnext);
+
+         /* The _ptrgl function is magic.  It is used by the AIX
+             compiler to call a function through a pointer.  */
+         if (h->smclas == XMC_GL
+             || strcmp (h->root.root.string, "._ptrgl") == 0)
+           {
+             if (next == 0x4def7b82            /* cror 15,15,15 */
+                 || next == 0x4ffffb82         /* cror 31,31,31 */
+                 || next == 0x60000000)        /* ori r0,r0,0 */
+               bfd_put_32 (input_bfd,
+                           (bfd_vma) 0x80410014, /* lwz r1,20(r1) */
+                           pnext);
+           }
+         else
+           {
+             if (next == 0x80410014)           /* lwz r1,20(r1) */
+               bfd_put_32 (input_bfd,
+                           (bfd_vma) 0x60000000, /* ori r0,r0,0 */
+                           pnext);
+           }
+       }
+
+      /* A PC relative reloc includes the section address.  */
+      if (howto.pc_relative)
+       addend += input_section->vma;
+
+      rstat = _bfd_final_link_relocate (&howto, input_bfd, input_section,
+                                       contents,
+                                       rel->r_vaddr - input_section->vma,
+                                       val, addend);
+
+      switch (rstat)
+       {
+       default:
+         abort ();
+       case bfd_reloc_ok:
+         break;
+       case bfd_reloc_overflow:
+         {
+           const char *name;
+           char buf[SYMNMLEN + 1];
+           char howto_name[10];
+
+           if (symndx == -1)
+             name = "*ABS*";
+           else if (h != NULL)
+             name = h->root.root.string;
+           else
+             {
+               name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
+
+               if (name == NULL)
+                 return false;
+             }
+           sprintf (howto_name, "0x%02x", rel->r_type);
+
+           if (! ((*info->callbacks->reloc_overflow)
+                  (info, name, howto_name, (bfd_vma) 0, input_bfd,
+                   input_section, rel->r_vaddr - input_section->vma)))
+             return false;
+         }
+       }
+    }
+
+  return true;
+}
+
+static boolean
+_bfd_xcoff_put_ldsymbol_name (abfd, ldinfo, ldsym, name)
+     bfd *abfd ATTRIBUTE_UNUSED;
+        struct xcoff_loader_info *ldinfo;
+        struct internal_ldsym *ldsym;
+        const char *name;
+{
+  size_t len;
+  len = strlen (name);
+
+  if (len <= SYMNMLEN)
+    strncpy (ldsym->_l._l_name, name, SYMNMLEN);
+  else
+    {
+      if (ldinfo->string_size + len + 3 > ldinfo->string_alc)
+       {
+         bfd_size_type newalc;
+         bfd_byte *newstrings;
+
+         newalc = ldinfo->string_alc * 2;
+         if (newalc == 0)
+           newalc = 32;
+         while (ldinfo->string_size + len + 3 > newalc)
+           newalc *= 2;
+
+         newstrings = ((bfd_byte *)
+                       bfd_realloc ((PTR) ldinfo->strings, newalc));
+         if (newstrings == NULL)
+           {
+             ldinfo->failed = true;
+             return false;
+           }
+         ldinfo->string_alc = newalc;
+         ldinfo->strings = newstrings;
+       }
+
+      bfd_put_16 (ldinfo->output_bfd, (bfd_vma) (len + 1),
+                 ldinfo->strings + ldinfo->string_size);
+      strcpy (ldinfo->strings + ldinfo->string_size + 2, name);
+      ldsym->_l._l_l._l_zeroes = 0;
+      ldsym->_l._l_l._l_offset = ldinfo->string_size + 2;
+      ldinfo->string_size += len + 3;
+    }
+
+  return true;
+}
+
+static boolean
+_bfd_xcoff_put_symbol_name (bfd *abfd, struct bfd_strtab_hash *strtab,
+                           struct internal_syment *sym,
+                           const char *name)
+{
+  if (strlen (name) <= SYMNMLEN)
+    {
+      strncpy (sym->_n._n_name, name, SYMNMLEN);
+    }
+  else
+    {
+      boolean hash;
+      bfd_size_type indx;
+
+      hash = true;
+      if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+       hash = false;
+      indx = _bfd_stringtab_add (strtab, name, hash, false);
+      if (indx == (bfd_size_type) -1)
+       return false;
+      sym->_n._n_n._n_zeroes = 0;
+      sym->_n._n_n._n_offset = STRING_SIZE_SIZE + indx;
+    }
+  return true;
+}
+
+static asection *
+xcoff_create_csect_from_smclas (abfd, aux, symbol_name)
+     bfd *abfd;
+     union internal_auxent *aux;
+     const char *symbol_name;
+{
+  asection *return_value = NULL;
+
+  /* .sv64 = x_smclas == 17
+     This is an invalid csect for 32 bit apps.  */
+  static const char *names[19] =
+  {
+    ".pr", ".ro", ".db", ".tc", ".ua", ".rw", ".gl", ".xo",
+    ".sv", ".bs", ".ds", ".uc", ".ti", ".tb", NULL, ".tc0",
+    ".td", NULL, ".sv3264"
+  };
+
+  if ((19 >= aux->x_csect.x_smclas) &&
+      (NULL != names[aux->x_csect.x_smclas]))
+    {
+      return_value = bfd_make_section_anyway
+       (abfd, names[aux->x_csect.x_smclas]);
+    }
+  else
+    {
+      (*_bfd_error_handler)
+       (_("%s: symbol `%s' has unrecognized smclas %d"),
+        bfd_get_filename (abfd), symbol_name, aux->x_csect.x_smclas);
+      bfd_set_error (bfd_error_bad_value);
+    }
+
+  return return_value;
+}
+
+static boolean
+xcoff_is_lineno_count_overflow (abfd, value)
+    bfd *abfd ATTRIBUTE_UNUSED;
+       bfd_vma value;
+{
+  if (0xffff <= value)
+    return true;
+
+  return false;
+}
+
+static boolean
+xcoff_is_reloc_count_overflow (abfd, value)
+    bfd *abfd ATTRIBUTE_UNUSED;
+       bfd_vma value;
+{
+  if (0xffff <= value)
+    return true;
+
+  return false;
+}
+
+static bfd_vma
+xcoff_loader_symbol_offset (abfd, ldhdr)
+    bfd *abfd;
+    struct internal_ldhdr *ldhdr ATTRIBUTE_UNUSED;
+{
+  return bfd_xcoff_ldhdrsz(abfd);
+}
+
+static bfd_vma
+xcoff_loader_reloc_offset (abfd, ldhdr)
+    bfd *abfd;
+    struct internal_ldhdr *ldhdr;
+{
+  return bfd_xcoff_ldhdrsz(abfd) +
+    (ldhdr->l_nsyms * bfd_xcoff_ldsymsz(abfd));
+}
+
+
+static reloc_howto_type xcoff_dynamic_reloc =
+HOWTO (0,                      /* type */
+       0,                      /* rightshift */
+       2,                      /* size (0 = byte, 1 = short, 2 = long) */
+       32,                     /* bitsize */
+       false,                  /* pc_relative */
+       0,                      /* bitpos */
+       complain_overflow_bitfield, /* complain_on_overflow */
+       0,                      /* special_function */
+       "R_POS",               /* name */
+       true,                   /* partial_inplace */
+       0xffffffff,            /* src_mask */
+       0xffffffff,            /* dst_mask */
+       false);                /* pcrel_offset */
+
+/*  glink
+
+   The first word of global linkage code must be modified by filling in
+   the correct TOC offset.  */
+
+static unsigned long xcoff_glink_code[9] =
+  {
+    0x81820000,        /* lwz r12,0(r2) */
+    0x90410014,        /* stw r2,20(r1) */
+    0x800c0000,        /* lwz r0,0(r12) */
+    0x804c0004,        /* lwz r2,4(r12) */
+    0x7c0903a6,        /* mtctr r0 */
+    0x4e800420,        /* bctr */
+    0x00000000,        /* start of traceback table */
+    0x000c8000,        /* traceback table */
+    0x00000000,        /* traceback table */
+  };
+
+
+static const struct xcoff_backend_data_rec bfd_xcoff_backend_data =
+  {
+    { /* COFF backend, defined in libcoff.h.  */
+      _bfd_xcoff_swap_aux_in,           /* _bfd_coff_swap_aux_in */
+      _bfd_xcoff_swap_sym_in,           /* _bfd_coff_swap_sym_in */
+      coff_swap_lineno_in,              /* _bfd_coff_swap_lineno_in */
+      _bfd_xcoff_swap_aux_out,          /* _bfd_swap_aux_out */
+      _bfd_xcoff_swap_sym_out,          /* _bfd_swap_sym_out */
+      coff_swap_lineno_out,             /* _bfd_swap_lineno_out */
+      coff_swap_reloc_out,              /* _bfd_swap_reloc_out */
+      coff_swap_filehdr_out,            /* _bfd_swap_filehdr_out */
+      coff_swap_aouthdr_out,            /* _bfd_swap_aouthdr_out */
+      coff_swap_scnhdr_out,             /* _bfd_swap_scnhdr_out */
+      FILHSZ,                           /* _bfd_filhsz */
+      AOUTSZ,                           /* _bfd_aoutsz */
+      SCNHSZ,                           /* _bfd_scnhsz */
+      SYMESZ,                           /* _bfd_symesz */
+      AUXESZ,                           /* _bfd_auxesz */
+      RELSZ,                            /* _bfd_relsz */
+      LINESZ,                           /* _bfd_linesz */
+      FILNMLEN,                         /* _bfd_filnmlen */
+      true,                             /* _bfd_coff_long_filenames */
+      false,                            /* _bfd_coff_long_section_names */
+      (3),                              /* _bfd_coff_default_section_alignment_power */
+      false,                            /* _bfd_coff_force_symnames_in_strings */
+      2,                                /* _bfd_coff_debug_string_prefix_length */
+      coff_swap_filehdr_in,             /* _bfd_coff_swap_filehdr_in */
+      coff_swap_aouthdr_in,             /* _bfd_swap_aouthdr_in */
+      coff_swap_scnhdr_in,              /* _bfd_swap_scnhdr_in */
+      coff_swap_reloc_in,               /* _bfd_reloc_in */
+      coff_bad_format_hook,             /* _bfd_bad_format_hook */
+      coff_set_arch_mach_hook,          /* _bfd_set_arch_mach_hook */
+      coff_mkobject_hook,               /* _bfd_mkobject_hook */
+      styp_to_sec_flags,                /* _bfd_syp_to_sec_flags */
+      coff_set_alignment_hook,          /* _bfd_set_alignment_hook */
+      coff_slurp_symbol_table,          /* _bfd_coff_slurp_symbol_table */
+      symname_in_debug_hook,            /* _coff_symname_in_debug_hook */
+      coff_pointerize_aux_hook,         /* _bfd_coff_pointerize_aux_hook */
+      coff_print_aux,                   /* bfd_coff_print_aux */
+      dummy_reloc16_extra_cases,        /* _bfd_coff_reloc16_extra_cases */
+      dummy_reloc16_estimate,           /* _bfd_coff_reloc16_estimate */
+      NULL,                             /* bfd_coff_sym_is_global */
+      coff_compute_section_file_positions, /* _bfd_coff_compute_section_file_positions */
+      NULL,                             /* _bfd_coff_start_final_link */
+      xcoff_ppc_relocate_section,       /* _bfd_coff_relocate_section */
+      coff_rtype_to_howto,              /* _bfd_coff_rtype_to_howto */
+      NULL,                             /* _bfd_coff_addust_symndx */
+      _bfd_generic_link_add_one_symbol, /* _bfd_coff_add_one_symbol */
+      coff_link_output_has_begun,       /* _bfd_coff_link_output_has_begun */
+      coff_final_link_postscript        /* _bfd_coff_final_link_postscript */
+    },
+
+    0x01DF,                             /* magic number */
+    bfd_arch_rs6000,                    /* architecture */
+    bfd_mach_rs6k,                      /* machine */
+
+    /* Function pointers to xcoff specific swap routines.  */
+    xcoff_swap_ldhdr_in,                /* _xcoff_swap_ldhdr_in */
+    xcoff_swap_ldhdr_out,               /* _xcoff_swap_ldhdr_out */
+    xcoff_swap_ldsym_in,                /* _xcoff_swap_ldsym_in */
+    xcoff_swap_ldsym_out,               /* _xcoff_swap_ldsym_out */
+    xcoff_swap_ldrel_in,                /* _xcoff_swap_ldrel_in */
+    xcoff_swap_ldrel_out,               /* _xcoff_swap_ldrel_out */
+
+    /* Sizes.  */
+    LDHDRSZ,                            /* _xcoff_ldhdrsz */
+    LDSYMSZ,                            /* _xcoff_ldsymsz */
+    LDRELSZ,                            /* _xcoff_ldrelsz */
+    12,                                 /* _xcoff_function_descriptor_size */
+    SMALL_AOUTSZ,                       /* _xcoff_small_aout_header_size */
+
+  /* Versions. */
+    1,                                    /* _xcoff_ldhdr_version */
+
+    /* Xcoff vs xcoff64 putting symbol names.  */
+    _bfd_xcoff_put_symbol_name,          /* _xcoff_put_symbol_name */
+    _bfd_xcoff_put_ldsymbol_name,          /* _xcoff_put_ldsymbol_name */
+
+    & xcoff_dynamic_reloc,                  /* dynamic reloc howto */
+
+    xcoff_create_csect_from_smclas,      /* _xcoff_create_csect_from_smclas */
+
+    /* Lineno and reloc count overflow.  */
+    xcoff_is_lineno_count_overflow,
+    xcoff_is_reloc_count_overflow,
+
+    xcoff_loader_symbol_offset,
+    xcoff_loader_reloc_offset,
+
+    /* glink.  */
+    & xcoff_glink_code[0],
+    (36),           /* _xcoff_glink_size */
+};
+
+/* The transfer vector that leads the outside world to all of the above. */
+const bfd_target rs6000coff_vec =
+{
+  "aixcoff-rs6000",
+  bfd_target_xcoff_flavour,
   BFD_ENDIAN_BIG,              /* data byte order is big */
   BFD_ENDIAN_BIG,              /* header byte order is big */
 
   BFD_ENDIAN_BIG,              /* data byte order is big */
   BFD_ENDIAN_BIG,              /* header byte order is big */
 
@@ -1391,31 +3064,393 @@ const bfd_target
   '/',                         /* ar_pad_char */
   15,                          /* ar_max_namelen??? FIXMEmgo */
 
   '/',                         /* ar_pad_char */
   15,                          /* ar_max_namelen??? FIXMEmgo */
 
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-  {_bfd_dummy_target, coff_object_p,   /* bfd_check_format */
-     xcoff_archive_p, CORE_FILE_P},
-  {bfd_false, coff_mkobject,           /* bfd_set_format */
-     _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, coff_write_object_contents,      /* bfd_write_contents */
-     xcoff_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (coff),
-     BFD_JUMP_TABLE_ARCHIVE (xcoff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (_bfd_xcoff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_xcoff),
+                      /* data */
+  bfd_getb64,         /* bfd_getx64 */
+  bfd_getb_signed_64, /* bfd_getx_signed_64 */
+  bfd_putb64,         /* bfd_putx64 */
+  bfd_getb32,         /* bfd_getx32 */
+  bfd_getb_signed_32, /* bfd_getx_signed_32 */
+  bfd_putb32,         /* bfd_putx32 */
+  bfd_getb16,         /* bfd_getx16 */
+  bfd_getb_signed_16, /* bfd_getx_signed_16 */
+  bfd_putb16,         /* bfd_putx16 */
+
+                      /* hdrs */
+  bfd_getb64,         /* bfd_h_getx64 */
+  bfd_getb_signed_64, /* bfd_h_getx_signed_64 */
+  bfd_putb64,         /* bfd_h_putx64 */
+  bfd_getb32,         /* bfd_h_getx32 */
+  bfd_getb_signed_32, /* bfd_h_getx_signed_32 */
+  bfd_putb32,         /* bfd_h_putx32 */
+  bfd_getb16,         /* bfd_h_getx16 */
+  bfd_getb_signed_16, /* bfd_h_getx_signed_16 */
+  bfd_putb16,         /* bfd_h_putx16 */
+
+  { /* bfd_check_format */
+    _bfd_dummy_target,
+    coff_object_p,
+    _bfd_xcoff_archive_p,
+    CORE_FILE_P
+  },
+
+  { /* bfd_set_format */
+    bfd_false,
+    coff_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false
+  },
+
+  {/* bfd_write_contents */
+    bfd_false,
+    coff_write_object_contents,
+    _bfd_xcoff_write_archive_contents,
+    bfd_false
+  },
+
+  /* Generic */
+  bfd_true,                          /* _close_and_cleanup */
+  bfd_true,                          /* _bfd_free_cached_info */
+  coff_new_section_hook,             /* _new_section_hook */
+  _bfd_generic_get_section_contents, /* _bfd_get_section_contents */
+                                     /* _bfd_get_section_contents_in_window */
+  _bfd_generic_get_section_contents_in_window,
+
+  /* Copy */
+  _bfd_xcoff_copy_private_bfd_data, /* _bfd_copy_private_bfd */
+                                    /* _bfd_merge_private_bfd_data */
+  ((boolean (*) (bfd *, bfd *)) bfd_true),
+                                    /* _bfd_copy_pivate_section_data */
+  ((boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
+                                    /* _bfd_copy_private_symbol_data */
+  ((boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
+  ((boolean (*) (bfd *, flagword)) bfd_true), /* _bfd_set_private_flags */
+  ((boolean (*) (bfd *, void * )) bfd_true),  /* _bfd_print_private_bfd_data */
+
+  /* Core */
+  coff_core_file_failing_command,    /* _core_file_failing_command */
+  coff_core_file_failing_signal,     /* _core_file_failing_signal */
+                                          /* _core_file_matches_executable_p */
+  coff_core_file_matches_executable_p,
+
+  /* Archive */
+  _bfd_xcoff_slurp_armap,                  /* _slurp_armap */
+                                           /* XCOFF archives do not have
+                                             anything which corresponds to
+                                             an extended name table.  */
+  bfd_false,                               /* _slurp_extended_name_table */
+                                           /* _construct_extended_name_table */
+  ((boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
+  bfd_dont_truncate_arname,                /* _truncate_arname */
+  _bfd_xcoff_write_armap,                  /* _write_armap */
+  _bfd_xcoff_read_ar_hdr,                  /* _read_ar_hdr */
+  _bfd_xcoff_openr_next_archived_file,     /* _openr_next_archived_file */
+  _bfd_generic_get_elt_at_index,           /* _get_elt_at_index */
+  _bfd_xcoff_generic_stat_arch_elt,        /* _generic_dtat_arch_elt */
+                                           /* XCOFF archives do not have
+                                             a timestamp.  */
+  bfd_true,                                /* _update_armap_timestamp */
+
+  /* Symbols */
+  coff_get_symtab_upper_bound,             /* _get_symtab_upper_bound */
+  coff_get_symtab,                         /* _get_symtab */
+  coff_make_empty_symbol,                  /* _make_empty_symbol */
+  coff_print_symbol,                       /* _print_symbol */
+  coff_get_symbol_info,                    /* _get_symbol_info */
+  _bfd_xcoff_is_local_label_name,          /* _bfd_is_local_label_name */
+  coff_get_lineno,                         /* _get_lineno */
+  coff_find_nearest_line,                  /* _find_nearest_line */
+  coff_bfd_make_debug_symbol,              /* _bfd_make_debug_symbol */
+  _bfd_generic_read_minisymbols,           /* _read_minisymbols */
+  _bfd_generic_minisymbol_to_symbol,       /* _minsymbol_to_symbol */
+
+  /* Reloc */
+  coff_get_reloc_upper_bound,              /* _get_reloc_upper_bound */
+  coff_canonicalize_reloc,                 /* _cononicalize_reloc */
+  _bfd_xcoff_reloc_type_lookup,            /* _bfd_reloc_type_lookup */
+
+  /* Write */
+  coff_set_arch_mach,                      /* _set_arch_mach */
+  coff_set_section_contents,               /* _set_section_contents */
+
+  /* Link */
+  _bfd_xcoff_sizeof_headers,               /* _sizeof_headers */
+                                      /* _bfd_get_relocated_section_contents */
+  bfd_generic_get_relocated_section_contents,
+  bfd_generic_relax_section,               /* _bfd_relax_section */
+  _bfd_xcoff_bfd_link_hash_table_create,   /* _bfd_link_hash_table_create */
+  _bfd_xcoff_bfd_link_add_symbols,         /* _bfd_link_add_symbols */
+  _bfd_xcoff_bfd_final_link,               /* _bfd_filnal_link */
+  _bfd_generic_link_split_section,         /* _bfd_link_split_section */
+  bfd_generic_gc_sections,                 /* _bfd_gc_sections */
+  bfd_generic_merge_sections,              /* _bfd_merge_sections */
+
+  /* Dynamic */
+                                          /* _get_dynamic_symtab_upper_bound */
+  _bfd_xcoff_get_dynamic_symtab_upper_bound,
+  _bfd_xcoff_canonicalize_dynamic_symtab,  /* _cononicalize_dynamic_symtab */
+  _bfd_xcoff_get_dynamic_reloc_upper_bound,/* _get_dynamic_reloc_upper_bound */
+  _bfd_xcoff_canonicalize_dynamic_reloc,   /* _cononicalize_dynamic_reloc */
+
+  /* Opposite endian version, none exists */
+  NULL,
+
+  /* back end data */
+  (void *) &bfd_xcoff_backend_data,
+};
+
+/*
+ * xcoff-powermac target
+ * Old target.
+ * Only difference between this target and the rs6000 target is the
+ * the default architecture and machine type used in coffcode.h
+ *
+ * PowerPC Macs use the same magic numbers as RS/6000
+ * (because that's how they were bootstrapped originally),
+ * but they are always PowerPC architecture.
+ */
+static const struct xcoff_backend_data_rec bfd_pmac_xcoff_backend_data =
+{
+  { /* COFF backend, defined in libcoff.h */
+    _bfd_xcoff_swap_aux_in,           /* _bfd_coff_swap_aux_in */
+    _bfd_xcoff_swap_sym_in,           /* _bfd_coff_swap_sym_in */
+    coff_swap_lineno_in,              /* _bfd_coff_swap_lineno_in */
+    _bfd_xcoff_swap_aux_out,          /* _bfd_swap_aux_out */
+    _bfd_xcoff_swap_sym_out,          /* _bfd_swap_sym_out */
+    coff_swap_lineno_out,             /* _bfd_swap_lineno_out */
+    coff_swap_reloc_out,              /* _bfd_swap_reloc_out */
+    coff_swap_filehdr_out,            /* _bfd_swap_filehdr_out */
+    coff_swap_aouthdr_out,            /* _bfd_swap_aouthdr_out */
+    coff_swap_scnhdr_out,             /* _bfd_swap_scnhdr_out */
+    FILHSZ,                           /* _bfd_filhsz */
+    AOUTSZ,                           /* _bfd_aoutsz */
+    SCNHSZ,                           /* _bfd_scnhsz */
+    SYMESZ,                           /* _bfd_symesz */
+    AUXESZ,                           /* _bfd_auxesz */
+    RELSZ,                            /* _bfd_relsz */
+    LINESZ,                           /* _bfd_linesz */
+    FILNMLEN,                         /* _bfd_filnmlen */
+    true,                             /* _bfd_coff_long_filenames */
+    false,                            /* _bfd_coff_long_section_names */
+    (3),                        /* _bfd_coff_default_section_alignment_power */
+    false,                            /* _bfd_coff_force_symnames_in_strings */
+    2,                               /* _bfd_coff_debug_string_prefix_length */
+    coff_swap_filehdr_in,             /* _bfd_coff_swap_filehdr_in */
+    coff_swap_aouthdr_in,             /* _bfd_swap_aouthdr_in */
+    coff_swap_scnhdr_in,              /* _bfd_swap_scnhdr_in */
+    coff_swap_reloc_in,               /* _bfd_reloc_in */
+    coff_bad_format_hook,             /* _bfd_bad_format_hook */
+    coff_set_arch_mach_hook,          /* _bfd_set_arch_mach_hook */
+    coff_mkobject_hook,               /* _bfd_mkobject_hook */
+    styp_to_sec_flags,                /* _bfd_syp_to_sec_flags */
+    coff_set_alignment_hook,          /* _bfd_set_alignment_hook */
+    coff_slurp_symbol_table,          /* _bfd_coff_slurp_symbol_table */
+    symname_in_debug_hook,            /* _coff_symname_in_debug_hook */
+    coff_pointerize_aux_hook,         /* _bfd_coff_pointerize_aux_hook */
+    coff_print_aux,                   /* bfd_coff_print_aux */
+    dummy_reloc16_extra_cases,        /* _bfd_coff_reloc16_extra_cases */
+    dummy_reloc16_estimate,           /* _bfd_coff_reloc16_estimate */
+    NULL,                             /* bfd_coff_sym_is_global */
+                                 /* _bfd_coff_compute_section_file_positions */
+    coff_compute_section_file_positions,
+    NULL,                             /* _bfd_coff_start_final_link */
+    xcoff_ppc_relocate_section,       /* _bfd_coff_relocate_section */
+    coff_rtype_to_howto,              /* _bfd_coff_rtype_to_howto */
+    NULL,                             /* _bfd_coff_addust_symndx */
+    _bfd_generic_link_add_one_symbol, /* _bfd_coff_add_one_symbol */
+    coff_link_output_has_begun,       /* _bfd_coff_link_output_has_begun */
+    coff_final_link_postscript        /* _bfd_coff_final_link_postscript */
+  },
+
+  0x01DF,                             /* magic number */
+  bfd_arch_powerpc,                   /* architecture */
+  bfd_mach_ppc,                       /* machine */
+
+  /* function pointers to xcoff specific swap routines */
+  xcoff_swap_ldhdr_in,                /* _xcoff_swap_ldhdr_in */
+  xcoff_swap_ldhdr_out,               /* _xcoff_swap_ldhdr_out */
+  xcoff_swap_ldsym_in,                /* _xcoff_swap_ldsym_in */
+  xcoff_swap_ldsym_out,               /* _xcoff_swap_ldsym_out */
+  xcoff_swap_ldrel_in,                /* _xcoff_swap_ldrel_in */
+  xcoff_swap_ldrel_out,               /* _xcoff_swap_ldrel_out */
+
+  /* sizes */
+  LDHDRSZ,                            /* _xcoff_ldhdrsz */
+  LDSYMSZ,                            /* _xcoff_ldsymsz */
+  LDRELSZ,                            /* _xcoff_ldrelsz */
+  12,                                 /* _xcoff_function_descriptor_size */
+  SMALL_AOUTSZ,                       /* _xcoff_small_aout_header_size */
+
+  /* versions */
+  1,                                    /* _xcoff_ldhdr_version */
+
+  /* xcoff vs xcoff64 putting symbol names */
+  _bfd_xcoff_put_symbol_name,          /* _xcoff_put_symbol_name */
+  _bfd_xcoff_put_ldsymbol_name,          /* _xcoff_put_ldsymbol_name */
+
+  &xcoff_dynamic_reloc,                  /* dynamic reloc howto */
+
+  xcoff_create_csect_from_smclas,      /* _xcoff_create_csect_from_smclas */
+
+  /* lineno and reloc count overflow */
+  xcoff_is_lineno_count_overflow,
+  xcoff_is_reloc_count_overflow,
+
+  xcoff_loader_symbol_offset,
+  xcoff_loader_reloc_offset,
+
+  /* glink */
+  &xcoff_glink_code[0],
+  (36),           /* _xcoff_glink_size */
+
+};
+
+/* The transfer vector that leads the outside world to all of the above. */
+const bfd_target pmac_xcoff_vec =
+{
+  "xcoff-powermac",
+  bfd_target_xcoff_flavour,
+  BFD_ENDIAN_BIG,              /* data byte order is big */
+  BFD_ENDIAN_BIG,              /* header byte order is big */
+
+  (HAS_RELOC | EXEC_P |                /* object flags */
+   HAS_LINENO | HAS_DEBUG | DYNAMIC |
+   HAS_SYMS | HAS_LOCALS | WP_TEXT),
 
 
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
+  0,                           /* leading char */
+  '/',                         /* ar_pad_char */
+  15,                          /* ar_max_namelen??? FIXMEmgo */
+
+                      /* data */
+  bfd_getb64,         /* bfd_getx64 */
+  bfd_getb_signed_64, /* bfd_getx_signed_64 */
+  bfd_putb64,         /* bfd_putx64 */
+  bfd_getb32,         /* bfd_getx32 */
+  bfd_getb_signed_32, /* bfd_getx_signed_32 */
+  bfd_putb32,         /* bfd_putx32 */
+  bfd_getb16,         /* bfd_getx16 */
+  bfd_getb_signed_16, /* bfd_getx_signed_16 */
+  bfd_putb16,         /* bfd_putx16 */
+
+                      /* hdrs */
+  bfd_getb64,         /* bfd_h_getx64 */
+  bfd_getb_signed_64, /* bfd_h_getx_signed_64 */
+  bfd_putb64,         /* bfd_h_putx64 */
+  bfd_getb32,         /* bfd_h_getx32 */
+  bfd_getb_signed_32, /* bfd_h_getx_signed_32 */
+  bfd_putb32,         /* bfd_h_putx32 */
+  bfd_getb16,         /* bfd_h_getx16 */
+  bfd_getb_signed_16, /* bfd_h_getx_signed_16 */
+  bfd_putb16,         /* bfd_h_putx16 */
+
+  { /* bfd_check_format */
+    _bfd_dummy_target,
+    coff_object_p,
+    _bfd_xcoff_archive_p,
+    CORE_FILE_P
+  },
+
+  { /* bfd_set_format */
+    bfd_false,
+    coff_mkobject,
+    _bfd_generic_mkarchive,
+    bfd_false
+  },
+
+  {/* bfd_write_contents */
+    bfd_false,
+    coff_write_object_contents,
+    _bfd_xcoff_write_archive_contents,
+    bfd_false
+  },
+
+  /* Generic */
+  bfd_true,                          /* _close_and_cleanup */
+  bfd_true,                          /* _bfd_free_cached_info */
+  coff_new_section_hook,             /* _new_section_hook */
+  _bfd_generic_get_section_contents, /* _bfd_get_section_contents */
+                                     /* _bfd_get_section_contents_in_window */
+  _bfd_generic_get_section_contents_in_window,
+
+  /* Copy */
+  _bfd_xcoff_copy_private_bfd_data, /* _bfd_copy_private_bfd */
+                                    /* _bfd_merge_private_bfd_data */
+  ((boolean (*) (bfd *, bfd *)) bfd_true),
+                                    /* _bfd_copy_pivate_section_data */
+  ((boolean (*) (bfd *, asection *, bfd *, asection *)) bfd_true),
+                                    /* _bfd_copy_private_symbol_data */
+  ((boolean (*) (bfd *, asymbol *, bfd *, asymbol *)) bfd_true),
+  ((boolean (*) (bfd *, flagword)) bfd_true), /* _bfd_set_private_flags */
+  ((boolean (*) (bfd *, void * )) bfd_true),  /* _bfd_print_private_bfd_data */
+
+  /* Core */
+  coff_core_file_failing_command,    /* _core_file_failing_command */
+  coff_core_file_failing_signal,     /* _core_file_failing_signal */
+                                          /* _core_file_matches_executable_p */
+  coff_core_file_matches_executable_p,
+
+  /* Archive */
+  _bfd_xcoff_slurp_armap,                  /* _slurp_armap */
+                                           /* XCOFF archives do not have
+                                             anything which corresponds to
+                                             an extended name table.  */
+  bfd_false,                               /* _slurp_extended_name_table */
+                                           /* _construct_extended_name_table */
+  ((boolean (*) (bfd *, char **, bfd_size_type *, const char **)) bfd_false),
+  bfd_dont_truncate_arname,                /* _truncate_arname */
+  _bfd_xcoff_write_armap,                  /* _write_armap */
+  _bfd_xcoff_read_ar_hdr,                  /* _read_ar_hdr */
+  _bfd_xcoff_openr_next_archived_file,     /* _openr_next_archived_file */
+  _bfd_generic_get_elt_at_index,           /* _get_elt_at_index */
+  _bfd_xcoff_generic_stat_arch_elt,        /* _generic_dtat_arch_elt */
+                                           /* XCOFF archives do not have
+                                             a timestamp.  */
+  bfd_true,                                /* _update_armap_timestamp */
+
+  /* Symbols */
+  coff_get_symtab_upper_bound,             /* _get_symtab_upper_bound */
+  coff_get_symtab,                         /* _get_symtab */
+  coff_make_empty_symbol,                  /* _make_empty_symbol */
+  coff_print_symbol,                       /* _print_symbol */
+  coff_get_symbol_info,                    /* _get_symbol_info */
+  _bfd_xcoff_is_local_label_name,          /* _bfd_is_local_label_name */
+  coff_get_lineno,                         /* _get_lineno */
+  coff_find_nearest_line,                  /* _find_nearest_line */
+  coff_bfd_make_debug_symbol,              /* _bfd_make_debug_symbol */
+  _bfd_generic_read_minisymbols,           /* _read_minisymbols */
+  _bfd_generic_minisymbol_to_symbol,       /* _minsymbol_to_symbol */
+
+  /* Reloc */
+  coff_get_reloc_upper_bound,              /* _get_reloc_upper_bound */
+  coff_canonicalize_reloc,                 /* _cononicalize_reloc */
+  _bfd_xcoff_reloc_type_lookup,            /* _bfd_reloc_type_lookup */
+
+  /* Write */
+  coff_set_arch_mach,                      /* _set_arch_mach */
+  coff_set_section_contents,               /* _set_section_contents */
+
+  /* Link */
+  _bfd_xcoff_sizeof_headers,               /* _sizeof_headers */
+                                      /* _bfd_get_relocated_section_contents */
+  bfd_generic_get_relocated_section_contents,
+  bfd_generic_relax_section,               /* _bfd_relax_section */
+  _bfd_xcoff_bfd_link_hash_table_create,   /* _bfd_link_hash_table_create */
+  _bfd_xcoff_bfd_link_add_symbols,         /* _bfd_link_add_symbols */
+  _bfd_xcoff_bfd_final_link,               /* _bfd_filnal_link */
+  _bfd_generic_link_split_section,         /* _bfd_link_split_section */
+  bfd_generic_gc_sections,                 /* _bfd_gc_sections */
+  bfd_generic_merge_sections,               /* _bfd_merge_sections */
+
+  /* Dynamic */
+                                          /* _get_dynamic_symtab_upper_bound */
+  _bfd_xcoff_get_dynamic_symtab_upper_bound,
+  _bfd_xcoff_canonicalize_dynamic_symtab,  /* _cononicalize_dynamic_symtab */
+  _bfd_xcoff_get_dynamic_reloc_upper_bound,/* _get_dynamic_reloc_upper_bound */
+  _bfd_xcoff_canonicalize_dynamic_reloc,   /* _cononicalize_dynamic_reloc */
+
+  /* Opposite endian version, none exists */
   NULL,
   NULL,
-  
-  COFF_SWAP_TABLE
+
+  /* back end data */
+  (void *) &bfd_pmac_xcoff_backend_data,
 };
 };
This page took 0.071916 seconds and 4 git commands to generate.