bfd/
[deliverable/binutils-gdb.git] / bfd / xcofflink.c
index 5b1ddcca71b0f2effb8b348ba6bd14e7ab7dd17a..f02f66862f0ce0755f56b9a98fad0c590e39cd6b 100644 (file)
@@ -1,26 +1,27 @@
 /* POWER/PowerPC XCOFF linker support.
-   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-   Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
    Written by Ian Lance Taylor <ian@cygnus.com>, Cygnus Support.
 
-This file is part of BFD, the Binary File Descriptor library.
+   This file is part of BFD, the Binary File Descriptor library.
 
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-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.  */
+   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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 #include "coff/internal.h"
@@ -30,7 +31,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* This file holds the XCOFF linker code.  */
 
-#define STRING_SIZE_SIZE (4)
+#undef  STRING_SIZE_SIZE
+#define STRING_SIZE_SIZE 4
 
 /* We reuse the SEC_ROM flag as a mark flag for garbage collection.
    This flag will only be used on input sections.  */
@@ -65,7 +67,8 @@ struct xcoff_link_section_info
      index of the TOC symbol is not known when the reloc was handled,
      an entry is added to this linked list.  This is not an array,
      like rel_hashes, because this case is quite uncommon.  */
-  struct xcoff_toc_rel_hash {
+  struct xcoff_toc_rel_hash
+  {
     struct xcoff_toc_rel_hash *next;
     struct xcoff_link_hash_entry *h;
     struct internal_reloc *rel;
@@ -113,39 +116,8 @@ struct xcoff_final_link_info
   bfd_byte *external_relocs;
 };
 
-static struct bfd_hash_entry *xcoff_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean xcoff_get_section_contents PARAMS ((bfd *, asection *));
-static struct internal_reloc *xcoff_read_internal_relocs
-  PARAMS ((bfd *, asection *, boolean, bfd_byte *, boolean,
-          struct internal_reloc *));
-static boolean xcoff_link_add_object_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xcoff_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean xcoff_link_check_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean xcoff_link_check_dynamic_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static bfd_size_type xcoff_find_reloc
-  PARAMS ((struct internal_reloc *, bfd_size_type, bfd_vma));
-static boolean xcoff_link_add_symbols PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xcoff_link_add_dynamic_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xcoff_mark_symbol
-  PARAMS ((struct bfd_link_info *, struct xcoff_link_hash_entry *));
-static boolean xcoff_mark PARAMS ((struct bfd_link_info *, asection *));
-static void xcoff_sweep PARAMS ((struct bfd_link_info *));
-static boolean xcoff_build_ldsyms
-  PARAMS ((struct xcoff_link_hash_entry *, PTR));
-static boolean xcoff_link_input_bfd
-  PARAMS ((struct xcoff_final_link_info *, bfd *));
-static boolean xcoff_write_global_symbol
-  PARAMS ((struct xcoff_link_hash_entry *, PTR));
-static boolean xcoff_reloc_link_order
-  PARAMS ((bfd *, struct xcoff_final_link_info *, asection *,
-          struct bfd_link_order *));
-static int xcoff_sort_relocs PARAMS ((const PTR, const PTR));
+static bfd_boolean xcoff_mark (struct bfd_link_info *, asection *);
+
 \f
 
 /* Routines to read XCOFF dynamic information.  This don't really
@@ -154,41 +126,38 @@ static int xcoff_sort_relocs PARAMS ((const PTR, const PTR));
 
 /* Read the contents of a section.  */
 
-static boolean
-xcoff_get_section_contents (abfd, sec)
-     bfd *abfd;
-     asection *sec;
+static bfd_boolean
+xcoff_get_section_contents (bfd *abfd, asection *sec)
 {
-
   if (coff_section_data (abfd, sec) == NULL)
     {
       bfd_size_type amt = sizeof (struct coff_section_tdata);
+
       sec->used_by_bfd = bfd_zalloc (abfd, amt);
       if (sec->used_by_bfd == NULL)
-       return false;
+       return FALSE;
     }
 
   if (coff_section_data (abfd, sec)->contents == NULL)
     {
-      coff_section_data (abfd, sec)->contents = ((bfd_byte *)
-                                                bfd_malloc (sec->_raw_size));
-      if (coff_section_data (abfd, sec)->contents == NULL)
-       return false;
-
-      if (! bfd_get_section_contents (abfd, sec,
-                                     coff_section_data (abfd, sec)->contents,
-                                     (file_ptr) 0, sec->_raw_size))
-       return false;
+      bfd_byte *contents;
+
+      if (! bfd_malloc_and_get_section (abfd, sec, &contents))
+       {
+         if (contents != NULL)
+           free (contents);
+         return FALSE;
+       }
+      coff_section_data (abfd, sec)->contents = contents;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Get the size required to hold the dynamic symbols.  */
 
 long
-_bfd_xcoff_get_dynamic_symtab_upper_bound (abfd)
-     bfd *abfd;
+_bfd_xcoff_get_dynamic_symtab_upper_bound (bfd *abfd)
 {
   asection *lsec;
   bfd_byte *contents;
@@ -211,7 +180,7 @@ _bfd_xcoff_get_dynamic_symtab_upper_bound (abfd)
     return -1;
   contents = coff_section_data (abfd, lsec)->contents;
 
-  bfd_xcoff_swap_ldhdr_in (abfd, (PTR) contents, &ldhdr);
+  bfd_xcoff_swap_ldhdr_in (abfd, (void *) contents, &ldhdr);
 
   return (ldhdr.l_nsyms + 1) * sizeof (asymbol *);
 }
@@ -219,9 +188,7 @@ _bfd_xcoff_get_dynamic_symtab_upper_bound (abfd)
 /* Get the dynamic symbols.  */
 
 long
-_bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms)
-     bfd *abfd;
-     asymbol **psyms;
+_bfd_xcoff_canonicalize_dynamic_symtab (bfd *abfd, asymbol **psyms)
 {
   asection *lsec;
   bfd_byte *contents;
@@ -247,14 +214,13 @@ _bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms)
     return -1;
   contents = coff_section_data (abfd, lsec)->contents;
 
-  coff_section_data (abfd, lsec)->keep_contents = true;
+  coff_section_data (abfd, lsec)->keep_contents = TRUE;
 
   bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
 
   strings = (char *) contents + ldhdr.l_stoff;
 
-  symbuf = ((coff_symbol_type *)
-           bfd_zalloc (abfd, ldhdr.l_nsyms * sizeof (coff_symbol_type)));
+  symbuf = bfd_zalloc (abfd, ldhdr.l_nsyms * sizeof (* symbuf));
   if (symbuf == NULL)
     return -1;
 
@@ -292,11 +258,15 @@ _bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms)
 
       symbuf->symbol.flags = BSF_NO_FLAGS;
       if ((ldsym.l_smtype & L_EXPORT) != 0)
-       symbuf->symbol.flags |= BSF_GLOBAL;
+       {
+         if ((ldsym.l_smtype & L_WEAK) != 0)
+           symbuf->symbol.flags |= BSF_WEAK;
+         else
+           symbuf->symbol.flags |= BSF_GLOBAL;
+       }
 
       /* FIXME: We have no way to record the other information stored
-         with the loader symbol.  */
-
+        with the loader symbol.  */
       *psyms = (asymbol *) symbuf;
     }
 
@@ -308,8 +278,7 @@ _bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms)
 /* Get the size required to hold the dynamic relocs.  */
 
 long
-_bfd_xcoff_get_dynamic_reloc_upper_bound (abfd)
-     bfd *abfd;
+_bfd_xcoff_get_dynamic_reloc_upper_bound (bfd *abfd)
 {
   asection *lsec;
   bfd_byte *contents;
@@ -340,10 +309,9 @@ _bfd_xcoff_get_dynamic_reloc_upper_bound (abfd)
 /* Get the dynamic relocs.  */
 
 long
-_bfd_xcoff_canonicalize_dynamic_reloc (abfd, prelocs, syms)
-     bfd *abfd;
-     arelent **prelocs;
-     asymbol **syms;
+_bfd_xcoff_canonicalize_dynamic_reloc (bfd *abfd,
+                                      arelent **prelocs,
+                                      asymbol **syms)
 {
   asection *lsec;
   bfd_byte *contents;
@@ -370,7 +338,7 @@ _bfd_xcoff_canonicalize_dynamic_reloc (abfd, prelocs, syms)
 
   bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
 
-  relbuf = (arelent *) bfd_alloc (abfd, ldhdr.l_nreloc * sizeof (arelent));
+  relbuf = bfd_alloc (abfd, ldhdr.l_nreloc * sizeof (arelent));
   if (relbuf == NULL)
     return -1;
 
@@ -421,8 +389,8 @@ _bfd_xcoff_canonicalize_dynamic_reloc (abfd, prelocs, syms)
       relbuf->addend = 0;
 
       /* Most dynamic relocs have the same type.  FIXME: This is only
-         correct if ldrel.l_rtype == 0.  In other cases, we should use
-         a different howto.  */
+        correct if ldrel.l_rtype == 0.  In other cases, we should use
+        a different howto.  */
       relbuf->howto = bfd_xcoff_dynamic_reloc_howto(abfd);
 
       /* FIXME: We have no way to record the l_rsecnm field.  */
@@ -438,20 +406,18 @@ _bfd_xcoff_canonicalize_dynamic_reloc (abfd, prelocs, syms)
 /* Routine to create an entry in an XCOFF link hash table.  */
 
 static struct bfd_hash_entry *
-xcoff_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
+xcoff_link_hash_newfunc (struct bfd_hash_entry *entry,
+                        struct bfd_hash_table *table,
+                        const char *string)
 {
   struct xcoff_link_hash_entry *ret = (struct xcoff_link_hash_entry *) entry;
 
   /* Allocate the structure if it has not already been allocated by a
      subclass.  */
-  if (ret == (struct xcoff_link_hash_entry *) NULL)
-    ret = ((struct xcoff_link_hash_entry *)
-          bfd_hash_allocate (table, sizeof (struct xcoff_link_hash_entry)));
-  if (ret == (struct xcoff_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
+  if (ret == NULL)
+    ret = bfd_hash_allocate (table, sizeof (* ret));
+  if (ret == NULL)
+    return NULL;
 
   /* Call the allocation method of the superclass.  */
   ret = ((struct xcoff_link_hash_entry *)
@@ -476,19 +442,19 @@ xcoff_link_hash_newfunc (entry, table, string)
 /* Create a XCOFF link hash table.  */
 
 struct bfd_link_hash_table *
-_bfd_xcoff_bfd_link_hash_table_create (abfd)
-     bfd *abfd;
+_bfd_xcoff_bfd_link_hash_table_create (bfd *abfd)
 {
   struct xcoff_link_hash_table *ret;
-  bfd_size_type amt = sizeof (struct xcoff_link_hash_table);
+  bfd_size_type amt = sizeof (* ret);
 
-  ret = (struct xcoff_link_hash_table *) bfd_alloc (abfd, amt);
-  if (ret == (struct xcoff_link_hash_table *) NULL)
-    return (struct bfd_link_hash_table *) NULL;
-  if (! _bfd_link_hash_table_init (&ret->root, abfd, xcoff_link_hash_newfunc))
+  ret = bfd_malloc (amt);
+  if (ret == NULL)
+    return NULL;
+  if (!_bfd_link_hash_table_init (&ret->root, abfd, xcoff_link_hash_newfunc,
+                                 sizeof (struct xcoff_link_hash_entry)))
     {
-      bfd_release (abfd, ret);
-      return (struct bfd_link_hash_table *) NULL;
+      free (ret);
+      return NULL;
     }
 
   ret->debug_strtab = _bfd_xcoff_stringtab_init ();
@@ -501,34 +467,42 @@ _bfd_xcoff_bfd_link_hash_table_create (abfd)
   ret->descriptor_section = NULL;
   ret->imports = NULL;
   ret->file_align = 0;
-  ret->textro = false;
-  ret->gc = false;
+  ret->textro = FALSE;
+  ret->gc = FALSE;
   memset (ret->special_sections, 0, sizeof ret->special_sections);
 
   /* The linker will always generate a full a.out header.  We need to
      record that fact now, before the sizeof_headers routine could be
      called.  */
-  xcoff_data (abfd)->full_aouthdr = true;
+  xcoff_data (abfd)->full_aouthdr = TRUE;
 
   return &ret->root;
 }
 
+/* Free a XCOFF link hash table.  */
+
+void
+_bfd_xcoff_bfd_link_hash_table_free (struct bfd_link_hash_table *hash)
+{
+  struct xcoff_link_hash_table *ret = (struct xcoff_link_hash_table *) hash;
+
+  _bfd_stringtab_free (ret->debug_strtab);
+  bfd_hash_table_free (&ret->root.table);
+  free (ret);
+}
 \f
 /* Read internal relocs for an XCOFF csect.  This is a wrapper around
    _bfd_coff_read_internal_relocs which tries to take advantage of any
    relocs which may have been cached for the enclosing section.  */
 
 static struct internal_reloc *
-xcoff_read_internal_relocs (abfd, sec, cache, external_relocs,
-                           require_internal, internal_relocs)
-     bfd *abfd;
-     asection *sec;
-     boolean cache;
-     bfd_byte *external_relocs;
-     boolean require_internal;
-     struct internal_reloc *internal_relocs;
+xcoff_read_internal_relocs (bfd *abfd,
+                           asection *sec,
+                           bfd_boolean cache,
+                           bfd_byte *external_relocs,
+                           bfd_boolean require_internal,
+                           struct internal_reloc *internal_relocs)
 {
-
   if (coff_section_data (abfd, sec) != NULL
       && coff_section_data (abfd, sec)->relocs == NULL
       && xcoff_section_data (abfd, sec) != NULL)
@@ -543,9 +517,8 @@ xcoff_read_internal_relocs (abfd, sec, cache, external_relocs,
          && cache
          && enclosing->reloc_count > 0)
        {
-         if (_bfd_coff_read_internal_relocs (abfd, enclosing, true,
-                                             external_relocs, false,
-                                             (struct internal_reloc *) NULL)
+         if (_bfd_coff_read_internal_relocs (abfd, enclosing, TRUE,
+                                             external_relocs, FALSE, NULL)
              == NULL)
            return NULL;
        }
@@ -572,215 +545,94 @@ xcoff_read_internal_relocs (abfd, sec, cache, external_relocs,
                                         require_internal, internal_relocs);
 }
 \f
-/* Given an XCOFF BFD, add symbols to the global hash table as
-   appropriate.  */
-
-boolean
-_bfd_xcoff_bfd_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-
-  switch (bfd_get_format (abfd))
-    {
-    case bfd_object:
-      return xcoff_link_add_object_symbols (abfd, info);
-
-    case bfd_archive:
-      /* If the archive has a map, do the usual search.  We then need
-         to check the archive for stripped dynamic objects, because
-         they will not appear in the archive map even though they
-         should, perhaps, be included.  If the archive has no map, we
-         just consider each object file in turn, since that apparently
-         is what the AIX native linker does.  */
-      if (bfd_has_map (abfd))
-       {
-         if (! (_bfd_generic_link_add_archive_symbols
-                (abfd, info, xcoff_link_check_archive_element)))
-           return false;
-       }
-
-      {
-       bfd *member;
-
-       member = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
-       while (member != NULL)
-         {
-           if (bfd_check_format (member, bfd_object)
-               && (! bfd_has_map (abfd)
-                   || ((member->flags & DYNAMIC) != 0
-                       && (member->flags & HAS_SYMS) == 0)))
-             {
-               boolean needed;
-
-               if (! xcoff_link_check_archive_element (member, info, &needed))
-                 return false;
-               if (needed)
-                 member->archive_pass = -1;
-             }
-           member = bfd_openr_next_archived_file (abfd, member);
-         }
-      }
-
-      return true;
-
-    default:
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-}
-
-/* Add symbols from an XCOFF object file.  */
-
-static boolean
-xcoff_link_add_object_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-
-  if (! _bfd_coff_get_external_symbols (abfd))
-    return false;
-  if (! xcoff_link_add_symbols (abfd, info))
-    return false;
-  if (! info->keep_memory)
-    {
-      if (! _bfd_coff_free_symbols (abfd))
-       return false;
-    }
-  return true;
-}
-
-/* Check a single archive element to see if we need to include it in
-   the link.  *PNEEDED is set according to whether this element is
-   needed in the link or not.  This is called via
-   _bfd_generic_link_add_archive_symbols.  */
-
-static boolean
-xcoff_link_check_archive_element (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-
-  if (! _bfd_coff_get_external_symbols (abfd))
-    return false;
-
-  if (! xcoff_link_check_ar_symbols (abfd, info, pneeded))
-    return false;
+/* H is the bfd symbol associated with exported .loader symbol LDSYM.
+   Return true if LDSYM defines H.  */
 
-  if (*pneeded)
-    {
-      if (! xcoff_link_add_symbols (abfd, info))
-       return false;
-    }
-
-  if (! info->keep_memory || ! *pneeded)
-    {
-      if (! _bfd_coff_free_symbols (abfd))
-       return false;
-    }
-
-  return true;
-}
-
-/* Look through the symbols to see if this object file should be
-   included in the link.  */
-
-static boolean
-xcoff_link_check_ar_symbols (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
+static bfd_boolean
+xcoff_dynamic_definition_p (struct xcoff_link_hash_entry *h,
+                           struct internal_ldsym *ldsym)
 {
-  bfd_size_type symesz;
-  bfd_byte *esym;
-  bfd_byte *esym_end;
-
-  *pneeded = false;
-
-  if ((abfd->flags & DYNAMIC) != 0
-      && ! info->static_link
-      && info->hash->creator == abfd->xvec)
-    return xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded);
-
-  symesz = bfd_coff_symesz (abfd);
-  esym = (bfd_byte *) obj_coff_external_syms (abfd);
-  esym_end = esym + obj_raw_syment_count (abfd) * symesz;
-  while (esym < esym_end)
-    {
-      struct internal_syment sym;
-
-      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &sym);
-
-      if (sym.n_sclass == C_EXT && sym.n_scnum != N_UNDEF)
-       {
-         const char *name;
-         char buf[SYMNMLEN + 1];
-         struct bfd_link_hash_entry *h;
-
-         /* This symbol is externally visible, and is defined by this
-             object file.  */
-
-         name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
-
-         if (name == NULL)
-           return false;
-         h = bfd_link_hash_lookup (info->hash, name, false, false, true);
-
-         /* We are only interested in symbols that are currently
-            undefined.  If a symbol is currently known to be common,
-            XCOFF linkers do not bring in an object file which
-            defines it.  We also don't bring in symbols to satisfy
-            undefined references in shared objects.  */
-         if (h != (struct bfd_link_hash_entry *) NULL
-             && h->type == bfd_link_hash_undefined
-             && (info->hash->creator != abfd->xvec
-                 || (((struct xcoff_link_hash_entry *) h)->flags
-                     & XCOFF_DEF_DYNAMIC) == 0))
-           {
-             if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-               return false;
-             *pneeded = true;
-             return true;
-           }
-       }
+  /* If we didn't know about H before processing LDSYM, LDSYM
+     definitely defines H.  */
+  if (h->root.type == bfd_link_hash_new)
+    return TRUE;
+
+  /* If H is currently a weak dynamic symbol, and if LDSYM is a strong
+     dynamic symbol, LDSYM trumps the current definition of H.  */
+  if ((ldsym->l_smtype & L_WEAK) == 0
+      && (h->flags & XCOFF_DEF_DYNAMIC) != 0
+      && (h->flags & XCOFF_DEF_REGULAR) == 0
+      && (h->root.type == bfd_link_hash_defweak
+         || h->root.type == bfd_link_hash_undefweak))
+    return TRUE;
 
-      esym += (sym.n_numaux + 1) * symesz;
-    }
+  /* If H is currently undefined, LDSYM defines it.  */
+  if ((h->flags & XCOFF_DEF_DYNAMIC) == 0
+      && (h->root.type == bfd_link_hash_undefined
+         || h->root.type == bfd_link_hash_undefweak))
+    return TRUE;
 
-  /* We do not need this object file.  */
-  return true;
+  return FALSE;
 }
 
-/* Look through the loader symbols to see if this dynamic object
-   should be included in the link.  The native linker uses the loader
-   symbols, not the normal symbol table, so we do too.  */
+/* This function is used to add symbols from a dynamic object to the
+   global symbol table.  */
 
-static boolean
-xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
+static bfd_boolean
+xcoff_link_add_dynamic_symbols (bfd *abfd, struct bfd_link_info *info)
 {
   asection *lsec;
   bfd_byte *contents;
   struct internal_ldhdr ldhdr;
   const char *strings;
   bfd_byte *elsym, *elsymend;
+  struct xcoff_import_file *n;
+  const char *bname;
+  const char *mname;
+  const char *s;
+  unsigned int c;
+  struct xcoff_import_file **pp;
+
+  /* We can only handle a dynamic object if we are generating an XCOFF
+     output file.  */
+   if (info->output_bfd->xvec != abfd->xvec)
+    {
+      (*_bfd_error_handler)
+       (_("%s: XCOFF shared object when not producing XCOFF output"),
+        bfd_get_filename (abfd));
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
 
-  *pneeded = false;
+  /* The symbols we use from a dynamic object are not the symbols in
+     the normal symbol table, but, rather, the symbols in the export
+     table.  If there is a global symbol in a dynamic object which is
+     not in the export table, the loader will not be able to find it,
+     so we don't want to find it either.  Also, on AIX 4.1.3, shr.o in
+     libc.a has symbols in the export table which are not in the
+     symbol table.  */
 
+  /* Read in the .loader section.  FIXME: We should really use the
+     o_snloader field in the a.out header, rather than grabbing the
+     section by name.  */
   lsec = bfd_get_section_by_name (abfd, ".loader");
   if (lsec == NULL)
     {
-      /* There are no symbols, so don't try to include it.  */
-      return true;
+      (*_bfd_error_handler)
+       (_("%s: dynamic object with no .loader section"),
+        bfd_get_filename (abfd));
+      bfd_set_error (bfd_error_no_symbols);
+      return FALSE;
     }
 
   if (! xcoff_get_section_contents (abfd, lsec))
-    return false;
+    return FALSE;
   contents = coff_section_data (abfd, lsec)->contents;
 
+  /* Remove the sections from this object, so that they do not get
+     included in the link.  */
+  bfd_section_list_clear (abfd);
+
   bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
 
   strings = (char *) contents + ldhdr.l_stoff;
@@ -788,12 +640,13 @@ xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded)
   elsym = contents + bfd_xcoff_loader_symbol_offset(abfd, &ldhdr);
 
   elsymend = elsym + ldhdr.l_nsyms * bfd_xcoff_ldsymsz(abfd);
+
   for (; elsym < elsymend; elsym += bfd_xcoff_ldsymsz(abfd))
     {
       struct internal_ldsym ldsym;
       char nambuf[SYMNMLEN + 1];
       const char *name;
-      struct bfd_link_hash_entry *h;
+      struct xcoff_link_hash_entry *h;
 
       bfd_xcoff_swap_ldsym_in (abfd, elsym, &ldsym);
 
@@ -810,24 +663,96 @@ xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded)
          name = nambuf;
        }
 
-      h = bfd_link_hash_lookup (info->hash, name, false, false, true);
+      /* Normally we could not call xcoff_link_hash_lookup in an add
+        symbols routine, since we might not be using an XCOFF hash
+        table.  However, we verified above that we are using an XCOFF
+        hash table.  */
 
-      /* We are only interested in symbols that are currently
-         undefined.  At this point we know that we are using an XCOFF
-         hash table.  */
-      if (h != NULL
-         && h->type == bfd_link_hash_undefined
-         && (((struct xcoff_link_hash_entry *) h)->flags
-             & XCOFF_DEF_DYNAMIC) == 0)
+      h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, TRUE,
+                                 TRUE, TRUE);
+      if (h == NULL)
+       return FALSE;
+
+      if (!xcoff_dynamic_definition_p (h, &ldsym))
+       continue;
+
+      h->flags |= XCOFF_DEF_DYNAMIC;
+      h->smclas = ldsym.l_smclas;
+      if (h->smclas == XMC_XO)
        {
-         if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-           return false;
-         *pneeded = true;
-         return true;
+         /* This symbol has an absolute value.  */
+         if ((ldsym.l_smtype & L_WEAK) != 0)
+           h->root.type = bfd_link_hash_defweak;
+         else
+           h->root.type = bfd_link_hash_defined;
+         h->root.u.def.section = bfd_abs_section_ptr;
+         h->root.u.def.value = ldsym.l_value;
+       }
+      else
+       {
+         /* Otherwise, we don't bother to actually define the symbol,
+            since we don't have a section to put it in anyhow.
+            We assume instead that an undefined XCOFF_DEF_DYNAMIC symbol
+            should be imported from the symbol's undef.abfd.  */
+         if ((ldsym.l_smtype & L_WEAK) != 0)
+           h->root.type = bfd_link_hash_undefweak;
+         else
+           h->root.type = bfd_link_hash_undefined;
+         h->root.u.undef.abfd = abfd;
        }
-    }
 
-  /* We do not need this shared object.  */
+      /* If this symbol defines a function descriptor, then it
+        implicitly defines the function code as well.  */
+      if (h->smclas == XMC_DS
+         || (h->smclas == XMC_XO && name[0] != '.'))
+       h->flags |= XCOFF_DESCRIPTOR;
+      if ((h->flags & XCOFF_DESCRIPTOR) != 0)
+       {
+         struct xcoff_link_hash_entry *hds;
+
+         hds = h->descriptor;
+         if (hds == NULL)
+           {
+             char *dsnm;
+
+             dsnm = bfd_malloc ((bfd_size_type) strlen (name) + 2);
+             if (dsnm == NULL)
+               return FALSE;
+             dsnm[0] = '.';
+             strcpy (dsnm + 1, name);
+             hds = xcoff_link_hash_lookup (xcoff_hash_table (info), dsnm,
+                                           TRUE, TRUE, TRUE);
+             free (dsnm);
+             if (hds == NULL)
+               return FALSE;
+
+             hds->descriptor = h;
+             h->descriptor = hds;
+           }
+
+         if (xcoff_dynamic_definition_p (hds, &ldsym))
+           {
+             hds->root.type = h->root.type;
+             hds->flags |= XCOFF_DEF_DYNAMIC;
+             if (h->smclas == XMC_XO)
+               {
+                 /* An absolute symbol appears to actually define code, not a
+                    function descriptor.  This is how some math functions are
+                    implemented on AIX 4.1.  */
+                 hds->smclas = XMC_XO;
+                 hds->root.u.def.section = bfd_abs_section_ptr;
+                 hds->root.u.def.value = ldsym.l_value;
+               }
+             else
+               {
+                 hds->smclas = XMC_PR;
+                 hds->root.u.undef.abfd = abfd;
+                 /* We do not want to add this to the undefined
+                    symbol list.  */
+               }
+           }
+       }
+    }
 
   if (contents != NULL && ! coff_section_data (abfd, lsec)->keep_contents)
     {
@@ -835,73 +760,56 @@ xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded)
       coff_section_data (abfd, lsec)->contents = NULL;
     }
 
-  return true;
-}
-
-/* Returns the index of reloc in RELOCS with the least address greater
-   than or equal to ADDRESS.  The relocs are sorted by address.  */
-
-static bfd_size_type
-xcoff_find_reloc (relocs, count, address)
-     struct internal_reloc *relocs;
-     bfd_size_type count;
-     bfd_vma address;
-{
-  bfd_size_type min, max, this;
+  /* Record this file in the import files.  */
+  n = bfd_alloc (abfd, (bfd_size_type) sizeof (struct xcoff_import_file));
+  if (n == NULL)
+    return FALSE;
+  n->next = NULL;
 
-  if (count < 2)
+  /* For some reason, the path entry in the import file list for a
+     shared object appears to always be empty.  The file name is the
+     base name.  */
+  n->path = "";
+  if (abfd->my_archive == NULL)
     {
-      if (count == 1 && relocs[0].r_vaddr < address)
-       return 1;
-      else
-       return 0;
+      bname = bfd_get_filename (abfd);
+      mname = "";
     }
-
-  min = 0;
-  max = count;
-
-  /* Do a binary search over (min,max].  */
-  while (min + 1 < max)
+  else
     {
-      bfd_vma raddr;
-
-      this = (max + min) / 2;
-      raddr = relocs[this].r_vaddr;
-      if (raddr > address)
-       max = this;
-      else if (raddr < address)
-       min = this;
-      else
-       {
-         min = this;
-         break;
-       }
+      bname = bfd_get_filename (abfd->my_archive);
+      mname = bfd_get_filename (abfd);
     }
+  s = strrchr (bname, '/');
+  if (s != NULL)
+    bname = s + 1;
+  n->file = bname;
+  n->member = mname;
 
-  if (relocs[min].r_vaddr < address)
-    return min + 1;
+  /* We start c at 1 because the first import file number is reserved
+     for LIBPATH.  */
+  for (pp = &xcoff_hash_table (info)->imports, c = 1;
+       *pp != NULL;
+       pp = &(*pp)->next, ++c)
+    ;
+  *pp = n;
 
-  while (min > 0
-        && relocs[min - 1].r_vaddr == address)
-    --min;
+  xcoff_data (abfd)->import_file_id = c;
 
-  return min;
+  return TRUE;
 }
 
-
 /* xcoff_link_create_extra_sections
 
    Takes care of creating the .loader, .gl, .ds, .debug and sections.  */
 
-static boolean
-xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info)
+static bfd_boolean
+xcoff_link_create_extra_sections (bfd * abfd, struct bfd_link_info *info)
 {
+  bfd_boolean return_value = FALSE;
 
-  boolean return_value = false;
-
-  if (info->hash->creator == abfd->xvec)
+  if (info->output_bfd->xvec == abfd->xvec)
     {
-
       /* We need to build a .loader section, so we do it here.  This
         won't work if we're producing an XCOFF output file with no
         XCOFF input files.  FIXME.  */
@@ -909,30 +817,27 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info)
       if (xcoff_hash_table (info)->loader_section == NULL)
        {
          asection *lsec;
+         flagword flags = SEC_HAS_CONTENTS | SEC_IN_MEMORY;
 
-         lsec = bfd_make_section_anyway (abfd, ".loader");
+         lsec = bfd_make_section_anyway_with_flags (abfd, ".loader", flags);
          if (lsec == NULL)
-           {
-             goto end_return;
-           }
+           goto end_return;
+
          xcoff_hash_table (info)->loader_section = lsec;
-         lsec->flags |= SEC_HAS_CONTENTS | SEC_IN_MEMORY;
        }
 
       /* Likewise for the linkage section.  */
       if (xcoff_hash_table (info)->linkage_section == NULL)
        {
          asection *lsec;
+         flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+                           | SEC_IN_MEMORY);
 
-         lsec = bfd_make_section_anyway (abfd, ".gl");
+         lsec = bfd_make_section_anyway_with_flags (abfd, ".gl", flags);
          if (lsec == NULL)
-           {
-             goto end_return;
-           }
+           goto end_return;
 
          xcoff_hash_table (info)->linkage_section = lsec;
-         lsec->flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-                         | SEC_IN_MEMORY);
          lsec->alignment_power = 2;
        }
 
@@ -940,16 +845,14 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info)
       if (xcoff_hash_table (info)->toc_section == NULL)
        {
          asection *tsec;
+         flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+                           | SEC_IN_MEMORY);
 
-         tsec = bfd_make_section_anyway (abfd, ".tc");
+         tsec = bfd_make_section_anyway_with_flags (abfd, ".tc", flags);
          if (tsec == NULL)
-           {
-             goto end_return;
-           }
+           goto end_return;
 
          xcoff_hash_table (info)->toc_section = tsec;
-         tsec->flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-                         | SEC_IN_MEMORY);
          tsec->alignment_power = 2;
        }
 
@@ -957,16 +860,14 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info)
       if (xcoff_hash_table (info)->descriptor_section == NULL)
        {
          asection *dsec;
+         flagword flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
+                           | SEC_IN_MEMORY);
 
-         dsec = bfd_make_section_anyway (abfd, ".ds");
+         dsec = bfd_make_section_anyway_with_flags (abfd, ".ds", flags);
          if (dsec == NULL)
-           {
-             goto end_return;
-           }
+           goto end_return;
 
          xcoff_hash_table (info)->descriptor_section = dsec;
-         dsec->flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-                         | SEC_IN_MEMORY);
          dsec->alignment_power = 2;
        }
 
@@ -975,24 +876,72 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info)
          && info->strip != strip_all)
        {
          asection *dsec;
+         flagword flags = SEC_HAS_CONTENTS | SEC_IN_MEMORY;
 
-         dsec = bfd_make_section_anyway (abfd, ".debug");
+         dsec = bfd_make_section_anyway_with_flags (abfd, ".debug", flags);
          if (dsec == NULL)
-           {
-             goto end_return;
-           }
+           goto end_return;
+
          xcoff_hash_table (info)->debug_section = dsec;
-         dsec->flags |= SEC_HAS_CONTENTS | SEC_IN_MEMORY;
        }
     }
 
-  return_value = true;
+  return_value = TRUE;
 
  end_return:
 
   return return_value;
 }
 
+/* Returns the index of reloc in RELOCS with the least address greater
+   than or equal to ADDRESS.  The relocs are sorted by address.  */
+
+static bfd_size_type
+xcoff_find_reloc (struct internal_reloc *relocs,
+                 bfd_size_type count,
+                 bfd_vma address)
+{
+  bfd_size_type min, max, this;
+
+  if (count < 2)
+    {
+      if (count == 1 && relocs[0].r_vaddr < address)
+       return 1;
+      else
+       return 0;
+    }
+
+  min = 0;
+  max = count;
+
+  /* Do a binary search over (min,max].  */
+  while (min + 1 < max)
+    {
+      bfd_vma raddr;
+
+      this = (max + min) / 2;
+      raddr = relocs[this].r_vaddr;
+      if (raddr > address)
+       max = this;
+      else if (raddr < address)
+       min = this;
+      else
+       {
+         min = this;
+         break;
+       }
+    }
+
+  if (relocs[min].r_vaddr < address)
+    return min + 1;
+
+  while (min > 0
+        && relocs[min - 1].r_vaddr == address)
+    --min;
+
+  return min;
+}
+
 /* Add all the symbols from an object file to the hash table.
 
    XCOFF is a weird format.  A normal XCOFF .o files will have three
@@ -1011,21 +960,20 @@ xcoff_link_create_extra_sections(bfd * abfd, struct bfd_link_info *info)
    relocation entries carefully, since the only way to tell which
    csect they belong to is to examine the address.  */
 
-static boolean
-xcoff_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
+static bfd_boolean
+xcoff_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
 {
   unsigned int n_tmask;
   unsigned int n_btshft;
-  boolean default_copy;
+  bfd_boolean default_copy;
   bfd_size_type symcount;
   struct xcoff_link_hash_entry **sym_hash;
   asection **csect_cache;
+  unsigned int *lineno_counts;
   bfd_size_type linesz;
   asection *o;
   asection *last_real;
-  boolean keep_syms;
+  bfd_boolean keep_syms;
   asection *csect;
   unsigned int csect_index;
   asection *first_csect;
@@ -1046,16 +994,16 @@ xcoff_link_add_symbols (abfd, info)
       && ! info->static_link)
     {
       if (! xcoff_link_add_dynamic_symbols (abfd, info))
-       return false;
+       return FALSE;
     }
 
-  /* create the loader, toc, gl, ds and debug sections, if needed */
-  if (false == xcoff_link_create_extra_sections(abfd, info))
+  /* Create the loader, toc, gl, ds and debug sections, if needed.  */
+  if (! xcoff_link_create_extra_sections (abfd, info))
     goto error_return;
 
   if ((abfd->flags & DYNAMIC) != 0
       && ! info->static_link)
-    return true;
+    return TRUE;
 
   n_tmask = coff_data (abfd)->local_n_tmask;
   n_btshft = coff_data (abfd)->local_n_btshft;
@@ -1065,30 +1013,37 @@ xcoff_link_add_symbols (abfd, info)
 #define N_BTSHFT n_btshft
 
   if (info->keep_memory)
-    default_copy = false;
+    default_copy = FALSE;
   else
-    default_copy = true;
+    default_copy = TRUE;
 
   symcount = obj_raw_syment_count (abfd);
 
   /* We keep a list of the linker hash table entries that correspond
      to each external symbol.  */
   amt = symcount * sizeof (struct xcoff_link_hash_entry *);
-  sym_hash = (struct xcoff_link_hash_entry **) bfd_alloc (abfd, amt);
+  sym_hash = bfd_zalloc (abfd, amt);
   if (sym_hash == NULL && symcount != 0)
     goto error_return;
   coff_data (abfd)->sym_hashes = (struct coff_link_hash_entry **) sym_hash;
-  memset (sym_hash, 0, (size_t) amt);
 
   /* Because of the weird stuff we are doing with XCOFF csects, we can
      not easily determine which section a symbol is in, so we store
      the information in the tdata for the input file.  */
   amt = symcount * sizeof (asection *);
-  csect_cache = (asection **) bfd_alloc (abfd, amt);
+  csect_cache = bfd_zalloc (abfd, amt);
   if (csect_cache == NULL && symcount != 0)
     goto error_return;
   xcoff_data (abfd)->csects = csect_cache;
-  memset (csect_cache, 0, (size_t) amt);
+
+  /* We garbage-collect line-number information on a symbol-by-symbol
+     basis, so we need to have quick access to the number of entries
+     per symbol.  */
+  amt = symcount * sizeof (unsigned int);
+  lineno_counts = bfd_zalloc (abfd, amt);
+  if (lineno_counts == NULL && symcount != 0)
+    goto error_return;
+  xcoff_data (abfd)->lineno_counts = lineno_counts;
 
   /* While splitting sections into csects, we need to assign the
      relocs correctly.  The relocs and the csects must both be in
@@ -1097,53 +1052,46 @@ xcoff_link_add_symbols (abfd, info)
      into reloc_info using the section target_index.  */
   amt = abfd->section_count + 1;
   amt *= sizeof (struct reloc_info_struct);
-  reloc_info = (struct reloc_info_struct *) bfd_malloc (amt);
+  reloc_info = bfd_zmalloc (amt);
   if (reloc_info == NULL)
     goto error_return;
-  memset ((PTR) reloc_info, 0, (size_t) amt);
 
   /* Read in the relocs and line numbers for each section.  */
   linesz = bfd_coff_linesz (abfd);
   last_real = NULL;
   for (o = abfd->sections; o != NULL; o = o->next)
     {
-
       last_real = o;
+
       if ((o->flags & SEC_RELOC) != 0)
        {
-
          reloc_info[o->target_index].relocs =
-           xcoff_read_internal_relocs (abfd, o, true, (bfd_byte *) NULL,
-                                       false, (struct internal_reloc *) NULL);
+           xcoff_read_internal_relocs (abfd, o, TRUE, NULL, FALSE, NULL);
          amt = o->reloc_count;
          amt *= sizeof (asection *);
-         reloc_info[o->target_index].csects = (asection **) bfd_malloc (amt);
+         reloc_info[o->target_index].csects = bfd_zmalloc (amt);
          if (reloc_info[o->target_index].csects == NULL)
            goto error_return;
-         memset (reloc_info[o->target_index].csects, 0, (size_t) amt);
-
        }
 
       if ((info->strip == strip_none || info->strip == strip_some)
          && o->lineno_count > 0)
        {
-
          bfd_byte *linenos;
 
          amt = linesz * o->lineno_count;
-         linenos = (bfd_byte *) bfd_malloc (amt);
+         linenos = bfd_malloc (amt);
          if (linenos == NULL)
            goto error_return;
          reloc_info[o->target_index].linenos = linenos;
          if (bfd_seek (abfd, o->line_filepos, SEEK_SET) != 0
              || bfd_bread (linenos, amt, abfd) != amt)
            goto error_return;
-
        }
     }
 
   /* Don't let the linker relocation routines discard the symbols.  */
-  obj_coff_keep_syms (abfd) = true;
+  obj_coff_keep_syms (abfd) = TRUE;
 
   csect = NULL;
   csect_index = 0;
@@ -1161,33 +1109,23 @@ xcoff_link_add_symbols (abfd, info)
       const char *name;
       char buf[SYMNMLEN + 1];
       int smtyp;
-      flagword flags;
       asection *section;
       bfd_vma value;
       struct xcoff_link_hash_entry *set_toc;
 
-      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &sym);
+      bfd_coff_swap_sym_in (abfd, (void *) esym, (void *) &sym);
 
       /* In this pass we are only interested in symbols with csect
         information.  */
-      if (sym.n_sclass != C_EXT && sym.n_sclass != C_HIDEXT)
+      if (!CSECT_SYM_P (sym.n_sclass))
        {
-
          /* Set csect_cache,
             Normally csect is a .pr, .rw  etc. created in the loop
             If C_FILE or first time, handle special
 
-            Advance esym, sym_hash, csect_hash ptr's
-            Keep track of the last_symndx for the current file.  */
-         if (sym.n_sclass == C_FILE && csect != NULL)
-           {
-             xcoff_section_data (abfd, csect)->last_symndx =
-               ((esym
-                 - (bfd_byte *) obj_coff_external_syms (abfd))
-                / symesz);
-             csect = NULL;
-           }
-
+            Advance esym, sym_hash, csect_hash ptrs.  */
+         if (sym.n_sclass == C_FILE)
+           csect = NULL;
          if (csect != NULL)
            *csect_cache = csect;
          else if (first_csect == NULL || sym.n_sclass == C_FILE)
@@ -1197,6 +1135,7 @@ xcoff_link_add_symbols (abfd, info)
          esym += (sym.n_numaux + 1) * symesz;
          sym_hash += sym.n_numaux + 1;
          csect_cache += sym.n_numaux + 1;
+         lineno_counts += sym.n_numaux + 1;
 
          continue;
        }
@@ -1207,22 +1146,21 @@ xcoff_link_add_symbols (abfd, info)
        goto error_return;
 
       /* If this symbol has line number information attached to it,
-         and we're not stripping it, count the number of entries and
-         add them to the count for this csect.  In the final link pass
-         we are going to attach line number information by symbol,
-         rather than by section, in order to more easily handle
-         garbage collection.  */
+        and we're not stripping it, count the number of entries and
+        add them to the count for this csect.  In the final link pass
+        we are going to attach line number information by symbol,
+        rather than by section, in order to more easily handle
+        garbage collection.  */
       if ((info->strip == strip_none || info->strip == strip_some)
          && sym.n_numaux > 1
          && csect != NULL
          && ISFCN (sym.n_type))
        {
-
          union internal_auxent auxlin;
 
-         bfd_coff_swap_aux_in (abfd, (PTR) (esym + symesz),
+         bfd_coff_swap_aux_in (abfd, (void *) (esym + symesz),
                                sym.n_type, sym.n_sclass,
-                               0, sym.n_numaux, (PTR) &auxlin);
+                               0, sym.n_numaux, (void *) &auxlin);
 
          if (auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr != 0)
            {
@@ -1233,14 +1171,14 @@ xcoff_link_add_symbols (abfd, info)
              if (enclosing == NULL)
                {
                  (*_bfd_error_handler)
-                   (_("%s: `%s' has line numbers but no enclosing section"),
-                    bfd_archive_filename (abfd), name);
+                   (_("%B: `%s' has line numbers but no enclosing section"),
+                    abfd, name);
                  bfd_set_error (bfd_error_bad_value);
                  goto error_return;
                }
              linoff = (auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr
                        - enclosing->line_filepos);
-             /* explict cast to bfd_signed_vma for compiler */
+             /* Explicit cast to bfd_signed_vma for compiler.  */
              if (linoff < (bfd_signed_vma) (enclosing->lineno_count * linesz))
                {
                  struct internal_lineno lin;
@@ -1248,7 +1186,7 @@ xcoff_link_add_symbols (abfd, info)
 
                  linpstart = (reloc_info[enclosing->target_index].linenos
                               + linoff);
-                 bfd_coff_swap_lineno_in (abfd, (PTR) linpstart, (PTR) &lin);
+                 bfd_coff_swap_lineno_in (abfd, (void *) linpstart, (void *) &lin);
                  if (lin.l_lnno == 0
                      && ((bfd_size_type) lin.l_addr.l_symndx
                          == ((esym
@@ -1263,12 +1201,12 @@ xcoff_link_add_symbols (abfd, info)
                           linp < linpend;
                           linp += linesz)
                        {
-                         bfd_coff_swap_lineno_in (abfd, (PTR) linp,
-                                                  (PTR) &lin);
+                         bfd_coff_swap_lineno_in (abfd, (void *) linp,
+                                                  (void *) &lin);
                          if (lin.l_lnno == 0)
                            break;
                        }
-                     csect->lineno_count += (linp - linpstart) / linesz;
+                     *lineno_counts = (linp - linpstart) / linesz;
                      /* The setting of line_filepos will only be
                         useful if all the line number entries for a
                         csect are contiguous; this only matters for
@@ -1282,25 +1220,23 @@ xcoff_link_add_symbols (abfd, info)
        }
 
       /* Pick up the csect auxiliary information.  */
-
       if (sym.n_numaux == 0)
        {
          (*_bfd_error_handler)
-           (_("%s: class %d symbol `%s' has no aux entries"),
-            bfd_archive_filename (abfd), sym.n_sclass, name);
+           (_("%B: class %d symbol `%s' has no aux entries"),
+            abfd, sym.n_sclass, name);
          bfd_set_error (bfd_error_bad_value);
          goto error_return;
        }
 
       bfd_coff_swap_aux_in (abfd,
-                           (PTR) (esym + symesz * sym.n_numaux),
+                           (void *) (esym + symesz * sym.n_numaux),
                            sym.n_type, sym.n_sclass,
                            sym.n_numaux - 1, sym.n_numaux,
-                           (PTR) &aux);
+                           (void *) &aux);
 
       smtyp = SMTYP_SMTYP (aux.x_csect.x_smtyp);
 
-      flags = BSF_GLOBAL;
       section = NULL;
       value = 0;
       set_toc = NULL;
@@ -1309,8 +1245,8 @@ xcoff_link_add_symbols (abfd, info)
        {
        default:
          (*_bfd_error_handler)
-           (_("%s: symbol `%s' has unrecognized csect type %d"),
-            bfd_archive_filename (abfd), name, smtyp);
+           (_("%B: symbol `%s' has unrecognized csect type %d"),
+            abfd, name, smtyp);
          bfd_set_error (bfd_error_bad_value);
          goto error_return;
 
@@ -1321,15 +1257,15 @@ xcoff_link_add_symbols (abfd, info)
              || aux.x_csect.x_scnlen.l != 0)
            {
              (*_bfd_error_handler)
-               (_("%s: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"),
-                bfd_archive_filename (abfd), name, sym.n_sclass, sym.n_scnum,
+               (_("%B: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"),
+                abfd, name, sym.n_sclass, sym.n_scnum,
                 aux.x_csect.x_scnlen.l);
              bfd_set_error (bfd_error_bad_value);
              goto error_return;
            }
 
          /* An XMC_XO external reference is actually a reference to
-             an absolute location.  */
+            an absolute location.  */
          if (aux.x_csect.x_smclas != XMC_XO)
            section = bfd_und_section_ptr;
          else
@@ -1340,13 +1276,6 @@ xcoff_link_add_symbols (abfd, info)
          break;
 
        case XTY_SD:
-         /* This is a csect definition.  */
-         if (csect != NULL)
-           {
-             xcoff_section_data (abfd, csect)->last_symndx =
-               ((esym - (bfd_byte *) obj_coff_external_syms (abfd)) / symesz);
-           }
-
          csect = NULL;
          csect_index = -(unsigned) 1;
 
@@ -1357,9 +1286,8 @@ xcoff_link_add_symbols (abfd, info)
                  || aux.x_csect.x_scnlen.l != 0)
                {
                  (*_bfd_error_handler)
-                   (_("%s: XMC_TC0 symbol `%s' is class %d scnlen %d"),
-                    bfd_archive_filename (abfd), name, sym.n_sclass,
-                    aux.x_csect.x_scnlen.l);
+                   (_("%B: XMC_TC0 symbol `%s' is class %d scnlen %d"),
+                    abfd, name, sym.n_sclass, aux.x_csect.x_scnlen.l);
                  bfd_set_error (bfd_error_bad_value);
                  goto error_return;
                }
@@ -1382,7 +1310,7 @@ xcoff_link_add_symbols (abfd, info)
             place.  */
          if (aux.x_csect.x_smclas == XMC_TC
              && sym.n_sclass == C_HIDEXT
-             && info->hash->creator == abfd->xvec
+             && info->output_bfd->xvec == abfd->xvec
              && ((bfd_xcoff_is_xcoff32 (abfd)
                   && aux.x_csect.x_scnlen.l == 4)
                  || (bfd_xcoff_is_xcoff64 (abfd)
@@ -1418,17 +1346,16 @@ xcoff_link_add_symbols (abfd, info)
 
                  erelsym = ((bfd_byte *) obj_coff_external_syms (abfd)
                             + rel->r_symndx * symesz);
-                 bfd_coff_swap_sym_in (abfd, (PTR) erelsym, (PTR) &relsym);
-                 if (relsym.n_sclass == C_EXT)
+                 bfd_coff_swap_sym_in (abfd, (void *) erelsym, (void *) &relsym);
+                 if (EXTERN_SYM_P (relsym.n_sclass))
                    {
                      const char *relname;
                      char relbuf[SYMNMLEN + 1];
-                     boolean copy;
+                     bfd_boolean copy;
                      struct xcoff_link_hash_entry *h;
 
                      /* At this point we know that the TOC entry is
                         for an externally visible symbol.  */
-
                      relname = _bfd_coff_internal_syment_name (abfd, &relsym,
                                                                relbuf);
                      if (relname == NULL)
@@ -1439,15 +1366,14 @@ xcoff_link_add_symbols (abfd, info)
                         the normal case, but not common cases like
                         SYM.P4 which gcc generates to store SYM + 4
                         in the TOC.  FIXME.  */
-
                      if (strcmp (name, relname) == 0)
                        {
                          copy = (! info->keep_memory
                                  || relsym._n._n_n._n_zeroes != 0
                                  || relsym._n._n_n._n_offset == 0);
                          h = xcoff_link_hash_lookup (xcoff_hash_table (info),
-                                                     relname, true, copy,
-                                                     false);
+                                                     relname, TRUE, copy,
+                                                     FALSE);
                          if (h == NULL)
                            goto error_return;
 
@@ -1478,13 +1404,12 @@ xcoff_link_add_symbols (abfd, info)
                          /* We are about to create a TOC entry for
                             this symbol.  */
                          set_toc = h;
-                       } /* merge toc reloc */
-                   } /* c_ext */
-               } /* reloc */
-           } /* merge toc */
+                       }
+                   }
+               }
+           }
 
          {
-
            asection *enclosing;
 
            /* We need to create a new section.  We get the name from
@@ -1493,9 +1418,7 @@ xcoff_link_add_symbols (abfd, info)
 
            csect = bfd_xcoff_create_csect_from_smclas(abfd, &aux, name);
            if (NULL == csect)
-             {
-               goto error_return;
-             }
+             goto error_return;
 
            /* The enclosing section is the main section : .data, .text
               or .bss that the csect is coming from.  */
@@ -1506,11 +1429,11 @@ xcoff_link_add_symbols (abfd, info)
            if (! bfd_is_abs_section (enclosing)
                && ((bfd_vma) sym.n_value < enclosing->vma
                    || ((bfd_vma) sym.n_value + aux.x_csect.x_scnlen.l
-                       > enclosing->vma + enclosing->_raw_size)))
+                       > enclosing->vma + enclosing->size)))
              {
                (*_bfd_error_handler)
-                 (_("%s: csect `%s' not in enclosing section"),
-                  bfd_archive_filename (abfd), name);
+                 (_("%B: csect `%s' not in enclosing section"),
+                  abfd, name);
                bfd_set_error (bfd_error_bad_value);
                goto error_return;
              }
@@ -1518,14 +1441,14 @@ xcoff_link_add_symbols (abfd, info)
            csect->filepos = (enclosing->filepos
                              + sym.n_value
                              - enclosing->vma);
-           csect->_raw_size = aux.x_csect.x_scnlen.l;
+           csect->size = aux.x_csect.x_scnlen.l;
            csect->flags |= SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
            csect->alignment_power = SMTYP_ALIGN (aux.x_csect.x_smtyp);
 
            /* Record the enclosing section in the tdata for this new
               section.  */
            amt = sizeof (struct coff_section_tdata);
-           csect->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
+           csect->used_by_bfd = bfd_zalloc (abfd, amt);
            if (csect->used_by_bfd == NULL)
              goto error_return;
            amt = sizeof (struct xcoff_section_tdata);
@@ -1555,7 +1478,7 @@ xcoff_link_add_symbols (abfd, info)
                                      + relindx * bfd_coff_relsz (abfd));
                while (relindx < enclosing->reloc_count
                       && *rel_csect == NULL
-                      && rel->r_vaddr < csect->vma + csect->_raw_size)
+                      && rel->r_vaddr < csect->vma + csect->size)
                  {
 
                    *rel_csect = csect;
@@ -1579,9 +1502,9 @@ xcoff_link_add_symbols (abfd, info)
            if (first_csect == NULL)
              first_csect = csect;
 
-           /* If this symbol is C_EXT, we treat it as starting at the
+           /* If this symbol is external, we treat it as starting at the
               beginning of the newly created section.  */
-           if (sym.n_sclass == C_EXT)
+           if (EXTERN_SYM_P (sym.n_sclass))
              {
                section = csect;
                value = 0;
@@ -1599,25 +1522,25 @@ xcoff_link_add_symbols (abfd, info)
             follow its appropriate XTY_SD symbol.  The .set pseudo op can
             cause the XTY_LD to not follow the XTY_SD symbol. */
          {
-           boolean bad;
+           bfd_boolean bad;
 
-           bad = false;
+           bad = FALSE;
            if (aux.x_csect.x_scnlen.l < 0
                || (aux.x_csect.x_scnlen.l
                    >= esym - (bfd_byte *) obj_coff_external_syms (abfd)))
-             bad = true;
+             bad = TRUE;
            if (! bad)
              {
                section = xcoff_data (abfd)->csects[aux.x_csect.x_scnlen.l];
                if (section == NULL
                    || (section->flags & SEC_HAS_CONTENTS) == 0)
-                 bad = true;
+                 bad = TRUE;
              }
            if (bad)
              {
                (*_bfd_error_handler)
-                 (_("%s: misplaced XTY_LD `%s'"),
-                  bfd_archive_filename (abfd), name);
+                 (_("%B: misplaced XTY_LD `%s'"),
+                  abfd, name);
                bfd_set_error (bfd_error_bad_value);
                goto error_return;
              }
@@ -1628,36 +1551,27 @@ xcoff_link_add_symbols (abfd, info)
 
        case XTY_CM:
          /* This is an unitialized csect.  We could base the name on
-             the storage mapping class, but we don't bother except for
-             an XMC_TD symbol.  If this csect is externally visible,
-             it is a common symbol.  We put XMC_TD symbols in sections
-             named .tocbss, and rely on the linker script to put that
-             in the TOC area.  */
-
-         if (csect != NULL)
-           {
-             xcoff_section_data (abfd, csect)->last_symndx =
-               ((esym
-                 - (bfd_byte *) obj_coff_external_syms (abfd))
-                / symesz);
-           }
+            the storage mapping class, but we don't bother except for
+            an XMC_TD symbol.  If this csect is externally visible,
+            it is a common symbol.  We put XMC_TD symbols in sections
+            named .tocbss, and rely on the linker script to put that
+            in the TOC area.  */
 
          if (aux.x_csect.x_smclas == XMC_TD)
            {
              /* The linker script puts the .td section in the data
                 section after the .tc section.  */
-             csect = bfd_make_section_anyway (abfd, ".td");
-
+             csect = bfd_make_section_anyway_with_flags (abfd, ".td",
+                                                         SEC_ALLOC);
            }
          else
-           {
-             csect = bfd_make_section_anyway (abfd, ".bss");
-           }
+           csect = bfd_make_section_anyway_with_flags (abfd, ".bss",
+                                                       SEC_ALLOC);
+
          if (csect == NULL)
            goto error_return;
          csect->vma = sym.n_value;
-         csect->_raw_size = aux.x_csect.x_scnlen.l;
-         csect->flags |= SEC_ALLOC;
+         csect->size = aux.x_csect.x_scnlen.l;
          csect->alignment_power = SMTYP_ALIGN (aux.x_csect.x_smtyp);
          /* There are a number of other fields and section flags
             which we do not bother to set.  */
@@ -1667,7 +1581,7 @@ xcoff_link_add_symbols (abfd, info)
                         / symesz);
 
          amt = sizeof (struct coff_section_tdata);
-         csect->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
+         csect->used_by_bfd = bfd_zalloc (abfd, amt);
          if (csect->used_by_bfd == NULL)
            goto error_return;
          amt = sizeof (struct xcoff_section_tdata);
@@ -1679,10 +1593,10 @@ xcoff_link_add_symbols (abfd, info)
          if (first_csect == NULL)
            first_csect = csect;
 
-         if (sym.n_sclass == C_EXT)
+         if (EXTERN_SYM_P (sym.n_sclass))
            {
              csect->flags |= SEC_IS_COMMON;
-             csect->_raw_size = 0;
+             csect->size = 0;
              section = csect;
              value = aux.x_csect.x_scnlen.l;
            }
@@ -1695,7 +1609,6 @@ xcoff_link_add_symbols (abfd, info)
          && aux.x_csect.x_smclas != XMC_TC
          && aux.x_csect.x_smclas != XMC_TD)
        {
-
          int i = -1;
 
          if (name[0] == '_')
@@ -1712,31 +1625,28 @@ xcoff_link_add_symbols (abfd, info)
                i = XCOFF_SPECIAL_SECTION_END;
            }
          else if (name[0] == 'e' && strcmp (name, "end") == 0)
-           {
-             i = XCOFF_SPECIAL_SECTION_END2;
-           }
+           i = XCOFF_SPECIAL_SECTION_END2;
 
          if (i != -1)
-           {
-             xcoff_hash_table (info)->special_sections[i] = csect;
-           }
+           xcoff_hash_table (info)->special_sections[i] = csect;
        }
 
       /* Now we have enough information to add the symbol to the
-         linker hash table.  */
+        linker hash table.  */
 
-      if (sym.n_sclass == C_EXT)
+      if (EXTERN_SYM_P (sym.n_sclass))
        {
-         boolean copy;
+         bfd_boolean copy;
+         flagword flags;
 
          BFD_ASSERT (section != NULL);
 
          /* We must copy the name into memory if we got it from the
-             syment itself, rather than the string table.  */
+            syment itself, rather than the string table.  */
          copy = default_copy;
          if (sym._n._n_n._n_zeroes != 0
              || sym._n._n_n._n_offset == 0)
-           copy = true;
+           copy = TRUE;
 
          /* The AIX linker appears to only detect multiple symbol
             definitions when there is a reference to the symbol.  If
@@ -1763,15 +1673,18 @@ xcoff_link_add_symbols (abfd, info)
             shared object, which will cause symbol redefinitions,
             although this is an easier case to detect.  */
 
-         if (info->hash->creator == abfd->xvec)
+         if (info->output_bfd->xvec == abfd->xvec)
            {
              if (! bfd_is_und_section (section))
                *sym_hash = xcoff_link_hash_lookup (xcoff_hash_table (info),
-                                                   name, true, copy, false);
+                                                   name, TRUE, copy, FALSE);
              else
+               /* Make a copy of the symbol name to prevent problems with
+                  merging symbols.  */
                *sym_hash = ((struct xcoff_link_hash_entry *)
                             bfd_wrapped_link_hash_lookup (abfd, info, name,
-                                                          true, copy, false));
+                                                          TRUE, TRUE, FALSE));
+
              if (*sym_hash == NULL)
                goto error_return;
              if (((*sym_hash)->root.type == bfd_link_hash_defined
@@ -1787,19 +1700,19 @@ xcoff_link_add_symbols (abfd, info)
                              & DYNAMIC) == 0))
                    {
                      /* The new symbol is from a shared library, and
-                         either the existing symbol is not global
-                         linkage code or this symbol is global linkage
-                         code.  If the existing symbol is global
-                         linkage code and the new symbol is not, then
-                         we want to use the new symbol.  */
+                        either the existing symbol is not global
+                        linkage code or this symbol is global linkage
+                        code.  If the existing symbol is global
+                        linkage code and the new symbol is not, then
+                        we want to use the new symbol.  */
                      section = bfd_und_section_ptr;
                      value = 0;
                    }
-                 else if (((*sym_hash)->root.u.def.section->owner->flags
-                           & DYNAMIC) != 0)
+                 else if (((*sym_hash)->flags & XCOFF_DEF_REGULAR) == 0
+                          && ((*sym_hash)->flags & XCOFF_DEF_DYNAMIC) != 0)
                    {
                      /* The existing symbol is from a shared library.
-                         Replace it.  */
+                        Replace it.  */
                      (*sym_hash)->root.type = bfd_link_hash_undefined;
                      (*sym_hash)->root.u.undef.abfd =
                        (*sym_hash)->root.u.def.section->owner;
@@ -1807,32 +1720,37 @@ xcoff_link_add_symbols (abfd, info)
                  else if (abfd->my_archive != NULL)
                    {
                      /* This is a redefinition in an object contained
-                         in an archive.  Just ignore it.  See the
-                         comment above.  */
+                        in an archive.  Just ignore it.  See the
+                        comment above.  */
                      section = bfd_und_section_ptr;
                      value = 0;
                    }
-                 else if ((*sym_hash)->root.next != NULL
+                 else if (sym.n_sclass == C_AIX_WEAKEXT
+                          || (*sym_hash)->root.type == bfd_link_hash_defweak)
+                   {
+                     /* At least one of the definitions is weak.
+                        Allow the normal rules to take effect.  */
+                   }
+                 else if ((*sym_hash)->root.u.undef.next != NULL
                           || info->hash->undefs_tail == &(*sym_hash)->root)
                    {
                      /* This symbol has been referenced.  In this
-                         case, we just continue and permit the
-                         multiple definition error.  See the comment
-                         above about the behaviour of the AIX linker.  */
+                        case, we just continue and permit the
+                        multiple definition error.  See the comment
+                        above about the behaviour of the AIX linker.  */
                    }
                  else if ((*sym_hash)->smclas == aux.x_csect.x_smclas)
                    {
                      /* The symbols are both csects of the same
-                         class.  There is at least a chance that this
-                         is a semi-legitimate redefinition.  */
+                        class.  There is at least a chance that this
+                        is a semi-legitimate redefinition.  */
                      section = bfd_und_section_ptr;
                      value = 0;
                      (*sym_hash)->flags |= XCOFF_MULTIPLY_DEFINED;
                    }
                }
              else if (((*sym_hash)->flags & XCOFF_MULTIPLY_DEFINED) != 0
-                      && ((*sym_hash)->root.type == bfd_link_hash_defined
-                          || (*sym_hash)->root.type == bfd_link_hash_defweak)
+                      && (*sym_hash)->root.type == bfd_link_hash_defined
                       && (bfd_is_und_section (section)
                           || bfd_is_com_section (section)))
                {
@@ -1845,7 +1763,7 @@ xcoff_link_add_symbols (abfd, info)
                     not an error.  */
                  if (! ((*info->callbacks->multiple_definition)
                         (info, (*sym_hash)->root.root.string,
-                         (bfd *) NULL, (asection *) NULL, (bfd_vma) 0,
+                         NULL, NULL, (bfd_vma) 0,
                          (*sym_hash)->root.u.def.section->owner,
                          (*sym_hash)->root.u.def.section,
                          (*sym_hash)->root.u.def.value)))
@@ -1867,9 +1785,10 @@ xcoff_link_add_symbols (abfd, info)
             a second time from the csects.  */
          BFD_ASSERT (last_real->next == first_csect);
          last_real->next = NULL;
+         flags = (sym.n_sclass == C_EXT ? BSF_GLOBAL : BSF_WEAK);
          if (! (_bfd_generic_link_add_one_symbol
                 (info, abfd, name, flags, section, value,
-                 (const char *) NULL, copy, true,
+                 NULL, copy, TRUE,
                  (struct bfd_link_hash_entry **) sym_hash)))
            goto error_return;
          last_real->next = first_csect;
@@ -1878,18 +1797,14 @@ xcoff_link_add_symbols (abfd, info)
            {
              if ((*sym_hash)->root.type != bfd_link_hash_common
                  || (*sym_hash)->root.u.c.p->section != csect)
-               {
-                 /* We don't need the common csect we just created.  */
-                 csect->_raw_size = 0;
-               }
+               /* We don't need the common csect we just created.  */
+               csect->size = 0;
              else
-               {
-                 (*sym_hash)->root.u.c.p->alignment_power
-                   = csect->alignment_power;
-               }
+               (*sym_hash)->root.u.c.p->alignment_power
+                 = csect->alignment_power;
            }
 
-         if (info->hash->creator == abfd->xvec)
+         if (info->output_bfd->xvec == abfd->xvec)
            {
              int flag;
 
@@ -1905,11 +1820,20 @@ xcoff_link_add_symbols (abfd, info)
            }
        }
 
-      *csect_cache = csect;
+      if (smtyp == XTY_ER)
+       *csect_cache = section;
+      else
+       {
+         *csect_cache = csect;
+         if (csect != NULL)
+           xcoff_section_data (abfd, csect)->last_symndx
+             = (esym - (bfd_byte *) obj_coff_external_syms (abfd)) / symesz;
+       }
 
       esym += (sym.n_numaux + 1) * symesz;
       sym_hash += sym.n_numaux + 1;
       csect_cache += sym.n_numaux + 1;
+      lineno_counts += sym.n_numaux + 1;
     }
 
   BFD_ASSERT (last_real == NULL || last_real->next == first_csect);
@@ -1922,7 +1846,7 @@ xcoff_link_add_symbols (abfd, info)
         the .debug section, since we need to read it below in
         bfd_xcoff_size_dynamic_sections.  */
       if (strcmp (bfd_get_section_name (abfd, o), ".debug") != 0)
-       o->_raw_size = 0;
+       o->size = 0;
       o->lineno_count = 0;
 
       if ((o->flags & SEC_RELOC) != 0)
@@ -1936,64 +1860,63 @@ xcoff_link_add_symbols (abfd, info)
 
          for (i = 0; i < o->reloc_count; i++, rel++, rel_csect++)
            {
-
              if (*rel_csect == NULL)
                {
                  (*_bfd_error_handler)
-                   (_("%s: reloc %s:%d not in csect"),
-                    bfd_archive_filename (abfd), o->name, i);
+                   (_("%B: reloc %s:%d not in csect"),
+                    abfd, o->name, i);
                  bfd_set_error (bfd_error_bad_value);
                  goto error_return;
                }
 
-             /* We identify all symbols which are called, so that we
-                can create glue code for calls to functions imported
-                from dynamic objects.  */
-             if (info->hash->creator == abfd->xvec
+             /* We identify all function symbols that are the target
+                of a relocation, so that we can create glue code for
+                functions imported from dynamic objects.  */
+             if (info->output_bfd->xvec == abfd->xvec
                  && *rel_csect != bfd_und_section_ptr
-                 && (rel->r_type == R_BR
-                     || rel->r_type == R_RBR)
                  && obj_xcoff_sym_hashes (abfd)[rel->r_symndx] != NULL)
                {
                  struct xcoff_link_hash_entry *h;
 
                  h = obj_xcoff_sym_hashes (abfd)[rel->r_symndx];
-                 h->flags |= XCOFF_CALLED;
                  /* If the symbol name starts with a period, it is
-                     the code of a function.  If the symbol is
-                     currently undefined, then add an undefined symbol
-                     for the function descriptor.  This should do no
-                     harm, because any regular object that defines the
-                     function should also define the function
-                     descriptor.  It helps, because it means that we
-                     will identify the function descriptor with a
-                     dynamic object if a dynamic object defines it.  */
+                    the code of a function.  If the symbol is
+                    currently undefined, then add an undefined symbol
+                    for the function descriptor.  This should do no
+                    harm, because any regular object that defines the
+                    function should also define the function
+                    descriptor.  It helps, because it means that we
+                    will identify the function descriptor with a
+                    dynamic object if a dynamic object defines it.  */
                  if (h->root.root.string[0] == '.'
                      && h->descriptor == NULL)
                    {
                      struct xcoff_link_hash_entry *hds;
+                     struct bfd_link_hash_entry *bh;
 
                      hds = xcoff_link_hash_lookup (xcoff_hash_table (info),
                                                    h->root.root.string + 1,
-                                                   true, false, true);
+                                                   TRUE, FALSE, TRUE);
                      if (hds == NULL)
                        goto error_return;
                      if (hds->root.type == bfd_link_hash_new)
                        {
+                         bh = &hds->root;
                          if (! (_bfd_generic_link_add_one_symbol
                                 (info, abfd, hds->root.root.string,
                                  (flagword) 0, bfd_und_section_ptr,
-                                 (bfd_vma) 0, (const char *) NULL, false,
-                                 true,
-                                 (struct bfd_link_hash_entry **) &hds)))
+                                 (bfd_vma) 0, NULL, FALSE,
+                                 TRUE, &bh)))
                            goto error_return;
+                         hds = (struct xcoff_link_hash_entry *) bh;
                        }
                      hds->flags |= XCOFF_DESCRIPTOR;
-                     BFD_ASSERT ((hds->flags & XCOFF_CALLED) == 0
-                                 && (h->flags & XCOFF_DESCRIPTOR) == 0);
+                     BFD_ASSERT ((h->flags & XCOFF_DESCRIPTOR) == 0);
                      hds->descriptor = h;
                      h->descriptor = hds;
                    }
+                 if (h->root.root.string[0] == '.')
+                   h->flags |= XCOFF_CALLED;
                }
            }
 
@@ -2017,7 +1940,7 @@ xcoff_link_add_symbols (abfd, info)
        }
 
       /* Free up the line numbers.  FIXME: We could cache these
-         somewhere for the final link, to avoid reading them again.  */
+        somewhere for the final link, to avoid reading them again.  */
       if (reloc_info[o->target_index].linenos != NULL)
        {
          free (reloc_info[o->target_index].linenos);
@@ -2029,7 +1952,7 @@ xcoff_link_add_symbols (abfd, info)
 
   obj_coff_keep_syms (abfd) = keep_syms;
 
-  return true;
+  return TRUE;
 
  error_return:
   if (reloc_info != NULL)
@@ -2044,87 +1967,68 @@ xcoff_link_add_symbols (abfd, info)
       free (reloc_info);
     }
   obj_coff_keep_syms (abfd) = keep_syms;
-  return false;
+  return FALSE;
 }
 
 #undef N_TMASK
 #undef N_BTSHFT
 
-/* This function is used to add symbols from a dynamic object to the
-   global symbol table.  */
+/* Add symbols from an XCOFF object file.  */
+
+static bfd_boolean
+xcoff_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
+{
+  if (! _bfd_coff_get_external_symbols (abfd))
+    return FALSE;
+  if (! xcoff_link_add_symbols (abfd, info))
+    return FALSE;
+  if (! info->keep_memory)
+    {
+      if (! _bfd_coff_free_symbols (abfd))
+       return FALSE;
+    }
+  return TRUE;
+}
+
+/* Look through the loader symbols to see if this dynamic object
+   should be included in the link.  The native linker uses the loader
+   symbols, not the normal symbol table, so we do too.  */
 
-static boolean
-xcoff_link_add_dynamic_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
+static bfd_boolean
+xcoff_link_check_dynamic_ar_symbols (bfd *abfd,
+                                    struct bfd_link_info *info,
+                                    bfd_boolean *pneeded)
 {
   asection *lsec;
   bfd_byte *contents;
   struct internal_ldhdr ldhdr;
   const char *strings;
   bfd_byte *elsym, *elsymend;
-  struct xcoff_import_file *n;
-  const char *bname;
-  const char *mname;
-  const char *s;
-  unsigned int c;
-  struct xcoff_import_file **pp;
 
-  /* We can only handle a dynamic object if we are generating an XCOFF
-     output file.  */
-   if (info->hash->creator != abfd->xvec)
-    {
-      (*_bfd_error_handler)
-       (_("%s: XCOFF shared object when not producing XCOFF output"),
-        bfd_get_filename (abfd));
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  /* The symbols we use from a dynamic object are not the symbols in
-     the normal symbol table, but, rather, the symbols in the export
-     table.  If there is a global symbol in a dynamic object which is
-     not in the export table, the loader will not be able to find it,
-     so we don't want to find it either.  Also, on AIX 4.1.3, shr.o in
-     libc.a has symbols in the export table which are not in the
-     symbol table.  */
+  *pneeded = FALSE;
 
-  /* Read in the .loader section.  FIXME: We should really use the
-     o_snloader field in the a.out header, rather than grabbing the
-     section by name.  */
   lsec = bfd_get_section_by_name (abfd, ".loader");
   if (lsec == NULL)
-    {
-      (*_bfd_error_handler)
-       (_("%s: dynamic object with no .loader section"),
-        bfd_get_filename (abfd));
-      bfd_set_error (bfd_error_no_symbols);
-      return false;
-    }
-
+    /* There are no symbols, so don't try to include it.  */
+    return TRUE;
 
   if (! xcoff_get_section_contents (abfd, lsec))
-    return false;
+    return FALSE;
   contents = coff_section_data (abfd, lsec)->contents;
 
-  /* Remove the sections from this object, so that they do not get
-     included in the link.  */
-  abfd->sections = NULL;
-
   bfd_xcoff_swap_ldhdr_in (abfd, contents, &ldhdr);
 
   strings = (char *) contents + ldhdr.l_stoff;
 
-  elsym = contents + bfd_xcoff_loader_symbol_offset(abfd, &ldhdr);
-
-  elsymend = elsym + ldhdr.l_nsyms * bfd_xcoff_ldsymsz(abfd);
+  elsym = contents + bfd_xcoff_loader_symbol_offset (abfd, &ldhdr);
 
-  for (; elsym < elsymend; elsym += bfd_xcoff_ldsymsz(abfd))
+  elsymend = elsym + ldhdr.l_nsyms * bfd_xcoff_ldsymsz (abfd);
+  for (; elsym < elsymend; elsym += bfd_xcoff_ldsymsz (abfd))
     {
       struct internal_ldsym ldsym;
       char nambuf[SYMNMLEN + 1];
       const char *name;
-      struct xcoff_link_hash_entry *h;
+      struct bfd_link_hash_entry *h;
 
       bfd_xcoff_swap_ldsym_in (abfd, elsym, &ldsym);
 
@@ -2141,278 +2045,637 @@ xcoff_link_add_dynamic_symbols (abfd, info)
          name = nambuf;
        }
 
-      /* Normally we could not call xcoff_link_hash_lookup in an add
-        symbols routine, since we might not be using an XCOFF hash
-        table.  However, we verified above that we are using an XCOFF
-        hash table.  */
-
-      h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, true,
-                                 true, true);
-      if (h == NULL)
-       return false;
-
-      h->flags |= XCOFF_DEF_DYNAMIC;
-
-      /* If the symbol is undefined, and the BFD it was found in is
-        not a dynamic object, change the BFD to this dynamic object,
-        so that we can get the correct import file ID.  */
-      if ((h->root.type == bfd_link_hash_undefined
-          || h->root.type == bfd_link_hash_undefweak)
-         && (h->root.u.undef.abfd == NULL
-             || (h->root.u.undef.abfd->flags & DYNAMIC) == 0))
-       h->root.u.undef.abfd = abfd;
+      h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
 
-      if (h->root.type == bfd_link_hash_new)
+      /* We are only interested in symbols that are currently
+        undefined.  At this point we know that we are using an XCOFF
+        hash table.  */
+      if (h != NULL
+         && h->type == bfd_link_hash_undefined
+         && (((struct xcoff_link_hash_entry *) h)->flags
+             & XCOFF_DEF_DYNAMIC) == 0)
        {
-         h->root.type = bfd_link_hash_undefined;
-         h->root.u.undef.abfd = abfd;
-         /* We do not want to add this to the undefined symbol list.  */
+         if (! (*info->callbacks->add_archive_element) (info, abfd, name))
+           return FALSE;
+         *pneeded = TRUE;
+         return TRUE;
        }
+    }
 
-      if (h->smclas == XMC_UA
-         || h->root.type == bfd_link_hash_undefined
-         || h->root.type == bfd_link_hash_undefweak)
-       h->smclas = ldsym.l_smclas;
+  /* We do not need this shared object.  */
+  if (contents != NULL && ! coff_section_data (abfd, lsec)->keep_contents)
+    {
+      free (coff_section_data (abfd, lsec)->contents);
+      coff_section_data (abfd, lsec)->contents = NULL;
+    }
 
-      /* Unless this is an XMC_XO symbol, we don't bother to actually
-         define it, since we don't have a section to put it in anyhow.
-         Instead, the relocation routines handle the DEF_DYNAMIC flag
-         correctly.  */
+  return TRUE;
+}
 
-      if (h->smclas == XMC_XO
-         && (h->root.type == bfd_link_hash_undefined
-             || h->root.type == bfd_link_hash_undefweak))
-       {
-         /* This symbol has an absolute value.  */
-         h->root.type = bfd_link_hash_defined;
-         h->root.u.def.section = bfd_abs_section_ptr;
-         h->root.u.def.value = ldsym.l_value;
-       }
+/* Look through the symbols to see if this object file should be
+   included in the link.  */
 
-      /* If this symbol defines a function descriptor, then it
-        implicitly defines the function code as well.  */
-      if (h->smclas == XMC_DS
-         || (h->smclas == XMC_XO && name[0] != '.'))
-       h->flags |= XCOFF_DESCRIPTOR;
-      if ((h->flags & XCOFF_DESCRIPTOR) != 0)
-       {
-         struct xcoff_link_hash_entry *hds;
+static bfd_boolean
+xcoff_link_check_ar_symbols (bfd *abfd,
+                            struct bfd_link_info *info,
+                            bfd_boolean *pneeded)
+{
+  bfd_size_type symesz;
+  bfd_byte *esym;
+  bfd_byte *esym_end;
 
-         hds = h->descriptor;
-         if (hds == NULL)
-           {
-             char *dsnm;
+  *pneeded = FALSE;
 
-             dsnm = bfd_malloc ((bfd_size_type) strlen (name) + 2);
-             if (dsnm == NULL)
-               return false;
-             dsnm[0] = '.';
-             strcpy (dsnm + 1, name);
-             hds = xcoff_link_hash_lookup (xcoff_hash_table (info), dsnm,
-                                           true, true, true);
-             free (dsnm);
-             if (hds == NULL)
-               return false;
+  if ((abfd->flags & DYNAMIC) != 0
+      && ! info->static_link
+      && info->output_bfd->xvec == abfd->xvec)
+    return xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded);
 
-             if (hds->root.type == bfd_link_hash_new)
-               {
-                 hds->root.type = bfd_link_hash_undefined;
-                 hds->root.u.undef.abfd = abfd;
-                 /* We do not want to add this to the undefined
-                     symbol list.  */
-               }
+  symesz = bfd_coff_symesz (abfd);
+  esym = (bfd_byte *) obj_coff_external_syms (abfd);
+  esym_end = esym + obj_raw_syment_count (abfd) * symesz;
+  while (esym < esym_end)
+    {
+      struct internal_syment sym;
 
-             hds->descriptor = h;
-             h->descriptor = hds;
-           }
+      bfd_coff_swap_sym_in (abfd, (void *) esym, (void *) &sym);
+
+      if (EXTERN_SYM_P (sym.n_sclass) && sym.n_scnum != N_UNDEF)
+       {
+         const char *name;
+         char buf[SYMNMLEN + 1];
+         struct bfd_link_hash_entry *h;
+
+         /* This symbol is externally visible, and is defined by this
+            object file.  */
+         name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
 
-         hds->flags |= XCOFF_DEF_DYNAMIC;
-         if (hds->smclas == XMC_UA)
-           hds->smclas = XMC_PR;
+         if (name == NULL)
+           return FALSE;
+         h = bfd_link_hash_lookup (info->hash, name, FALSE, FALSE, TRUE);
 
-         /* An absolute symbol appears to actually define code, not a
-            function descriptor.  This is how some math functions are
-            implemented on AIX 4.1.  */
-         if (h->smclas == XMC_XO
-             && (hds->root.type == bfd_link_hash_undefined
-                 || hds->root.type == bfd_link_hash_undefweak))
+         /* We are only interested in symbols that are currently
+            undefined.  If a symbol is currently known to be common,
+            XCOFF linkers do not bring in an object file which
+            defines it.  We also don't bring in symbols to satisfy
+            undefined references in shared objects.  */
+         if (h != NULL
+             && h->type == bfd_link_hash_undefined
+             && (info->output_bfd->xvec != abfd->xvec
+                 || (((struct xcoff_link_hash_entry *) h)->flags
+                     & XCOFF_DEF_DYNAMIC) == 0))
            {
-             hds->smclas = XMC_XO;
-             hds->root.type = bfd_link_hash_defined;
-             hds->root.u.def.section = bfd_abs_section_ptr;
-             hds->root.u.def.value = ldsym.l_value;
+             if (! (*info->callbacks->add_archive_element) (info, abfd, name))
+               return FALSE;
+             *pneeded = TRUE;
+             return TRUE;
            }
        }
-    }
 
-  if (contents != NULL && ! coff_section_data (abfd, lsec)->keep_contents)
-    {
-      free (coff_section_data (abfd, lsec)->contents);
-      coff_section_data (abfd, lsec)->contents = NULL;
+      esym += (sym.n_numaux + 1) * symesz;
     }
 
-  /* Record this file in the import files.  */
+  /* We do not need this object file.  */
+  return TRUE;
+}
 
-  n = ((struct xcoff_import_file *)
-       bfd_alloc (abfd, (bfd_size_type) sizeof (struct xcoff_import_file)));
-  if (n == NULL)
-    return false;
-  n->next = NULL;
+/* Check a single archive element to see if we need to include it in
+   the link.  *PNEEDED is set according to whether this element is
+   needed in the link or not.  This is called via
+   _bfd_generic_link_add_archive_symbols.  */
 
-  /* For some reason, the path entry in the import file list for a
-     shared object appears to always be empty.  The file name is the
-     base name.  */
-  n->path = "";
-  if (abfd->my_archive == NULL)
+static bfd_boolean
+xcoff_link_check_archive_element (bfd *abfd,
+                                 struct bfd_link_info *info,
+                                 bfd_boolean *pneeded)
+{
+  if (! _bfd_coff_get_external_symbols (abfd))
+    return FALSE;
+
+  if (! xcoff_link_check_ar_symbols (abfd, info, pneeded))
+    return FALSE;
+
+  if (*pneeded)
     {
-      bname = bfd_get_filename (abfd);
-      mname = "";
+      if (! xcoff_link_add_symbols (abfd, info))
+       return FALSE;
     }
-  else
+
+  if (! info->keep_memory || ! *pneeded)
     {
-      bname = bfd_get_filename (abfd->my_archive);
-      mname = bfd_get_filename (abfd);
+      if (! _bfd_coff_free_symbols (abfd))
+       return FALSE;
     }
-  s = strrchr (bname, '/');
-  if (s != NULL)
-    bname = s + 1;
-  n->file = bname;
-  n->member = mname;
-
-  /* We start c at 1 because the first import file number is reserved
-     for LIBPATH.  */
-  for (pp = &xcoff_hash_table (info)->imports, c = 1;
-       *pp != NULL;
-       pp = &(*pp)->next, ++c)
-    ;
-  *pp = n;
 
-  xcoff_data (abfd)->import_file_id = c;
-
-  return true;
+  return TRUE;
 }
-\f
-/* Routines that are called after all the input files have been
-   handled, but before the sections are laid out in memory.  */
 
-/* Mark a symbol as not being garbage, including the section in which
-   it is defined.  */
+/* Given an XCOFF BFD, add symbols to the global hash table as
+   appropriate.  */
 
-static INLINE boolean
-xcoff_mark_symbol (info, h)
-     struct bfd_link_info *info;
-     struct xcoff_link_hash_entry *h;
+bfd_boolean
+_bfd_xcoff_bfd_link_add_symbols (bfd *abfd, struct bfd_link_info *info)
 {
-
-  if ((h->flags & XCOFF_MARK) != 0)
-    return true;
-
-  h->flags |= XCOFF_MARK;
-  if (h->root.type == bfd_link_hash_defined
-      || h->root.type == bfd_link_hash_defweak)
+  switch (bfd_get_format (abfd))
     {
-      asection *hsec;
+    case bfd_object:
+      return xcoff_link_add_object_symbols (abfd, info);
 
-      hsec = h->root.u.def.section;
-      if (! bfd_is_abs_section (hsec)
-         && (hsec->flags & SEC_MARK) == 0)
+    case bfd_archive:
+      /* If the archive has a map, do the usual search.  We then need
+        to check the archive for dynamic objects, because they may not
+        appear in the archive map even though they should, perhaps, be
+        included.  If the archive has no map, we just consider each object
+        file in turn, since that apparently is what the AIX native linker
+        does.  */
+      if (bfd_has_map (abfd))
        {
-         if (! xcoff_mark (info, hsec))
-           return false;
+         if (! (_bfd_generic_link_add_archive_symbols
+                (abfd, info, xcoff_link_check_archive_element)))
+           return FALSE;
        }
+
+      {
+       bfd *member;
+
+       member = bfd_openr_next_archived_file (abfd, NULL);
+       while (member != NULL)
+         {
+           if (bfd_check_format (member, bfd_object)
+               && (info->output_bfd->xvec == member->xvec)
+               && (! bfd_has_map (abfd) || (member->flags & DYNAMIC) != 0))
+             {
+               bfd_boolean needed;
+
+               if (! xcoff_link_check_archive_element (member, info,
+                                                       &needed))
+                 return FALSE;
+               if (needed)
+                 member->archive_pass = -1;
+             }
+           member = bfd_openr_next_archived_file (abfd, member);
+         }
+      }
+
+      return TRUE;
+
+    default:
+      bfd_set_error (bfd_error_wrong_format);
+      return FALSE;
     }
+}
+\f
+/* If symbol H has not been interpreted as a function descriptor,
+   see whether it should be.  Set up its descriptor information if so.  */
 
-  if (h->toc_section != NULL
-      && (h->toc_section->flags & SEC_MARK) == 0)
+static bfd_boolean
+xcoff_find_function (struct bfd_link_info *info,
+                    struct xcoff_link_hash_entry *h)
+{
+  if ((h->flags & XCOFF_DESCRIPTOR) == 0
+      && h->root.root.string[0] != '.')
     {
-      if (! xcoff_mark (info, h->toc_section))
-       return false;
-    }
+      char *fnname;
+      struct xcoff_link_hash_entry *hfn;
+      bfd_size_type amt;
 
-  return true;
+      amt = strlen (h->root.root.string) + 2;
+      fnname = bfd_malloc (amt);
+      if (fnname == NULL)
+       return FALSE;
+      fnname[0] = '.';
+      strcpy (fnname + 1, h->root.root.string);
+      hfn = xcoff_link_hash_lookup (xcoff_hash_table (info),
+                                   fnname, FALSE, FALSE, TRUE);
+      free (fnname);
+      if (hfn != NULL
+         && hfn->smclas == XMC_PR
+         && (hfn->root.type == bfd_link_hash_defined
+             || hfn->root.type == bfd_link_hash_defweak))
+       {
+         h->flags |= XCOFF_DESCRIPTOR;
+         h->descriptor = hfn;
+         hfn->descriptor = h;
+       }
+    }
+  return TRUE;
 }
 
-/* The mark phase of garbage collection.  For a given section, mark
-   it, and all the sections which define symbols to which it refers.
-   Because this function needs to look at the relocs, we also count
-   the number of relocs which need to be copied into the .loader
-   section.  */
+/* H is an imported symbol.  Set the import module's path, file and member
+   to IMPATH, IMPFILE and IMPMEMBER respectively.  All three are null if
+   no specific import module is specified.  */
 
-static boolean
-xcoff_mark (info, sec)
-     struct bfd_link_info *info;
-     asection *sec;
+static bfd_boolean
+xcoff_set_import_path (struct bfd_link_info *info,
+                      struct xcoff_link_hash_entry *h,
+                      const char *imppath, const char *impfile,
+                      const char *impmember)
 {
-  if (bfd_is_abs_section (sec)
-      || (sec->flags & SEC_MARK) != 0)
-    return true;
-
-  sec->flags |= SEC_MARK;
+  unsigned int c;
+  struct xcoff_import_file **pp;
 
-  if (sec->owner->xvec == info->hash->creator
-      && coff_section_data (sec->owner, sec) != NULL
-      && xcoff_section_data (sec->owner, sec) != NULL)
+  /* We overload the ldindx field to hold the l_ifile value for this
+     symbol.  */
+  BFD_ASSERT (h->ldsym == NULL);
+  BFD_ASSERT ((h->flags & XCOFF_BUILT_LDSYM) == 0);
+  if (imppath == NULL)
+    h->ldindx = -1;
+  else
     {
-      register struct xcoff_link_hash_entry **hp, **hpend;
-      struct internal_reloc *rel, *relend;
-
-      /* Mark all the symbols in this section.  */
+      /* We start c at 1 because the first entry in the import list is
+        reserved for the library search path.  */
+      for (pp = &xcoff_hash_table (info)->imports, c = 1;
+          *pp != NULL;
+          pp = &(*pp)->next, ++c)
+       {
+         if (strcmp ((*pp)->path, imppath) == 0
+             && strcmp ((*pp)->file, impfile) == 0
+             && strcmp ((*pp)->member, impmember) == 0)
+           break;
+       }
 
-      hp = (obj_xcoff_sym_hashes (sec->owner)
-           + xcoff_section_data (sec->owner, sec)->first_symndx);
-      hpend = (obj_xcoff_sym_hashes (sec->owner)
-              + xcoff_section_data (sec->owner, sec)->last_symndx);
-      for (; hp < hpend; hp++)
+      if (*pp == NULL)
        {
-         register struct xcoff_link_hash_entry *h;
+         struct xcoff_import_file *n;
+         bfd_size_type amt = sizeof (* n);
 
-         h = *hp;
-         if (h != NULL
-             && (h->flags & XCOFF_MARK) == 0)
-           {
-             if (! xcoff_mark_symbol (info, h))
-               return false;
-           }
+         n = bfd_alloc (info->output_bfd, amt);
+         if (n == NULL)
+           return FALSE;
+         n->next = NULL;
+         n->path = imppath;
+         n->file = impfile;
+         n->member = impmember;
+         *pp = n;
        }
+      h->ldindx = c;
+    }
+  return TRUE;
+}
+\f
+/* Return true if the given bfd contains at least one shared object.  */
 
-      /* Look through the section relocs.  */
+static bfd_boolean
+xcoff_archive_contains_shared_object_p (bfd *archive)
+{
+  bfd *member;
 
-      if ((sec->flags & SEC_RELOC) != 0
-         && sec->reloc_count > 0)
-       {
-         rel = xcoff_read_internal_relocs (sec->owner, sec, true,
-                                           (bfd_byte *) NULL, false,
-                                           (struct internal_reloc *) NULL);
-         if (rel == NULL)
-           return false;
-         relend = rel + sec->reloc_count;
-         for (; rel < relend; rel++)
-           {
-             asection *rsec;
-             struct xcoff_link_hash_entry *h;
+  member = bfd_openr_next_archived_file (archive, NULL);
+  while (member != NULL && (member->flags & DYNAMIC) == 0)
+    member = bfd_openr_next_archived_file (archive, member);
+  return member != NULL;
+}
 
-             if ((unsigned int) rel->r_symndx
-                 > obj_raw_syment_count (sec->owner))
-               continue;
+/* Symbol H qualifies for export by -bexpfull.  Return true if it also
+   qualifies for export by -bexpall.  */
 
-             h = obj_xcoff_sym_hashes (sec->owner)[rel->r_symndx];
-             if (h != NULL
-                 && (h->flags & XCOFF_MARK) == 0)
-               {
-                 if (! xcoff_mark_symbol (info, h))
-                   return false;
-               }
+static bfd_boolean
+xcoff_covered_by_expall_p (struct xcoff_link_hash_entry *h)
+{
+  /* Exclude symbols beginning with '_'.  */
+  if (h->root.root.string[0] == '_')
+    return FALSE;
 
-             rsec = xcoff_data (sec->owner)->csects[rel->r_symndx];
-             if (rsec != NULL
-                 && (rsec->flags & SEC_MARK) == 0)
-               {
-                 if (! xcoff_mark (info, rsec))
-                   return false;
-               }
+  /* Exclude archive members that would otherwise be unreferenced.  */
+  if ((h->flags & XCOFF_MARK) == 0
+      && (h->root.type == bfd_link_hash_defined
+         || h->root.type == bfd_link_hash_defweak)
+      && h->root.u.def.section->owner != NULL
+      && h->root.u.def.section->owner->my_archive != NULL)
+    return FALSE;
 
-             /* See if this reloc needs to be copied into the .loader
-                 section.  */
+  return TRUE;
+}
+
+/* Return true if symbol H qualifies for the forms of automatic export
+   specified by AUTO_EXPORT_FLAGS.  */
+
+static bfd_boolean
+xcoff_auto_export_p (struct xcoff_link_hash_entry *h,
+                    unsigned int auto_export_flags)
+{
+  /* Don't automatically export things that were explicitly exported.  */
+  if ((h->flags & XCOFF_EXPORT) != 0)
+    return FALSE;
+
+  /* Don't export things that we don't define.  */
+  if ((h->flags & XCOFF_DEF_REGULAR) == 0)
+    return FALSE;
+
+  /* Don't export functions; export their descriptors instead.  */
+  if (h->root.root.string[0] == '.')
+    return FALSE;
+
+  /* We don't export a symbol which is being defined by an object
+     included from an archive which contains a shared object.  The
+     rationale is that if an archive contains both an unshared and
+     a shared object, then there must be some reason that the
+     unshared object is unshared, and we don't want to start
+     providing a shared version of it.  In particular, this solves
+     a bug involving the _savefNN set of functions.  gcc will call
+     those functions without providing a slot to restore the TOC,
+     so it is essential that these functions be linked in directly
+     and not from a shared object, which means that a shared
+     object which also happens to link them in must not export
+     them.  This is confusing, but I haven't been able to think of
+     a different approach.  Note that the symbols can, of course,
+     be exported explicitly.  */
+  if (h->root.type == bfd_link_hash_defined
+      || h->root.type == bfd_link_hash_defweak)
+    {
+      bfd *owner;
+
+      owner = h->root.u.def.section->owner;
+      if (owner != NULL
+         && owner->my_archive != NULL
+         && xcoff_archive_contains_shared_object_p (owner->my_archive))
+       return FALSE;
+    }
+
+  /* Otherwise, all symbols are exported by -bexpfull.  */
+  if ((auto_export_flags & XCOFF_EXPFULL) != 0)
+    return TRUE;
+
+  /* Despite its name, -bexpall exports most but not all symbols.  */
+  if ((auto_export_flags & XCOFF_EXPALL) != 0
+      && xcoff_covered_by_expall_p (h))
+    return TRUE;
+
+  return FALSE;
+}
+\f
+/* Mark a symbol as not being garbage, including the section in which
+   it is defined.  */
+
+static inline bfd_boolean
+xcoff_mark_symbol (struct bfd_link_info *info, struct xcoff_link_hash_entry *h)
+{
+  if ((h->flags & XCOFF_MARK) != 0)
+    return TRUE;
+
+  h->flags |= XCOFF_MARK;
+
+  /* If we're marking an undefined symbol, try find some way of
+     defining it.  */
+  if (!info->relocatable
+      && (h->flags & XCOFF_IMPORT) == 0
+      && (h->flags & XCOFF_DEF_REGULAR) == 0
+      && (h->root.type == bfd_link_hash_undefined
+         || h->root.type == bfd_link_hash_undefweak))
+    {
+      /* First check whether this symbol can be interpreted as an
+        undefined function descriptor for a defined function symbol.  */
+      if (!xcoff_find_function (info, h))
+       return FALSE;
+
+      if ((h->flags & XCOFF_DESCRIPTOR) != 0
+         && (h->descriptor->root.type == bfd_link_hash_defined
+             || h->descriptor->root.type == bfd_link_hash_defweak))
+       {
+         /* This is a descriptor for a defined symbol, but the input
+            objects have not defined the descriptor itself.  Fill in
+            the definition automatically.
+
+            Note that we do this even if we found a dynamic definition
+            of H.  The local function definition logically overrides
+            the dynamic one.  */
+         asection *sec;
+
+         sec = xcoff_hash_table (info)->descriptor_section;
+         h->root.type = bfd_link_hash_defined;
+         h->root.u.def.section = sec;
+         h->root.u.def.value = sec->size;
+         h->smclas = XMC_DS;
+         h->flags |= XCOFF_DEF_REGULAR;
+
+         /* The size of the function descriptor depends on whether this
+            is xcoff32 (12) or xcoff64 (24).  */
+         sec->size += bfd_xcoff_function_descriptor_size (sec->owner);
+
+         /* A function descriptor uses two relocs: one for the
+            associated code, and one for the TOC address.  */
+         xcoff_hash_table (info)->ldrel_count += 2;
+         sec->reloc_count += 2;
+
+         /* Mark the function itself.  */
+         if (!xcoff_mark_symbol (info, h->descriptor))
+           return FALSE;
+
+         /* Mark the TOC section, so that we get an anchor
+            to relocate against.  */
+         if (!xcoff_mark (info, xcoff_hash_table (info)->toc_section))
+           return FALSE;
+
+         /* We handle writing out the contents of the descriptor in
+            xcoff_write_global_symbol.  */
+       }
+      else if ((h->flags & XCOFF_CALLED) != 0)
+       {
+         /* This is a function symbol for which we need to create
+            linkage code.  */
+         asection *sec;
+         struct xcoff_link_hash_entry *hds;
+
+         /* Mark the descriptor (and its TOC section).  */
+         hds = h->descriptor;
+         BFD_ASSERT ((hds->root.type == bfd_link_hash_undefined
+                      || hds->root.type == bfd_link_hash_undefweak)
+                     && (hds->flags & XCOFF_DEF_REGULAR) == 0);
+         if (!xcoff_mark_symbol (info, hds))
+           return FALSE;
+
+         /* Treat this symbol as undefined if the descriptor was.  */
+         if ((hds->flags & XCOFF_WAS_UNDEFINED) != 0)
+           h->flags |= XCOFF_WAS_UNDEFINED;
+
+         /* Allocate room for the global linkage code itself.  */
+         sec = xcoff_hash_table (info)->linkage_section;
+         h->root.type = bfd_link_hash_defined;
+         h->root.u.def.section = sec;
+         h->root.u.def.value = sec->size;
+         h->smclas = XMC_GL;
+         h->flags |= XCOFF_DEF_REGULAR;
+         sec->size += bfd_xcoff_glink_code_size (info->output_bfd);
+
+         /* The global linkage code requires a TOC entry for the
+            descriptor.  */
+         if (hds->toc_section == NULL)
+           {
+             int byte_size;
+
+             /* 32 vs 64
+                xcoff32 uses 4 bytes in the toc.
+                xcoff64 uses 8 bytes in the toc.  */
+             if (bfd_xcoff_is_xcoff64 (info->output_bfd))
+               byte_size = 8;
+             else if (bfd_xcoff_is_xcoff32 (info->output_bfd))
+               byte_size = 4;
+             else
+               return FALSE;
+
+             /* Allocate room in the fallback TOC section.  */
+             hds->toc_section = xcoff_hash_table (info)->toc_section;
+             hds->u.toc_offset = hds->toc_section->size;
+             hds->toc_section->size += byte_size;
+             if (!xcoff_mark (info, hds->toc_section))
+               return FALSE;
+
+             /* Allocate room for a static and dynamic R_TOC
+                relocation.  */
+             ++xcoff_hash_table (info)->ldrel_count;
+             ++hds->toc_section->reloc_count;
+
+             /* Set the index to -2 to force this symbol to
+                get written out.  */
+             hds->indx = -2;
+             hds->flags |= XCOFF_SET_TOC | XCOFF_LDREL;
+           }
+       }
+      else if ((h->flags & XCOFF_DEF_DYNAMIC) == 0)
+       {
+         /* Record that the symbol was undefined, then import it.
+            -brtl links use a special fake import file.  */
+         h->flags |= XCOFF_WAS_UNDEFINED | XCOFF_IMPORT;
+         if (xcoff_hash_table (info)->rtld)
+           {
+             if (!xcoff_set_import_path (info, h, "", "..", ""))
+               return FALSE;
+           }
+         else
+           {
+             if (!xcoff_set_import_path (info, h, NULL, NULL, NULL))
+               return FALSE;
+           }
+       }
+    }
+
+  if (h->root.type == bfd_link_hash_defined
+      || h->root.type == bfd_link_hash_defweak)
+    {
+      asection *hsec;
+
+      hsec = h->root.u.def.section;
+      if (! bfd_is_abs_section (hsec)
+         && (hsec->flags & SEC_MARK) == 0)
+       {
+         if (! xcoff_mark (info, hsec))
+           return FALSE;
+       }
+    }
+
+  if (h->toc_section != NULL
+      && (h->toc_section->flags & SEC_MARK) == 0)
+    {
+      if (! xcoff_mark (info, h->toc_section))
+       return FALSE;
+    }
+
+  return TRUE;
+}
+
+/* Look for a symbol called NAME.  If the symbol is defined, mark it.
+   If the symbol exists, set FLAGS.  */
+
+static bfd_boolean
+xcoff_mark_symbol_by_name (struct bfd_link_info *info,
+                          const char *name, unsigned int flags)
+{
+  struct xcoff_link_hash_entry *h;
+
+  h = xcoff_link_hash_lookup (xcoff_hash_table (info), name,
+                             FALSE, FALSE, TRUE);
+  if (h != NULL)
+    {
+      h->flags |= flags;
+      if (h->root.type == bfd_link_hash_defined
+         || h->root.type == bfd_link_hash_defweak)
+       {
+         if (!xcoff_mark (info, h->root.u.def.section))
+           return FALSE;
+       }
+    }
+  return TRUE;
+}
+
+/* The mark phase of garbage collection.  For a given section, mark
+   it, and all the sections which define symbols to which it refers.
+   Because this function needs to look at the relocs, we also count
+   the number of relocs which need to be copied into the .loader
+   section.  */
+
+static bfd_boolean
+xcoff_mark (struct bfd_link_info *info, asection *sec)
+{
+  if (bfd_is_abs_section (sec)
+      || (sec->flags & SEC_MARK) != 0)
+    return TRUE;
+
+  sec->flags |= SEC_MARK;
+
+  if (sec->owner->xvec == info->output_bfd->xvec
+      && coff_section_data (sec->owner, sec) != NULL
+      && xcoff_section_data (sec->owner, sec) != NULL)
+    {
+      struct xcoff_link_hash_entry **syms;
+      struct internal_reloc *rel, *relend;
+      asection **csects;
+      unsigned long i, first, last;
+
+      /* Mark all the symbols in this section.  */
+      syms = obj_xcoff_sym_hashes (sec->owner);
+      csects = xcoff_data (sec->owner)->csects;
+      first = xcoff_section_data (sec->owner, sec)->first_symndx;
+      last = xcoff_section_data (sec->owner, sec)->last_symndx;
+      for (i = first; i <= last; i++)
+       if (csects[i] == sec
+           && syms[i] != NULL
+           && (syms[i]->flags & XCOFF_MARK) == 0)
+         {
+           if (!xcoff_mark_symbol (info, syms[i]))
+             return FALSE;
+         }
+
+      /* Look through the section relocs.  */
+      if ((sec->flags & SEC_RELOC) != 0
+         && sec->reloc_count > 0)
+       {
+         rel = xcoff_read_internal_relocs (sec->owner, sec, TRUE,
+                                           NULL, FALSE, NULL);
+         if (rel == NULL)
+           return FALSE;
+         relend = rel + sec->reloc_count;
+         for (; rel < relend; rel++)
+           {
+             struct xcoff_link_hash_entry *h;
+
+             if ((unsigned int) rel->r_symndx
+                 > obj_raw_syment_count (sec->owner))
+               continue;
+
+             h = obj_xcoff_sym_hashes (sec->owner)[rel->r_symndx];
+             if (h != NULL)
+               {
+                 if ((h->flags & XCOFF_MARK) == 0)
+                   {
+                     if (!xcoff_mark_symbol (info, h))
+                       return FALSE;
+                   }
+               }
+             else
+               {
+                 asection *rsec;
+
+                 rsec = xcoff_data (sec->owner)->csects[rel->r_symndx];
+                 if (rsec != NULL
+                     && (rsec->flags & SEC_MARK) == 0)
+                   {
+                     if (!xcoff_mark (info, rsec))
+                       return FALSE;
+                   }
+               }
+
+             /* See if this reloc needs to be copied into the .loader
+                section.  */
              switch (rel->r_type)
                {
                default:
@@ -2420,21 +2683,20 @@ xcoff_mark (info, sec)
                      || h->root.type == bfd_link_hash_defined
                      || h->root.type == bfd_link_hash_defweak
                      || h->root.type == bfd_link_hash_common
-                     || ((h->flags & XCOFF_CALLED) != 0
-                         && (h->root.type == bfd_link_hash_undefined
-                             || h->root.type == bfd_link_hash_undefweak)
-                         && h->root.root.string[0] == '.'
-                         && h->descriptor != NULL
-                         && ((h->descriptor->flags & XCOFF_DEF_DYNAMIC) != 0
-                             || ((h->descriptor->flags & XCOFF_IMPORT) != 0
-                                 && (h->descriptor->flags
-                                     & XCOFF_DEF_REGULAR) == 0))))
+                     /* We will always provide a local definition of
+                        function symbols.  */
+                     || (h->flags & XCOFF_CALLED) != 0)
                    break;
                  /* Fall through.  */
                case R_POS:
                case R_NEG:
                case R_RL:
                case R_RLA:
+                 if (h != NULL
+                     && (h->root.type == bfd_link_hash_defined
+                         || h->root.type == bfd_link_hash_defweak)
+                     && bfd_is_abs_section (h->root.u.def.section))
+                   break;
                  ++xcoff_hash_table (info)->ldrel_count;
                  if (h != NULL)
                    h->flags |= XCOFF_LDREL;
@@ -2461,15 +2723,17 @@ xcoff_mark (info, sec)
        }
     }
 
-  return true;
+  return TRUE;
 }
 
+/* Routines that are called after all the input files have been
+   handled, but before the sections are laid out in memory.  */
+
 /* The sweep phase of garbage collection.  Remove all garbage
    sections.  */
 
 static void
-xcoff_sweep (info)
-     struct bfd_link_info *info;
+xcoff_sweep (struct bfd_link_info *info)
 {
   bfd *sub;
 
@@ -2482,21 +2746,19 @@ xcoff_sweep (info)
          if ((o->flags & SEC_MARK) == 0)
            {
              /* Keep all sections from non-XCOFF input files.  Keep
-                 special sections.  Keep .debug sections for the
-                 moment.  */
-             if (sub->xvec != info->hash->creator
+                special sections.  Keep .debug sections for the
+                moment.  */
+             if (sub->xvec != info->output_bfd->xvec
                  || o == xcoff_hash_table (info)->debug_section
                  || o == xcoff_hash_table (info)->loader_section
                  || o == xcoff_hash_table (info)->linkage_section
-                 || o == xcoff_hash_table (info)->toc_section
                  || o == xcoff_hash_table (info)->descriptor_section
                  || strcmp (o->name, ".debug") == 0)
                o->flags |= SEC_MARK;
              else
                {
-                 o->_raw_size = 0;
+                 o->size = 0;
                  o->reloc_count = 0;
-                 o->lineno_count = 0;
                }
            }
        }
@@ -2506,28 +2768,26 @@ xcoff_sweep (info)
 /* Record the number of elements in a set.  This is used to output the
    correct csect length.  */
 
-boolean
-bfd_xcoff_link_record_set (output_bfd, info, harg, size)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct bfd_link_hash_entry *harg;
-     bfd_size_type size;
+bfd_boolean
+bfd_xcoff_link_record_set (bfd *output_bfd,
+                          struct bfd_link_info *info,
+                          struct bfd_link_hash_entry *harg,
+                          bfd_size_type size)
 {
   struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
   struct xcoff_link_size_list *n;
   bfd_size_type amt;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
   /* This will hardly ever be called.  I don't want to burn four bytes
      per global symbol, so instead the size is kept on a linked list
      attached to the hash table.  */
-
-  amt = sizeof (struct xcoff_link_size_list);
-  n = (struct xcoff_link_size_list *) bfd_alloc (output_bfd, amt);
+  amt = sizeof (* n);
+  n = bfd_alloc (output_bfd, amt);
   if (n == NULL)
-    return false;
+    return FALSE;
   n->next = xcoff_hash_table (info)->size_list;
   n->h = h;
   n->size = size;
@@ -2535,27 +2795,25 @@ bfd_xcoff_link_record_set (output_bfd, info, harg, size)
 
   h->flags |= XCOFF_HAS_SIZE;
 
-  return true;
+  return TRUE;
 }
 
 /* Import a symbol.  */
 
-boolean
-bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
-                        impmember, syscall_flag)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct bfd_link_hash_entry *harg;
-     bfd_vma val;
-     const char *imppath;
-     const char *impfile;
-     const char *impmember;
-     unsigned int syscall_flag;
+bfd_boolean
+bfd_xcoff_import_symbol (bfd *output_bfd,
+                        struct bfd_link_info *info,
+                        struct bfd_link_hash_entry *harg,
+                        bfd_vma val,
+                        const char *imppath,
+                        const char *impfile,
+                        const char *impmember,
+                        unsigned int syscall_flag)
 {
   struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
   /* A symbol name which starts with a period is the code for a
      function.  If the symbol is undefined, then add an undefined
@@ -2571,24 +2829,23 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
        {
          hds = xcoff_link_hash_lookup (xcoff_hash_table (info),
                                        h->root.root.string + 1,
-                                       true, false, true);
+                                       TRUE, FALSE, TRUE);
          if (hds == NULL)
-           return false;
+           return FALSE;
          if (hds->root.type == bfd_link_hash_new)
            {
              hds->root.type = bfd_link_hash_undefined;
              hds->root.u.undef.abfd = h->root.u.undef.abfd;
            }
          hds->flags |= XCOFF_DESCRIPTOR;
-         BFD_ASSERT ((hds->flags & XCOFF_CALLED) == 0
-                     && (h->flags & XCOFF_DESCRIPTOR) == 0);
+         BFD_ASSERT ((h->flags & XCOFF_DESCRIPTOR) == 0);
          hds->descriptor = h;
          h->descriptor = hds;
        }
 
       /* Now, if the descriptor is undefined, import the descriptor
-         rather than the symbol we were told to import.  FIXME: Is
-         this correct in all cases?  */
+        rather than the symbol we were told to import.  FIXME: Is
+        this correct in all cases?  */
       if (hds->root.type == bfd_link_hash_undefined)
        h = hds;
     }
@@ -2605,107 +2862,41 @@ bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
                 (info, h->root.root.string, h->root.u.def.section->owner,
                  h->root.u.def.section, h->root.u.def.value,
                  output_bfd, bfd_abs_section_ptr, val)))
-           return false;
+           return FALSE;
        }
 
       h->root.type = bfd_link_hash_defined;
       h->root.u.def.section = bfd_abs_section_ptr;
       h->root.u.def.value = val;
+      h->smclas = XMC_XO;
     }
 
-  /* We overload the ldindx field to hold the l_ifile value for this
-     symbol.  */
-  BFD_ASSERT (h->ldsym == NULL);
-  BFD_ASSERT ((h->flags & XCOFF_BUILT_LDSYM) == 0);
-  if (imppath == NULL)
-    h->ldindx = -1;
-  else
-    {
-      unsigned int c;
-      struct xcoff_import_file **pp;
-
-      /* We start c at 1 because the first entry in the import list is
-         reserved for the library search path.  */
-      for (pp = &xcoff_hash_table (info)->imports, c = 1;
-          *pp != NULL;
-          pp = &(*pp)->next, ++c)
-       {
-         if (strcmp ((*pp)->path, imppath) == 0
-             && strcmp ((*pp)->file, impfile) == 0
-             && strcmp ((*pp)->member, impmember) == 0)
-           break;
-       }
-
-      if (*pp == NULL)
-       {
-         struct xcoff_import_file *n;
-         bfd_size_type amt = sizeof (struct xcoff_import_file);
-
-         n = (struct xcoff_import_file *) bfd_alloc (output_bfd, amt);
-         if (n == NULL)
-           return false;
-         n->next = NULL;
-         n->path = imppath;
-         n->file = impfile;
-         n->member = impmember;
-         *pp = n;
-       }
-
-      h->ldindx = c;
-    }
+  if (!xcoff_set_import_path (info, h, imppath, impfile, impmember))
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* Export a symbol.  */
 
-boolean
-bfd_xcoff_export_symbol (output_bfd, info, harg)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct bfd_link_hash_entry *harg;
+bfd_boolean
+bfd_xcoff_export_symbol (bfd *output_bfd,
+                        struct bfd_link_info *info,
+                        struct bfd_link_hash_entry *harg)
 {
   struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
   h->flags |= XCOFF_EXPORT;
 
   /* FIXME: I'm not at all sure what syscall is supposed to mean, so
      I'm just going to ignore it until somebody explains it.  */
 
-  /* See if this is a function descriptor.  It may be one even though
-     it is not so marked.  */
-  if ((h->flags & XCOFF_DESCRIPTOR) == 0
-      && h->root.root.string[0] != '.')
-    {
-      char *fnname;
-      struct xcoff_link_hash_entry *hfn;
-      bfd_size_type amt = strlen (h->root.root.string) + 2;
-
-      fnname = (char *) bfd_malloc (amt);
-      if (fnname == NULL)
-       return false;
-      fnname[0] = '.';
-      strcpy (fnname + 1, h->root.root.string);
-      hfn = xcoff_link_hash_lookup (xcoff_hash_table (info),
-                                   fnname, false, false, true);
-      free (fnname);
-      if (hfn != NULL
-         && hfn->smclas == XMC_PR
-         && (hfn->root.type == bfd_link_hash_defined
-             || hfn->root.type == bfd_link_hash_defweak))
-       {
-         h->flags |= XCOFF_DESCRIPTOR;
-         h->descriptor = hfn;
-         hfn->descriptor = h;
-       }
-    }
-
   /* Make sure we don't garbage collect this symbol.  */
   if (! xcoff_mark_symbol (info, h))
-    return false;
+    return FALSE;
 
   /* If this is a function descriptor, make sure we don't garbage
      collect the associated function code.  We normally don't have to
@@ -2715,35 +2906,34 @@ bfd_xcoff_export_symbol (output_bfd, info, harg)
   if ((h->flags & XCOFF_DESCRIPTOR) != 0)
     {
       if (! xcoff_mark_symbol (info, h->descriptor))
-       return false;
+       return FALSE;
     }
 
-  return true;
+  return TRUE;
 }
 
 /* Count a reloc against a symbol.  This is called for relocs
    generated by the linker script, typically for global constructors
    and destructors.  */
 
-boolean
-bfd_xcoff_link_count_reloc (output_bfd, info, name)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     const char *name;
+bfd_boolean
+bfd_xcoff_link_count_reloc (bfd *output_bfd,
+                           struct bfd_link_info *info,
+                           const char *name)
 {
   struct xcoff_link_hash_entry *h;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
   h = ((struct xcoff_link_hash_entry *)
-       bfd_wrapped_link_hash_lookup (output_bfd, info, name, false, false,
-                                    false));
+       bfd_wrapped_link_hash_lookup (output_bfd, info, name, FALSE, FALSE,
+                                    FALSE));
   if (h == NULL)
     {
       (*_bfd_error_handler) (_("%s: no such symbol"), name);
       bfd_set_error (bfd_error_no_symbols);
-      return false;
+      return FALSE;
     }
 
   h->flags |= XCOFF_REF_REGULAR | XCOFF_LDREL;
@@ -2751,163 +2941,419 @@ bfd_xcoff_link_count_reloc (output_bfd, info, name)
 
   /* Mark the symbol to avoid garbage collection.  */
   if (! xcoff_mark_symbol (info, h))
-    return false;
+    return FALSE;
 
-  return true;
+  return TRUE;
 }
 
 /* This function is called for each symbol to which the linker script
    assigns a value.  */
 
-boolean
-bfd_xcoff_record_link_assignment (output_bfd, info, name)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     const char *name;
+bfd_boolean
+bfd_xcoff_record_link_assignment (bfd *output_bfd,
+                                 struct bfd_link_info *info,
+                                 const char *name)
 {
   struct xcoff_link_hash_entry *h;
 
   if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
-    return true;
+    return TRUE;
 
-  h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, true, true,
-                             false);
+  h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, TRUE, TRUE,
+                             FALSE);
   if (h == NULL)
-    return false;
+    return FALSE;
 
   h->flags |= XCOFF_DEF_REGULAR;
 
-  return true;
+  return TRUE;
 }
 
-/* Build the .loader section.  This is called by the XCOFF linker
-   emulation before_allocation routine.  We must set the size of the
-   .loader section before the linker lays out the output file.
-   LIBPATH is the library path to search for shared objects; this is
-   normally built from the -L arguments passed to the linker.  ENTRY
-   is the name of the entry point symbol (the -e linker option).
-   FILE_ALIGN is the alignment to use for sections within the file
-   (the -H linker option).  MAXSTACK is the maximum stack size (the
-   -bmaxstack linker option).  MAXDATA is the maximum data size (the
-   -bmaxdata linker option).  GC is whether to do garbage collection
-   (the -bgc linker option).  MODTYPE is the module type (the
-   -bmodtype linker option).  TEXTRO is whether the text section must
-   be read only (the -btextro linker option).  EXPORT_DEFINEDS is
-   whether all defined symbols should be exported (the -unix linker
-   option).  SPECIAL_SECTIONS is set by this routine to csects with
-   magic names like _end.  */
-
-boolean
-bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
-                                file_align, maxstack, maxdata, gc,
-                                modtype, textro, export_defineds,
-                                special_sections, rtld)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     const char *libpath;
-     const char *entry;
-     unsigned long file_align;
-     unsigned long maxstack;
-     unsigned long maxdata;
-     boolean gc;
-     int modtype;
-     boolean textro;
-     boolean export_defineds;
-     asection **special_sections;
-     boolean rtld;
+/* An xcoff_link_hash_traverse callback for which DATA points to an
+   xcoff_loader_info.  Mark all symbols that should be automatically
+   exported.  */
+
+static bfd_boolean
+xcoff_mark_auto_exports (struct xcoff_link_hash_entry *h, void *data)
 {
-  struct xcoff_link_hash_entry *hentry;
-  asection *lsec;
-  struct xcoff_loader_info ldinfo;
-  int i;
-  size_t impsize, impcount;
-  struct xcoff_import_file *fl;
-  struct internal_ldhdr *ldhdr;
-  bfd_size_type stoff;
-  register char *out;
-  asection *sec;
-  bfd *sub;
-  struct bfd_strtab_hash *debug_strtab;
-  bfd_byte *debug_contents = NULL;
-  bfd_size_type amt;
+  struct xcoff_loader_info *ldinfo;
 
-  if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
+  ldinfo = (struct xcoff_loader_info *) data;
+  if (xcoff_auto_export_p (h, ldinfo->auto_export_flags))
     {
-      for (i = 0; i < XCOFF_NUMBER_OF_SPECIAL_SECTIONS; i++)
-       special_sections[i] = NULL;
-      return true;
+      if (!xcoff_mark_symbol (ldinfo->info, h))
+       ldinfo->failed = TRUE;
     }
+  return TRUE;
+}
 
-  ldinfo.failed = false;
-  ldinfo.output_bfd = output_bfd;
-  ldinfo.info = info;
-  ldinfo.export_defineds = export_defineds;
-  ldinfo.ldsym_count = 0;
-  ldinfo.string_size = 0;
-  ldinfo.strings = NULL;
-  ldinfo.string_alc = 0;
+/* Add a symbol to the .loader symbols, if necessary.  */
 
-  xcoff_data (output_bfd)->maxstack = maxstack;
-  xcoff_data (output_bfd)->maxdata = maxdata;
-  xcoff_data (output_bfd)->modtype = modtype;
+/* INPUT_BFD has an external symbol associated with hash table entry H
+   and csect CSECT.   Return true if INPUT_BFD defines H.  */
 
-  xcoff_hash_table (info)->file_align = file_align;
-  xcoff_hash_table (info)->textro = textro;
+static bfd_boolean
+xcoff_final_definition_p (bfd *input_bfd, struct xcoff_link_hash_entry *h,
+                         asection *csect)
+{
+  switch (h->root.type)
+    {
+    case bfd_link_hash_defined:
+    case bfd_link_hash_defweak:
+      /* No input bfd owns absolute symbols.  They are written by
+        xcoff_write_global_symbol instead.  */
+      return (!bfd_is_abs_section (csect)
+             && h->root.u.def.section == csect);
+
+    case bfd_link_hash_common:
+      return h->root.u.c.p->section->owner == input_bfd;
+
+    case bfd_link_hash_undefined:
+    case bfd_link_hash_undefweak:
+      /* We can't treat undef.abfd as the owner because that bfd
+        might be a dynamic object.  Allow any bfd to claim it.  */
+      return TRUE;
+
+    default:
+      abort ();
+    }
+}
+
+static bfd_boolean
+xcoff_build_ldsyms (struct xcoff_link_hash_entry *h, void * p)
+{
+  struct xcoff_loader_info *ldinfo = (struct xcoff_loader_info *) p;
+  bfd_size_type amt;
+
+  if (h->root.type == bfd_link_hash_warning)
+    h = (struct xcoff_link_hash_entry *) h->root.u.i.link;
+
+  /* __rtinit, this symbol has special handling. */
+  if (h->flags & XCOFF_RTINIT)
+      return TRUE;
+
+  /* If this is a final link, and the symbol was defined as a common
+     symbol in a regular object file, and there was no definition in
+     any dynamic object, then the linker will have allocated space for
+     the symbol in a common section but the XCOFF_DEF_REGULAR flag
+     will not have been set.  */
+  if (h->root.type == bfd_link_hash_defined
+      && (h->flags & XCOFF_DEF_REGULAR) == 0
+      && (h->flags & XCOFF_REF_REGULAR) != 0
+      && (h->flags & XCOFF_DEF_DYNAMIC) == 0
+      && (bfd_is_abs_section (h->root.u.def.section)
+         || (h->root.u.def.section->owner->flags & DYNAMIC) == 0))
+    h->flags |= XCOFF_DEF_REGULAR;
+
+  /* If all defined symbols should be exported, mark them now.  We
+     don't want to export the actual functions, just the function
+     descriptors.  */
+  if (xcoff_auto_export_p (h, ldinfo->auto_export_flags))
+    h->flags |= XCOFF_EXPORT;
+
+  /* We don't want to garbage collect symbols which are not defined in
+     XCOFF files.  This is a convenient place to mark them.  */
+  if (xcoff_hash_table (ldinfo->info)->gc
+      && (h->flags & XCOFF_MARK) == 0
+      && (h->root.type == bfd_link_hash_defined
+         || h->root.type == bfd_link_hash_defweak)
+      && (h->root.u.def.section->owner == NULL
+         || (h->root.u.def.section->owner->xvec
+             != ldinfo->info->output_bfd->xvec)))
+    h->flags |= XCOFF_MARK;
+
+  /* If this symbol is exported, but not defined, we need to try to
+     define it.  */
+  if ((h->flags & XCOFF_EXPORT) != 0
+      && (h->flags & XCOFF_WAS_UNDEFINED) != 0)
+    {
+      (*_bfd_error_handler)
+       (_("warning: attempt to export undefined symbol `%s'"),
+        h->root.root.string);
+      h->ldsym = NULL;
+      return TRUE;
+    }
+
+  /* If this is still a common symbol, and it wasn't garbage
+     collected, we need to actually allocate space for it in the .bss
+     section.  */
+  if (h->root.type == bfd_link_hash_common
+      && (! xcoff_hash_table (ldinfo->info)->gc
+         || (h->flags & XCOFF_MARK) != 0)
+      && h->root.u.c.p->section->size == 0)
+    {
+      BFD_ASSERT (bfd_is_com_section (h->root.u.c.p->section));
+      h->root.u.c.p->section->size = h->root.u.c.size;
+    }
+
+  /* We need to add a symbol to the .loader section if it is mentioned
+     in a reloc which we are copying to the .loader section and it was
+     not defined or common, or if it is the entry point, or if it is
+     being exported.  */
+
+  if (((h->flags & XCOFF_LDREL) == 0
+       || h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak
+       || h->root.type == bfd_link_hash_common)
+      && (h->flags & XCOFF_ENTRY) == 0
+      && (h->flags & XCOFF_EXPORT) == 0)
+    {
+      h->ldsym = NULL;
+      return TRUE;
+    }
+
+  /* We don't need to add this symbol if we did garbage collection and
+     we did not mark this symbol.  */
+  if (xcoff_hash_table (ldinfo->info)->gc
+      && (h->flags & XCOFF_MARK) == 0)
+    {
+      h->ldsym = NULL;
+      return TRUE;
+    }
+
+  /* We may have already processed this symbol due to the recursive
+     call above.  */
+  if ((h->flags & XCOFF_BUILT_LDSYM) != 0)
+    return TRUE;
+
+  /* We need to add this symbol to the .loader symbols.  */
+
+  BFD_ASSERT (h->ldsym == NULL);
+  amt = sizeof (struct internal_ldsym);
+  h->ldsym = bfd_zalloc (ldinfo->output_bfd, amt);
+  if (h->ldsym == NULL)
+    {
+      ldinfo->failed = TRUE;
+      return FALSE;
+    }
+
+  if ((h->flags & XCOFF_IMPORT) != 0)
+    {
+      /* Give imported descriptors class XMC_DS rather than XMC_UA.  */
+      if ((h->flags & XCOFF_DESCRIPTOR) != 0)
+       h->smclas = XMC_DS;
+      h->ldsym->l_ifile = h->ldindx;
+    }
+
+  /* The first 3 symbol table indices are reserved to indicate the
+     data, text and bss sections.  */
+  h->ldindx = ldinfo->ldsym_count + 3;
+
+  ++ldinfo->ldsym_count;
+
+  if (! bfd_xcoff_put_ldsymbol_name (ldinfo->output_bfd, ldinfo,
+                                    h->ldsym, h->root.root.string))
+    return FALSE;
+
+  h->flags |= XCOFF_BUILT_LDSYM;
+
+  return TRUE;
+}
+
+/* INPUT_BFD includes XCOFF symbol ISYM, which is associated with linker
+   hash table entry H and csect CSECT.  AUX contains ISYM's auxillary
+   csect information, if any.  NAME is the function's name if the name
+   is stored in the .debug section, otherwise it is null.
+
+   Return 1 if we should include an appropriately-adjusted ISYM
+   in the output file, 0 if we should discard ISYM, or -1 if an
+   error occured.  */
+
+static int
+xcoff_keep_symbol_p (struct bfd_link_info *info, bfd *input_bfd,
+                    struct internal_syment *isym,
+                    union internal_auxent *aux,
+                    struct xcoff_link_hash_entry *h,
+                    asection *csect, const char *name)
+{
+  int smtyp;
+
+  /* If we are skipping this csect, we want to strip the symbol too.  */
+  if (csect == NULL)
+    return 0;
+
+  /* Likewise if we garbage-collected the csect.  */
+  if (xcoff_hash_table (info)->gc
+      && !bfd_is_abs_section (csect)
+      && !bfd_is_und_section (csect)
+      && (csect->flags & SEC_MARK) == 0)
+    return 0;
+
+  /* An XCOFF linker always removes C_STAT symbols.  */
+  if (isym->n_sclass == C_STAT)
+    return 0;
+
+  /* We generate the TOC anchor separately.  */
+  if (isym->n_sclass == C_HIDEXT
+      && aux->x_csect.x_smclas == XMC_TC0)
+    return 0;
+
+  /* If we are stripping all symbols, we want to discard this one.  */
+  if (info->strip == strip_all)
+    return 0;
+
+  /* Discard symbols that are defined elsewhere.  */
+  if (EXTERN_SYM_P (isym->n_sclass))
+    {
+      if ((h->flags & XCOFF_ALLOCATED) != 0)
+       return 0;
+      if (!xcoff_final_definition_p (input_bfd, h, csect))
+       return 0;
+    }
+
+  /* If we're discarding local symbols, check whether ISYM is local.  */
+  smtyp = SMTYP_SMTYP (aux->x_csect.x_smtyp);
+  if (info->discard == discard_all
+      && !EXTERN_SYM_P (isym->n_sclass)
+      && (isym->n_sclass != C_HIDEXT || smtyp != XTY_SD))
+    return 0;
+
+  /* If we're stripping debugging symbols, check whether ISYM is one.  */
+  if (info->strip == strip_debugger
+      && isym->n_scnum == N_DEBUG)
+    return 0;
+
+  /* If we are stripping symbols based on name, check how ISYM's
+     name should be handled.  */
+  if (info->strip == strip_some
+      || info->discard == discard_l)
+    {
+      char buf[SYMNMLEN + 1];
+
+      if (name == NULL)
+       {
+         name = _bfd_coff_internal_syment_name (input_bfd, isym, buf);
+         if (name == NULL)
+           return -1;
+       }
+
+      if (info->strip == strip_some
+         && bfd_hash_lookup (info->keep_hash, name, FALSE, FALSE) == NULL)
+       return 0;
+
+      if (info->discard == discard_l
+         && !EXTERN_SYM_P (isym->n_sclass)
+         && (isym->n_sclass != C_HIDEXT || smtyp != XTY_SD)
+         && bfd_is_local_label_name (input_bfd, name))
+       return 0;
+    }
+
+  return 1;
+}
+
+/* Build the .loader section.  This is called by the XCOFF linker
+   emulation before_allocation routine.  We must set the size of the
+   .loader section before the linker lays out the output file.
+   LIBPATH is the library path to search for shared objects; this is
+   normally built from the -L arguments passed to the linker.  ENTRY
+   is the name of the entry point symbol (the -e linker option).
+   FILE_ALIGN is the alignment to use for sections within the file
+   (the -H linker option).  MAXSTACK is the maximum stack size (the
+   -bmaxstack linker option).  MAXDATA is the maximum data size (the
+   -bmaxdata linker option).  GC is whether to do garbage collection
+   (the -bgc linker option).  MODTYPE is the module type (the
+   -bmodtype linker option).  TEXTRO is whether the text section must
+   be read only (the -btextro linker option).  AUTO_EXPORT_FLAGS
+   is a mask of XCOFF_EXPALL and XCOFF_EXPFULL.  SPECIAL_SECTIONS
+   is set by this routine to csects with magic names like _end.  */
+
+bfd_boolean
+bfd_xcoff_size_dynamic_sections (bfd *output_bfd,
+                                struct bfd_link_info *info,
+                                const char *libpath,
+                                const char *entry,
+                                unsigned long file_align,
+                                unsigned long maxstack,
+                                unsigned long maxdata,
+                                bfd_boolean gc,
+                                int modtype,
+                                bfd_boolean textro,
+                                unsigned int auto_export_flags,
+                                asection **special_sections,
+                                bfd_boolean rtld)
+{
+  asection *lsec;
+  struct xcoff_loader_info ldinfo;
+  int i;
+  size_t impsize, impcount;
+  struct xcoff_import_file *fl;
+  struct internal_ldhdr *ldhdr;
+  bfd_size_type stoff;
+  char *out;
+  asection *sec;
+  bfd *sub;
+  struct bfd_strtab_hash *debug_strtab;
+  bfd_byte *debug_contents = NULL;
+  bfd_size_type amt;
 
-  hentry = NULL;
-  if (entry != NULL)
+  if (bfd_get_flavour (output_bfd) != bfd_target_xcoff_flavour)
     {
-      hentry = xcoff_link_hash_lookup (xcoff_hash_table (info), entry,
-                                      false, false, true);
-      if (hentry != NULL)
-       hentry->flags |= XCOFF_ENTRY;
+      for (i = 0; i < XCOFF_NUMBER_OF_SPECIAL_SECTIONS; i++)
+       special_sections[i] = NULL;
+      return TRUE;
     }
 
+  ldinfo.failed = FALSE;
+  ldinfo.output_bfd = output_bfd;
+  ldinfo.info = info;
+  ldinfo.auto_export_flags = auto_export_flags;
+  ldinfo.ldsym_count = 0;
+  ldinfo.string_size = 0;
+  ldinfo.strings = NULL;
+  ldinfo.string_alc = 0;
+
+  xcoff_data (output_bfd)->maxstack = maxstack;
+  xcoff_data (output_bfd)->maxdata = maxdata;
+  xcoff_data (output_bfd)->modtype = modtype;
+
+  xcoff_hash_table (info)->file_align = file_align;
+  xcoff_hash_table (info)->textro = textro;
+  xcoff_hash_table (info)->rtld = rtld;
+
   /* __rtinit */
-  if (info->init_function || info->fini_function || rtld == true) 
+  if (info->init_function || info->fini_function || rtld)
     {
       struct xcoff_link_hash_entry *hsym;
       struct internal_ldsym *ldsym;
-      
+
       hsym = xcoff_link_hash_lookup (xcoff_hash_table (info),
-                                    "__rtinit", false, false, true);
+                                    "__rtinit", FALSE, FALSE, TRUE);
       if (hsym == NULL)
        {
          (*_bfd_error_handler)
            (_("error: undefined symbol __rtinit"));
-         return false;
+         return FALSE;
        }
-      
+
       xcoff_mark_symbol (info, hsym);
       hsym->flags |= (XCOFF_DEF_REGULAR | XCOFF_RTINIT);
 
-      /* __rtinit initalized */
-      amt = sizeof (struct internal_ldsym);
-      ldsym = (struct internal_ldsym *) bfd_malloc (amt);
-      
-      ldsym->l_value = 0;                  /* will be filled in later */
-      ldsym->l_scnum = 2;                  /* data section */
-      ldsym->l_smtype = XTY_SD;            /* csect section definition */
-      ldsym->l_smclas = 5;                 /* .rw */
-      ldsym->l_ifile = 0;                  /* special system loader symbol */
-      ldsym->l_parm = 0;                   /* NA */
-      
+      /* __rtinit initialized.  */
+      amt = sizeof (ldsym);
+      ldsym = bfd_malloc (amt);
+
+      ldsym->l_value = 0;              /* Will be filled in later.  */
+      ldsym->l_scnum = 2;              /* Data section.  */
+      ldsym->l_smtype = XTY_SD;                /* Csect section definition.  */
+      ldsym->l_smclas = 5;             /* .rw.  */
+      ldsym->l_ifile = 0;              /* Special system loader symbol.  */
+      ldsym->l_parm = 0;               /* NA.  */
+
       /* Force __rtinit to be the first symbol in the loader symbol table
         See xcoff_build_ldsyms
-        
+
         The first 3 symbol table indices are reserved to indicate the data,
         text and bss sections.  */
       BFD_ASSERT (0 == ldinfo.ldsym_count);
-      
+
       hsym->ldindx = 3;
       ldinfo.ldsym_count = 1;
       hsym->ldsym = ldsym;
-      
-      if (false == bfd_xcoff_put_ldsymbol_name (ldinfo.output_bfd, &ldinfo,
-                                               hsym->ldsym,
-                                               hsym->root.root.string))
-       return false;
-      
+
+      if (! bfd_xcoff_put_ldsymbol_name (ldinfo.output_bfd, &ldinfo,
+                                        hsym->ldsym, hsym->root.root.string))
+       return FALSE;
+
       /* This symbol is written out by xcoff_write_global_symbol
         Set stuff up so xcoff_write_global_symbol logic works.  */
       hsym->flags |= XCOFF_DEF_REGULAR | XCOFF_MARK;
@@ -2916,24 +3362,25 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
     }
 
   /* Garbage collect unused sections.  */
-  if (info->relocateable
-      || ! gc
-      || hentry == NULL
-      || (hentry->root.type != bfd_link_hash_defined
-         && hentry->root.type != bfd_link_hash_defweak))
+  if (info->relocatable || !gc)
     {
-      gc = false;
-      xcoff_hash_table (info)->gc = false;
+      gc = FALSE;
+      xcoff_hash_table (info)->gc = FALSE;
 
       /* We still need to call xcoff_mark, in order to set ldrel_count
-         correctly.  */
+        correctly.  */
       for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
        {
          asection *o;
 
          for (o = sub->sections; o != NULL; o = o->next)
            {
-             if ((o->flags & SEC_MARK) == 0)
+             /* We shouldn't unconditionaly mark the TOC section.
+                The output file should only have a TOC if either
+                (a) one of the input files did or (b) we end up
+                creating TOC references as part of the link process.  */
+             if (o != xcoff_hash_table (info)->toc_section
+                 && (o->flags & SEC_MARK) == 0)
                {
                  if (! xcoff_mark (info, o))
                    goto error_return;
@@ -2943,10 +3390,24 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
     }
   else
     {
-      if (! xcoff_mark (info, hentry->root.u.def.section))
+      if (entry != NULL
+         && !xcoff_mark_symbol_by_name (info, entry, XCOFF_ENTRY))
+       goto error_return;
+      if (info->init_function != NULL
+         && !xcoff_mark_symbol_by_name (info, info->init_function, 0))
+       goto error_return;
+      if (info->fini_function != NULL
+         && !xcoff_mark_symbol_by_name (info, info->fini_function, 0))
        goto error_return;
+      if (auto_export_flags != 0)
+       {
+         xcoff_link_hash_traverse (xcoff_hash_table (info),
+                                   xcoff_mark_auto_exports, &ldinfo);
+         if (ldinfo.failed)
+           goto error_return;
+       }
       xcoff_sweep (info);
-      xcoff_hash_table (info)->gc = true;
+      xcoff_hash_table (info)->gc = TRUE;
     }
 
   /* Return special sections to the caller.  */
@@ -2957,20 +3418,17 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
       if (sec != NULL
          && gc
          && (sec->flags & SEC_MARK) == 0)
-       {
-         sec = NULL;
-       }
+       sec = NULL;
+
       special_sections[i] = sec;
     }
 
   if (info->input_bfds == NULL)
-    {
-      /* I'm not sure what to do in this bizarre case.  */
-      return true;
-    }
+    /* I'm not sure what to do in this bizarre case.  */
+    return TRUE;
 
   xcoff_link_hash_traverse (xcoff_hash_table (info), xcoff_build_ldsyms,
-                           (PTR) &ldinfo);
+                           (void *) &ldinfo);
   if (ldinfo.failed)
     goto error_return;
 
@@ -3019,8 +3477,8 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
   /* We now know the final size of the .loader section.  Allocate
      space for it.  */
   lsec = xcoff_hash_table (info)->loader_section;
-  lsec->_raw_size = stoff + ldhdr->l_stlen;
-  lsec->contents = (bfd_byte *) bfd_zalloc (output_bfd, lsec->_raw_size);
+  lsec->size = stoff + ldhdr->l_stlen;
+  lsec->contents = bfd_zalloc (output_bfd, lsec->size);
   if (lsec->contents == NULL)
     goto error_return;
 
@@ -3035,7 +3493,7 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
   *out++ = '\0';
   for (fl = xcoff_hash_table (info)->imports; fl != NULL; fl = fl->next)
     {
-      register const char *s;
+      const char *s;
 
       s = fl->path;
       while ((*out++ = *s++) != '\0')
@@ -3064,122 +3522,167 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
      symbols are written out in xcoff_link_input_bfd or
      xcoff_write_global_symbol.  The .loader relocs are written out
      when the corresponding normal relocs are handled in
-     xcoff_link_input_bfd.
-  */
+     xcoff_link_input_bfd.  */
 
   /* Allocate space for the magic sections.  */
   sec = xcoff_hash_table (info)->linkage_section;
-  if (sec->_raw_size > 0)
+  if (sec->size > 0)
     {
-      sec->contents = (bfd_byte *) bfd_zalloc (output_bfd, sec->_raw_size);
+      sec->contents = bfd_zalloc (output_bfd, sec->size);
       if (sec->contents == NULL)
        goto error_return;
     }
   sec = xcoff_hash_table (info)->toc_section;
-  if (sec->_raw_size > 0)
+  if (sec->size > 0)
     {
-      sec->contents = (bfd_byte *) bfd_zalloc (output_bfd, sec->_raw_size);
+      sec->contents = bfd_zalloc (output_bfd, sec->size);
       if (sec->contents == NULL)
        goto error_return;
     }
   sec = xcoff_hash_table (info)->descriptor_section;
-  if (sec->_raw_size > 0)
+  if (sec->size > 0)
     {
-      sec->contents = (bfd_byte *) bfd_zalloc (output_bfd, sec->_raw_size);
+      sec->contents = bfd_zalloc (output_bfd, sec->size);
       if (sec->contents == NULL)
        goto error_return;
     }
 
-  /* Now that we've done garbage collection, figure out the contents
-     of the .debug section.  */
+  /* Now that we've done garbage collection, decide which symbols to keep,
+     and figure out the contents of the .debug section.  */
   debug_strtab = xcoff_hash_table (info)->debug_strtab;
 
   for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
     {
       asection *subdeb;
       bfd_size_type symcount;
-      unsigned long *debug_index;
+      long *debug_index;
       asection **csectpp;
+      unsigned int *lineno_counts;
+      struct xcoff_link_hash_entry **sym_hash;
       bfd_byte *esym, *esymend;
       bfd_size_type symesz;
 
-      if (sub->xvec != info->hash->creator)
-       continue;
-      subdeb = bfd_get_section_by_name (sub, ".debug");
-      if (subdeb == NULL || subdeb->_raw_size == 0)
+      if (sub->xvec != info->output_bfd->xvec)
        continue;
 
-      if (info->strip == strip_all
-         || info->strip == strip_debugger
-         || info->discard == discard_all)
-       {
-         subdeb->_raw_size = 0;
-         continue;
-       }
+      if ((sub->flags & DYNAMIC) != 0
+         && !info->static_link)
+       continue;
 
       if (! _bfd_coff_get_external_symbols (sub))
        goto error_return;
 
       symcount = obj_raw_syment_count (sub);
-      debug_index = ((unsigned long *)
-                    bfd_zalloc (sub, symcount * sizeof (unsigned long)));
+      debug_index = bfd_zalloc (sub, symcount * sizeof (long));
       if (debug_index == NULL)
        goto error_return;
       xcoff_data (sub)->debug_indices = debug_index;
 
-      /* Grab the contents of the .debug section.  We use malloc and
-        copy the names into the debug stringtab, rather than
-        bfd_alloc, because I expect that, when linking many files
-        together, many of the strings will be the same.  Storing the
-        strings in the hash table should save space in this case.  */
-      debug_contents = (bfd_byte *) bfd_malloc (subdeb->_raw_size);
-      if (debug_contents == NULL)
-       goto error_return;
-      if (! bfd_get_section_contents (sub, subdeb, (PTR) debug_contents,
-                                     (file_ptr) 0, subdeb->_raw_size))
-       goto error_return;
+      if (info->strip == strip_all
+         || info->strip == strip_debugger
+         || info->discard == discard_all)
+       /* We're stripping all debugging information, so there's no need
+          to read SUB's .debug section.  */
+       subdeb = NULL;
+      else
+       {
+         /* Grab the contents of SUB's .debug section, if any.  */
+         subdeb = bfd_get_section_by_name (sub, ".debug");
+         if (subdeb != NULL && subdeb->size > 0)
+           {
+             /* We use malloc and copy the names into the debug
+                stringtab, rather than bfd_alloc, because I expect
+                that, when linking many files together, many of the
+                strings will be the same.  Storing the strings in the
+                hash table should save space in this case.  */
+             if (!bfd_malloc_and_get_section (sub, subdeb, &debug_contents))
+               goto error_return;
+           }
+       }
 
       csectpp = xcoff_data (sub)->csects;
-
+      lineno_counts = xcoff_data (sub)->lineno_counts;
+      sym_hash = obj_xcoff_sym_hashes (sub);
       symesz = bfd_coff_symesz (sub);
       esym = (bfd_byte *) obj_coff_external_syms (sub);
       esymend = esym + symcount * symesz;
+
       while (esym < esymend)
        {
          struct internal_syment sym;
+         union internal_auxent aux;
+         asection *csect;
+         const char *name;
+         int keep_p;
 
-         bfd_coff_swap_sym_in (sub, (PTR) esym, (PTR) &sym);
+         bfd_coff_swap_sym_in (sub, esym, &sym);
 
-         *debug_index = (unsigned long) -1;
+         /* Read in the csect information, if any.  */
+         if (CSECT_SYM_P (sym.n_sclass))
+           {
+             BFD_ASSERT (sym.n_numaux > 0);
+             bfd_coff_swap_aux_in (sub, esym + symesz * sym.n_numaux,
+                                   sym.n_type, sym.n_sclass,
+                                   sym.n_numaux - 1, sym.n_numaux, &aux);
+           }
 
-         if (sym._n._n_n._n_zeroes == 0
-             && *csectpp != NULL
-             && (! gc
-                 || ((*csectpp)->flags & SEC_MARK) != 0
-                 || *csectpp == bfd_abs_section_ptr)
+         /* If this symbol's name is stored in the debug section,
+            get a pointer to it.  */
+         if (debug_contents != NULL
+             && sym._n._n_n._n_zeroes == 0
              && bfd_coff_symname_in_debug (sub, &sym))
+           name = (const char *) debug_contents + sym._n._n_n._n_offset;
+         else
+           name = NULL;
+
+         /* Decide whether to copy this symbol to the output file.  */
+         csect = *csectpp;
+         keep_p = xcoff_keep_symbol_p (info, sub, &sym, &aux,
+                                       *sym_hash, csect, name);
+         if (keep_p < 0)
+           return FALSE;
+
+         if (!keep_p)
+           /* Use a debug_index of -2 to record that a symbol should
+              be stripped.  */
+           *debug_index = -2;
+         else
            {
-             char *name;
-             bfd_size_type indx;
+             /* See whether we should store the symbol name in the
+                output .debug section.  */
+             if (name != NULL)
+               {
+                 bfd_size_type indx;
 
-             name = (char *) debug_contents + sym._n._n_n._n_offset;
-             indx = _bfd_stringtab_add (debug_strtab, name, true, true);
-             if (indx == (bfd_size_type) -1)
-               goto error_return;
-             *debug_index = indx;
+                 indx = _bfd_stringtab_add (debug_strtab, name, TRUE, TRUE);
+                 if (indx == (bfd_size_type) -1)
+                   goto error_return;
+                 *debug_index = indx;
+               }
+             else
+               *debug_index = -1;
+             if (*sym_hash != 0)
+               (*sym_hash)->flags |= XCOFF_ALLOCATED;
+             if (*lineno_counts > 0)
+               csect->output_section->lineno_count += *lineno_counts;
            }
 
          esym += (sym.n_numaux + 1) * symesz;
          csectpp += sym.n_numaux + 1;
+         sym_hash += sym.n_numaux + 1;
+         lineno_counts += sym.n_numaux + 1;
          debug_index += sym.n_numaux + 1;
        }
 
-      free (debug_contents);
-      debug_contents = NULL;
+      if (debug_contents)
+       {
+         free (debug_contents);
+         debug_contents = NULL;
 
-      /* Clear the size of subdeb, so that it is not included directly
-        in the output file.  */
-      subdeb->_raw_size = 0;
+         /* Clear the size of subdeb, so that it is not included directly
+            in the output file.  */
+         subdeb->size = 0;
+       }
 
       if (! info->keep_memory)
        {
@@ -3189,2950 +3692,2544 @@ bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
     }
 
   if (info->strip != strip_all)
-    xcoff_hash_table (info)->debug_section->_raw_size =
+    xcoff_hash_table (info)->debug_section->size =
       _bfd_stringtab_size (debug_strtab);
 
-  return true;
+  return TRUE;
 
  error_return:
   if (ldinfo.strings != NULL)
     free (ldinfo.strings);
   if (debug_contents != NULL)
     free (debug_contents);
-  return false;
+  return FALSE;
 }
 
-boolean 
-bfd_xcoff_link_generate_rtinit (abfd, init, fini, rtld)
-     bfd *abfd;
-     const char *init;
-     const char *fini;
-     boolean rtld;
+bfd_boolean
+bfd_xcoff_link_generate_rtinit (bfd *abfd,
+                               const char *init,
+                               const char *fini,
+                               bfd_boolean rtld)
 {
   struct bfd_in_memory *bim;
-  
-  bim = ((struct bfd_in_memory *)
-        bfd_malloc ((bfd_size_type) sizeof (struct bfd_in_memory)));
+
+  bim = bfd_malloc ((bfd_size_type) sizeof (* bim));
   if (bim == NULL)
-    return false;
+    return FALSE;
 
   bim->size = 0;
   bim->buffer = 0;
 
   abfd->link_next = 0;
   abfd->format = bfd_object;
-  abfd->iostream = (PTR) bim;
+  abfd->iostream = (void *) bim;
   abfd->flags = BFD_IN_MEMORY;
   abfd->direction = write_direction;
   abfd->where = 0;
 
-  if (false == bfd_xcoff_generate_rtinit (abfd, init, fini, rtld)) 
-    return false;
+  if (! bfd_xcoff_generate_rtinit (abfd, init, fini, rtld))
+    return FALSE;
 
   /* need to reset to unknown or it will not be read back in correctly */
   abfd->format = bfd_unknown;
   abfd->direction = read_direction;
   abfd->where = 0;
 
-  return true;
+  return TRUE;
 }
+\f
+/* Link an input file into the linker output file.  This function
+   handles all the sections and relocations of the input file at once.  */
 
-
-/* Add a symbol to the .loader symbols, if necessary.  */
-
-static boolean
-xcoff_build_ldsyms (h, p)
-     struct xcoff_link_hash_entry *h;
-     PTR p;
+static bfd_boolean
+xcoff_link_input_bfd (struct xcoff_final_link_info *finfo,
+                     bfd *input_bfd)
 {
-  struct xcoff_loader_info *ldinfo = (struct xcoff_loader_info *) p;
-  bfd_size_type amt;
+  bfd *output_bfd;
+  const char *strings;
+  bfd_size_type syment_base;
+  unsigned int n_tmask;
+  unsigned int n_btshft;
+  bfd_boolean copy, hash;
+  bfd_size_type isymesz;
+  bfd_size_type osymesz;
+  bfd_size_type linesz;
+  bfd_byte *esym;
+  bfd_byte *esym_end;
+  struct xcoff_link_hash_entry **sym_hash;
+  struct internal_syment *isymp;
+  asection **csectpp;
+  unsigned int *lineno_counts;
+  long *debug_index;
+  long *indexp;
+  unsigned long output_index;
+  bfd_byte *outsym;
+  unsigned int incls;
+  asection *oline;
+  bfd_boolean keep_syms;
+  asection *o;
 
-  /* __rtinit, this symbol has special handling. */
-  if (h->flags & XCOFF_RTINIT)
-      return true;
+  /* We can just skip DYNAMIC files, unless this is a static link.  */
+  if ((input_bfd->flags & DYNAMIC) != 0
+      && ! finfo->info->static_link)
+    return TRUE;
 
-  /* If this is a final link, and the symbol was defined as a common
-     symbol in a regular object file, and there was no definition in
-     any dynamic object, then the linker will have allocated space for
-     the symbol in a common section but the XCOFF_DEF_REGULAR flag
-     will not have been set.  */
-  if (h->root.type == bfd_link_hash_defined
-      && (h->flags & XCOFF_DEF_REGULAR) == 0
-      && (h->flags & XCOFF_REF_REGULAR) != 0
-      && (h->flags & XCOFF_DEF_DYNAMIC) == 0
-      && (bfd_is_abs_section (h->root.u.def.section)
-         || (h->root.u.def.section->owner->flags & DYNAMIC) == 0))
-    h->flags |= XCOFF_DEF_REGULAR;
+  /* Move all the symbols to the output file.  */
+  output_bfd = finfo->output_bfd;
+  strings = NULL;
+  syment_base = obj_raw_syment_count (output_bfd);
+  isymesz = bfd_coff_symesz (input_bfd);
+  osymesz = bfd_coff_symesz (output_bfd);
+  linesz = bfd_coff_linesz (input_bfd);
+  BFD_ASSERT (linesz == bfd_coff_linesz (output_bfd));
 
-  /* If all defined symbols should be exported, mark them now.  We
-     don't want to export the actual functions, just the function
-     descriptors.  */
-  if (ldinfo->export_defineds
-      && (h->flags & XCOFF_DEF_REGULAR) != 0
-      && h->root.root.string[0] != '.')
-    {
-      boolean export;
-
-      /* We don't export a symbol which is being defined by an object
-        included from an archive which contains a shared object.  The
-        rationale is that if an archive contains both an unshared and
-        a shared object, then there must be some reason that the
-        unshared object is unshared, and we don't want to start
-        providing a shared version of it.  In particular, this solves
-        a bug involving the _savefNN set of functions.  gcc will call
-        those functions without providing a slot to restore the TOC,
-        so it is essential that these functions be linked in directly
-        and not from a shared object, which means that a shared
-        object which also happens to link them in must not export
-        them.  This is confusing, but I haven't been able to think of
-        a different approach.  Note that the symbols can, of course,
-        be exported explicitly.  */
-      export = true;
-      if ((h->root.type == bfd_link_hash_defined
-          || h->root.type == bfd_link_hash_defweak)
-         && h->root.u.def.section->owner != NULL
-         && h->root.u.def.section->owner->my_archive != NULL)
-       {
-         bfd *arbfd, *member;
+  n_tmask = coff_data (input_bfd)->local_n_tmask;
+  n_btshft = coff_data (input_bfd)->local_n_btshft;
 
-         arbfd = h->root.u.def.section->owner->my_archive;
-         member = bfd_openr_next_archived_file (arbfd, (bfd *) NULL);
-         while (member != NULL)
-           {
-             if ((member->flags & DYNAMIC) != 0)
-               {
-                 export = false;
-                 break;
-               }
-             member = bfd_openr_next_archived_file (arbfd, member);
-           }
-       }
+  /* Define macros so that ISFCN, et. al., macros work correctly.  */
+#define N_TMASK n_tmask
+#define N_BTSHFT n_btshft
 
-      if (export)
-       h->flags |= XCOFF_EXPORT;
-    }
+  copy = FALSE;
+  if (! finfo->info->keep_memory)
+    copy = TRUE;
+  hash = TRUE;
+  if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
+    hash = FALSE;
 
-  /* We don't want to garbage collect symbols which are not defined in
-     XCOFF files.  This is a convenient place to mark them.  */
-  if (xcoff_hash_table (ldinfo->info)->gc
-      && (h->flags & XCOFF_MARK) == 0
-      && (h->root.type == bfd_link_hash_defined
-         || h->root.type == bfd_link_hash_defweak)
-      && (h->root.u.def.section->owner == NULL
-         || (h->root.u.def.section->owner->xvec
-             != ldinfo->info->hash->creator)))
-    h->flags |= XCOFF_MARK;
+  if (! _bfd_coff_get_external_symbols (input_bfd))
+    return FALSE;
 
-  /* If this symbol is called and defined in a dynamic object, or it
-     is imported, then we need to set up global linkage code for it.
-     (Unless we did garbage collection and we didn't need this
-     symbol.)  */
-  if ((h->flags & XCOFF_CALLED) != 0
-      && (h->root.type == bfd_link_hash_undefined
-         || h->root.type == bfd_link_hash_undefweak)
-      && h->root.root.string[0] == '.'
-      && h->descriptor != NULL
-      && ((h->descriptor->flags & XCOFF_DEF_DYNAMIC) != 0
-         || ((h->descriptor->flags & XCOFF_IMPORT) != 0
-             && (h->descriptor->flags & XCOFF_DEF_REGULAR) == 0))
-      && (! xcoff_hash_table (ldinfo->info)->gc
-         || (h->flags & XCOFF_MARK) != 0))
+  /* Make one pass over the symbols and assign indices to symbols that
+     we have decided to keep.  Also use create .loader symbol information
+     and update information in hash table entries.  */
+  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
+  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
+  sym_hash = obj_xcoff_sym_hashes (input_bfd);
+  csectpp = xcoff_data (input_bfd)->csects;
+  debug_index = xcoff_data (input_bfd)->debug_indices;
+  isymp = finfo->internal_syms;
+  indexp = finfo->sym_indices;
+  output_index = syment_base;
+  while (esym < esym_end)
     {
-      asection *sec;
-      struct xcoff_link_hash_entry *hds;
+      union internal_auxent aux;
+      int smtyp = 0;
+      int add;
 
-      sec = xcoff_hash_table (ldinfo->info)->linkage_section;
-      h->root.type = bfd_link_hash_defined;
-      h->root.u.def.section = sec;
-      h->root.u.def.value = sec->_raw_size;
-      h->smclas = XMC_GL;
-      h->flags |= XCOFF_DEF_REGULAR;
-      sec->_raw_size += bfd_xcoff_glink_code_size(ldinfo->output_bfd);
-
-      /* The global linkage code requires a TOC entry for the
-         descriptor.  */
-      hds = h->descriptor;
-      BFD_ASSERT ((hds->root.type == bfd_link_hash_undefined
-                  || hds->root.type == bfd_link_hash_undefweak)
-                 && (hds->flags & XCOFF_DEF_REGULAR) == 0);
-      hds->flags |= XCOFF_MARK;
-      if (hds->toc_section == NULL)
-       {
-         int byte_size;
-
-         /* 32 vs 64
-            xcoff32 uses 4 bytes in the toc.
-            xcoff64 uses 8 bytes in the toc.  */
-         if (bfd_xcoff_is_xcoff64 (ldinfo->output_bfd))
-           byte_size = 8;
-         else if (bfd_xcoff_is_xcoff32 (ldinfo->output_bfd))
-           byte_size = 4;
-         else
-           return false;
-
-         hds->toc_section = xcoff_hash_table (ldinfo->info)->toc_section;
-         hds->u.toc_offset = hds->toc_section->_raw_size;
-         hds->toc_section->_raw_size += byte_size;
-         ++xcoff_hash_table (ldinfo->info)->ldrel_count;
-         ++hds->toc_section->reloc_count;
-         hds->indx = -2;
-         hds->flags |= XCOFF_SET_TOC | XCOFF_LDREL;
-
-         /* We need to call xcoff_build_ldsyms recursively here,
-            because we may already have passed hds on the traversal.  */
-         xcoff_build_ldsyms (hds, p);
-       }
-    }
+      bfd_coff_swap_sym_in (input_bfd, (void *) esym, (void *) isymp);
 
-  /* If this symbol is exported, but not defined, we need to try to
-     define it.  */
-  if ((h->flags & XCOFF_EXPORT) != 0
-      && (h->flags & XCOFF_IMPORT) == 0
-      && (h->flags & XCOFF_DEF_REGULAR) == 0
-      && (h->flags & XCOFF_DEF_DYNAMIC) == 0
-      && (h->root.type == bfd_link_hash_undefined
-         || h->root.type == bfd_link_hash_undefweak))
-    {
-      if ((h->flags & XCOFF_DESCRIPTOR) != 0
-         && (h->descriptor->root.type == bfd_link_hash_defined
-             || h->descriptor->root.type == bfd_link_hash_defweak))
+      /* Read in the csect information, if any.  */
+      if (CSECT_SYM_P (isymp->n_sclass))
        {
-         asection *sec;
-
-         /* This is an undefined function descriptor associated with
-             a defined entry point.  We can build up a function
-             descriptor ourselves.  Believe it or not, the AIX linker
-             actually does this, and there are cases where we need to
-             do it as well.  */
-         sec = xcoff_hash_table (ldinfo->info)->descriptor_section;
-         h->root.type = bfd_link_hash_defined;
-         h->root.u.def.section = sec;
-         h->root.u.def.value = sec->_raw_size;
-         h->smclas = XMC_DS;
-         h->flags |= XCOFF_DEF_REGULAR;
-
-         /* The size of the function descriptor depends if this is an
-            xcoff32 (12) or xcoff64 (24).  */
-         sec->_raw_size +=
-           bfd_xcoff_function_descriptor_size(ldinfo->output_bfd);
-
-         /* A function descriptor uses two relocs: one for the
-            associated code, and one for the TOC address.  */
-         xcoff_hash_table (ldinfo->info)->ldrel_count += 2;
-         sec->reloc_count += 2;
+         BFD_ASSERT (isymp->n_numaux > 0);
+         bfd_coff_swap_aux_in (input_bfd,
+                               (void *) (esym + isymesz * isymp->n_numaux),
+                               isymp->n_type, isymp->n_sclass,
+                               isymp->n_numaux - 1, isymp->n_numaux,
+                               (void *) &aux);
 
-         /* We handle writing out the contents of the descriptor in
-            xcoff_write_global_symbol.  */
+         smtyp = SMTYP_SMTYP (aux.x_csect.x_smtyp);
        }
-      else
+
+      /* If this symbol is in the .loader section, swap out the
+        .loader symbol information.  If this is an external symbol
+        reference to a defined symbol, though, then wait until we get
+        to the definition.  */
+      if (EXTERN_SYM_P (isymp->n_sclass)
+         && *sym_hash != NULL
+         && (*sym_hash)->ldsym != NULL
+         && xcoff_final_definition_p (input_bfd, *sym_hash, *csectpp))
        {
-         (*_bfd_error_handler)
-           (_("warning: attempt to export undefined symbol `%s'"),
-            h->root.root.string);
-         h->ldsym = NULL;
-         return true;
-       }
-    }
+         struct xcoff_link_hash_entry *h;
+         struct internal_ldsym *ldsym;
 
-  /* If this is still a common symbol, and it wasn't garbage
-     collected, we need to actually allocate space for it in the .bss
-     section.  */
-  if (h->root.type == bfd_link_hash_common
-      && (! xcoff_hash_table (ldinfo->info)->gc
-         || (h->flags & XCOFF_MARK) != 0)
-      && h->root.u.c.p->section->_raw_size == 0)
-    {
-      BFD_ASSERT (bfd_is_com_section (h->root.u.c.p->section));
-      h->root.u.c.p->section->_raw_size = h->root.u.c.size;
-    }
+         h = *sym_hash;
+         ldsym = h->ldsym;
+         if (isymp->n_scnum > 0)
+           {
+             ldsym->l_scnum = (*csectpp)->output_section->target_index;
+             ldsym->l_value = (isymp->n_value
+                               + (*csectpp)->output_section->vma
+                               + (*csectpp)->output_offset
+                               - (*csectpp)->vma);
+           }
+         else
+           {
+             ldsym->l_scnum = isymp->n_scnum;
+             ldsym->l_value = isymp->n_value;
+           }
 
-  /* We need to add a symbol to the .loader section if it is mentioned
-     in a reloc which we are copying to the .loader section and it was
-     not defined or common, or if it is the entry point, or if it is
-     being exported.  */
+         ldsym->l_smtype = smtyp;
+         if (((h->flags & XCOFF_DEF_REGULAR) == 0
+              && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
+             || (h->flags & XCOFF_IMPORT) != 0)
+           ldsym->l_smtype |= L_IMPORT;
+         if (((h->flags & XCOFF_DEF_REGULAR) != 0
+              && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
+             || (h->flags & XCOFF_EXPORT) != 0)
+           ldsym->l_smtype |= L_EXPORT;
+         if ((h->flags & XCOFF_ENTRY) != 0)
+           ldsym->l_smtype |= L_ENTRY;
+         if (isymp->n_sclass == C_AIX_WEAKEXT)
+           ldsym->l_smtype |= L_WEAK;
 
-  if (((h->flags & XCOFF_LDREL) == 0
-       || h->root.type == bfd_link_hash_defined
-       || h->root.type == bfd_link_hash_defweak
-       || h->root.type == bfd_link_hash_common)
-      && (h->flags & XCOFF_ENTRY) == 0
-      && (h->flags & XCOFF_EXPORT) == 0)
-    {
-      h->ldsym = NULL;
-      return true;
-    }
+         ldsym->l_smclas = aux.x_csect.x_smclas;
 
-  /* We don't need to add this symbol if we did garbage collection and
-     we did not mark this symbol.  */
-  if (xcoff_hash_table (ldinfo->info)->gc
-      && (h->flags & XCOFF_MARK) == 0)
-    {
-      h->ldsym = NULL;
-      return true;
-    }
+         if (ldsym->l_ifile == (bfd_size_type) -1)
+           ldsym->l_ifile = 0;
+         else if (ldsym->l_ifile == 0)
+           {
+             if ((ldsym->l_smtype & L_IMPORT) == 0)
+               ldsym->l_ifile = 0;
+             else
+               {
+                 bfd *impbfd;
 
-  /* We may have already processed this symbol due to the recursive
-     call above.  */
-  if ((h->flags & XCOFF_BUILT_LDSYM) != 0)
-    return true;
+                 if (h->root.type == bfd_link_hash_defined
+                     || h->root.type == bfd_link_hash_defweak)
+                   impbfd = h->root.u.def.section->owner;
+                 else if (h->root.type == bfd_link_hash_undefined
+                          || h->root.type == bfd_link_hash_undefweak)
+                   impbfd = h->root.u.undef.abfd;
+                 else
+                   impbfd = NULL;
 
-  /* We need to add this symbol to the .loader symbols.  */
+                 if (impbfd == NULL)
+                   ldsym->l_ifile = 0;
+                 else
+                   {
+                     BFD_ASSERT (impbfd->xvec == finfo->output_bfd->xvec);
+                     ldsym->l_ifile = xcoff_data (impbfd)->import_file_id;
+                   }
+               }
+           }
 
-  BFD_ASSERT (h->ldsym == NULL);
-  amt = sizeof (struct internal_ldsym);
-  h->ldsym = (struct internal_ldsym *) bfd_zalloc (ldinfo->output_bfd, amt);
-  if (h->ldsym == NULL)
-    {
-      ldinfo->failed = true;
-      return false;
-    }
+         ldsym->l_parm = 0;
 
-  if ((h->flags & XCOFF_IMPORT) != 0)
-    h->ldsym->l_ifile = h->ldindx;
+         BFD_ASSERT (h->ldindx >= 0);
+         bfd_xcoff_swap_ldsym_out (finfo->output_bfd, ldsym,
+                                   (finfo->ldsym
+                                    + ((h->ldindx - 3)
+                                       * bfd_xcoff_ldsymsz (finfo->output_bfd))));
+         h->ldsym = NULL;
 
-  /* The first 3 symbol table indices are reserved to indicate the
-     data, text and bss sections.  */
-  h->ldindx = ldinfo->ldsym_count + 3;
+         /* Fill in snentry now that we know the target_index.  */
+         if ((h->flags & XCOFF_ENTRY) != 0
+             && (h->root.type == bfd_link_hash_defined
+                 || h->root.type == bfd_link_hash_defweak))
+           {
+             xcoff_data (output_bfd)->snentry =
+               h->root.u.def.section->output_section->target_index;
+           }
+       }
 
-  ++ldinfo->ldsym_count;
+      add = 1 + isymp->n_numaux;
 
-  if (false == bfd_xcoff_put_ldsymbol_name (ldinfo->output_bfd, ldinfo,
-                                           h->ldsym,
-                                           h->root.root.string))
-    {
-      return false;
-    }
+      if (*debug_index == -2)
+       /* We've decided to strip this symbol.  */
+       *indexp = -1;
+      else
+       {
+         /* Assign the next unused index to this symbol.  */
+         *indexp = output_index;
 
-  h->flags |= XCOFF_BUILT_LDSYM;
-
-  return true;
-}
-\f
-/* Do the final link step.  */
-
-boolean
-_bfd_xcoff_bfd_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  bfd_size_type symesz;
-  struct xcoff_final_link_info finfo;
-  asection *o;
-  struct bfd_link_order *p;
-  bfd_size_type max_contents_size;
-  bfd_size_type max_sym_count;
-  bfd_size_type max_lineno_count;
-  bfd_size_type max_reloc_count;
-  bfd_size_type max_output_reloc_count;
-  file_ptr rel_filepos;
-  unsigned int relsz;
-  file_ptr line_filepos;
-  unsigned int linesz;
-  bfd *sub;
-  bfd_byte *external_relocs = NULL;
-  char strbuf[STRING_SIZE_SIZE];
-  file_ptr pos;
-  bfd_size_type amt;
-
-  if (info->shared)
-    abfd->flags |= DYNAMIC;
-
-  symesz = bfd_coff_symesz (abfd);
+         if (EXTERN_SYM_P (isymp->n_sclass))
+           {
+             BFD_ASSERT (*sym_hash != NULL);
+             (*sym_hash)->indx = output_index;
+           }
 
-  finfo.info = info;
-  finfo.output_bfd = abfd;
-  finfo.strtab = NULL;
-  finfo.section_info = NULL;
-  finfo.last_file_index = -1;
-  finfo.toc_symindx = -1;
-  finfo.internal_syms = NULL;
-  finfo.sym_indices = NULL;
-  finfo.outsyms = NULL;
-  finfo.linenos = NULL;
-  finfo.contents = NULL;
-  finfo.external_relocs = NULL;
+         /* If this is a symbol in the TOC which we may have merged
+            (class XMC_TC), remember the symbol index of the TOC
+            symbol.  */
+         if (isymp->n_sclass == C_HIDEXT
+             && aux.x_csect.x_smclas == XMC_TC
+             && *sym_hash != NULL)
+           {
+             BFD_ASSERT (((*sym_hash)->flags & XCOFF_SET_TOC) == 0);
+             BFD_ASSERT ((*sym_hash)->toc_section != NULL);
+             (*sym_hash)->u.toc_indx = output_index;
+           }
 
-  finfo.ldsym = (xcoff_hash_table (info)->loader_section->contents
-                + bfd_xcoff_ldhdrsz (abfd));
-  finfo.ldrel = (xcoff_hash_table (info)->loader_section->contents
-                + bfd_xcoff_ldhdrsz(abfd)
-                + (xcoff_hash_table (info)->ldhdr.l_nsyms
-                   * bfd_xcoff_ldsymsz(abfd)));
+         output_index += add;
+       }
 
-  xcoff_data (abfd)->coff.link_info = info;
+      esym += add * isymesz;
+      isymp += add;
+      csectpp += add;
+      sym_hash += add;
+      debug_index += add;
+      ++indexp;
+      for (--add; add > 0; --add)
+       *indexp++ = -1;
+    }
 
-  finfo.strtab = _bfd_stringtab_init ();
-  if (finfo.strtab == NULL)
-    goto error_return;
+  /* Now write out the symbols that we decided to keep.  */
 
-  /* Count the line number and relocation entries required for the
-     output file.  Determine a few maximum sizes.  */
-  max_contents_size = 0;
-  max_lineno_count = 0;
-  max_reloc_count = 0;
-  for (o = abfd->sections; o != NULL; o = o->next)
+  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
+  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
+  isymp = finfo->internal_syms;
+  indexp = finfo->sym_indices;
+  csectpp = xcoff_data (input_bfd)->csects;
+  lineno_counts = xcoff_data (input_bfd)->lineno_counts;
+  debug_index = xcoff_data (input_bfd)->debug_indices;
+  outsym = finfo->outsyms;
+  incls = 0;
+  oline = NULL;
+  while (esym < esym_end)
     {
-      o->reloc_count = 0;
-      o->lineno_count = 0;
-      for (p = o->link_order_head; p != NULL; p = p->next)
-       {
-         if (p->type == bfd_indirect_link_order)
-           {
-             asection *sec;
+      int add;
 
-             sec = p->u.indirect.section;
+      add = 1 + isymp->n_numaux;
 
-             /* Mark all sections which are to be included in the
-                link.  This will normally be every section.  We need
-                to do this so that we can identify any sections which
-                the linker has decided to not include.  */
-             sec->linker_mark = true;
+      if (*indexp < 0)
+       esym += add * isymesz;
+      else
+       {
+         struct internal_syment isym;
+         int i;
 
-             if (info->strip == strip_none
-                 || info->strip == strip_some)
-               o->lineno_count += sec->lineno_count;
+         /* Adjust the symbol in order to output it.  */
+         isym = *isymp;
+         if (isym._n._n_n._n_zeroes == 0
+             && isym._n._n_n._n_offset != 0)
+           {
+             /* This symbol has a long name.  Enter it in the string
+                table we are building.  If *debug_index != -1, the
+                name has already been entered in the .debug section.  */
+             if (*debug_index >= 0)
+               isym._n._n_n._n_offset = *debug_index;
+             else
+               {
+                 const char *name;
+                 bfd_size_type indx;
 
-             o->reloc_count += sec->reloc_count;
+                 name = _bfd_coff_internal_syment_name (input_bfd, &isym, NULL);
 
-             if (sec->_raw_size > max_contents_size)
-               max_contents_size = sec->_raw_size;
-             if (sec->lineno_count > max_lineno_count)
-               max_lineno_count = sec->lineno_count;
-             if (coff_section_data (sec->owner, sec) != NULL
-                 && xcoff_section_data (sec->owner, sec) != NULL
-                 && (xcoff_section_data (sec->owner, sec)->lineno_count
-                     > max_lineno_count))
-               max_lineno_count =
-                 xcoff_section_data (sec->owner, sec)->lineno_count;
-             if (sec->reloc_count > max_reloc_count)
-               max_reloc_count = sec->reloc_count;
+                 if (name == NULL)
+                   return FALSE;
+                 indx = _bfd_stringtab_add (finfo->strtab, name, hash, copy);
+                 if (indx == (bfd_size_type) -1)
+                   return FALSE;
+                 isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
+               }
            }
-         else if (p->type == bfd_section_reloc_link_order
-                  || p->type == bfd_symbol_reloc_link_order)
-           ++o->reloc_count;
-       }
-    }
-
-  /* Compute the file positions for all the sections.  */
-  if (abfd->output_has_begun)
-    {
-      if (xcoff_hash_table (info)->file_align != 0)
-       abort ();
-    }
-  else
-    {
-      bfd_vma file_align;
 
-      file_align = xcoff_hash_table (info)->file_align;
-      if (file_align != 0)
-       {
-         boolean saw_contents;
-         int indx;
-         asection **op;
-         file_ptr sofar;
-         
-         /* Insert .pad sections before every section which has
-             contents and is loaded, if it is preceded by some other
-             section which has contents and is loaded.  */
-         saw_contents = true;
-         for (op = &abfd->sections; *op != NULL; op = &(*op)->next)
+         /* The value of a C_FILE symbol is the symbol index of the
+            next C_FILE symbol.  The value of the last C_FILE symbol
+            is -1.  We try to get this right, below, just before we
+            write the symbols out, but in the general case we may
+            have to write the symbol out twice.  */
+         if (isym.n_sclass == C_FILE)
            {
-             if (strcmp ((*op)->name, ".pad") == 0)
-               saw_contents = false;
-             else if (((*op)->flags & SEC_HAS_CONTENTS) != 0
-                      && ((*op)->flags & SEC_LOAD) != 0)
+             if (finfo->last_file_index != -1
+                 && finfo->last_file.n_value != (bfd_vma) *indexp)
                {
-                 if (! saw_contents)
-                   saw_contents = true;
+                 /* We must correct the value of the last C_FILE entry.  */
+                 finfo->last_file.n_value = *indexp;
+                 if ((bfd_size_type) finfo->last_file_index >= syment_base)
+                   {
+                     /* The last C_FILE symbol is in this input file.  */
+                     bfd_coff_swap_sym_out (output_bfd,
+                                            (void *) &finfo->last_file,
+                                            (void *) (finfo->outsyms
+                                                   + ((finfo->last_file_index
+                                                       - syment_base)
+                                                      * osymesz)));
+                   }
                  else
                    {
-                     asection *n, **st;
-                     
-                     /* Create a pad section and place it before the section
-                        that needs padding.  This requires unlinking and 
-                        relinking the bfd's section list.  */
-                     
-                     st = abfd->section_tail;
-                     n = bfd_make_section_anyway (abfd, ".pad");
-                     n->flags = SEC_HAS_CONTENTS;
-                     n->alignment_power = 0; 
-
-                     BFD_ASSERT (*st == n);
-                     bfd_section_list_remove (abfd, st);
-                     bfd_section_list_insert (abfd, op, n);
-
-                     op = &n->next;
-                     saw_contents = false;
+                     /* We have already written out the last C_FILE
+                        symbol.  We need to write it out again.  We
+                        borrow *outsym temporarily.  */
+                     file_ptr pos;
+
+                     bfd_coff_swap_sym_out (output_bfd,
+                                            (void *) &finfo->last_file,
+                                            (void *) outsym);
+
+                     pos = obj_sym_filepos (output_bfd);
+                     pos += finfo->last_file_index * osymesz;
+                     if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+                         || (bfd_bwrite (outsym, osymesz, output_bfd)
+                             != osymesz))
+                       return FALSE;
                    }
                }
+
+             finfo->last_file_index = *indexp;
+             finfo->last_file = isym;
            }
-         
-         /* Reset the section indices after inserting the new
-             sections.  */
-         indx = 0;
-         for (o = abfd->sections; o != NULL; o = o->next)
+
+         /* The value of a C_BINCL or C_EINCL symbol is a file offset
+            into the line numbers.  We update the symbol values when
+            we handle the line numbers.  */
+         if (isym.n_sclass == C_BINCL
+             || isym.n_sclass == C_EINCL)
            {
-             ++indx;
-             o->target_index = indx;
+             isym.n_value = finfo->line_filepos;
+             ++incls;
            }
-         BFD_ASSERT ((unsigned int) indx == abfd->section_count);
-
-         /* Work out appropriate sizes for the .pad sections to force
-             each section to land on a page boundary.  This bit of
-             code knows what compute_section_file_positions is going
-             to do.  */
-         sofar = bfd_coff_filhsz (abfd);
-         sofar += bfd_coff_aoutsz (abfd);
-         sofar += abfd->section_count * bfd_coff_scnhsz (abfd);
-         for (o = abfd->sections; o != NULL; o = o->next)
-           if ((bfd_xcoff_is_reloc_count_overflow
-                (abfd, (bfd_vma) o->reloc_count))
-               || (bfd_xcoff_is_lineno_count_overflow
-                   (abfd, (bfd_vma) o->lineno_count)))
-             /* 64 does not overflow, need to check if 32 does */
-             sofar += bfd_coff_scnhsz (abfd);
-
-         for (o = abfd->sections; o != NULL; o = o->next)
+         /* The value of a C_BSTAT symbol is the symbol table
+            index of the containing csect.  */
+         else if (isym.n_sclass == C_BSTAT)
            {
-             if (strcmp (o->name, ".pad") == 0)
-               {
-                 bfd_vma pageoff;
+             bfd_vma indx;
 
-                 BFD_ASSERT (o->_raw_size == 0);
-                 pageoff = sofar & (file_align - 1);
-                 if (pageoff != 0)
-                   {
-                     o->_raw_size = file_align - pageoff;
-                     sofar += file_align - pageoff;
-                     o->flags |= SEC_HAS_CONTENTS;
-                   }
-               }
-             else
+             indx = isym.n_value;
+             if (indx < obj_raw_syment_count (input_bfd))
                {
-                 if ((o->flags & SEC_HAS_CONTENTS) != 0)
-                   sofar += BFD_ALIGN (o->_raw_size,
-                                       1 << o->alignment_power);
+                 long symindx;
+
+                 symindx = finfo->sym_indices[indx];
+                 if (symindx < 0)
+                   isym.n_value = 0;
+                 else
+                   isym.n_value = symindx;
                }
            }
-       }
+         else if (isym.n_sclass != C_ESTAT
+                  && isym.n_sclass != C_DECL
+                  && isym.n_scnum > 0)
+           {
+             isym.n_scnum = (*csectpp)->output_section->target_index;
+             isym.n_value += ((*csectpp)->output_section->vma
+                              + (*csectpp)->output_offset
+                              - (*csectpp)->vma);
+           }
 
-      if (! bfd_coff_compute_section_file_positions (abfd))
-       goto error_return;
-    }
+         /* Output the symbol.  */
+         bfd_coff_swap_sym_out (output_bfd, (void *) &isym, (void *) outsym);
 
-  /* Allocate space for the pointers we need to keep for the relocs.  */
-  {
-    unsigned int i;
+         esym += isymesz;
+         outsym += osymesz;
 
-    /* We use section_count + 1, rather than section_count, because
-       the target_index fields are 1 based.  */
-    amt = abfd->section_count + 1;
-    amt *= sizeof (struct xcoff_link_section_info);
-    finfo.section_info = (struct xcoff_link_section_info *) bfd_malloc (amt);
-    if (finfo.section_info == NULL)
-      goto error_return;
-    for (i = 0; i <= abfd->section_count; i++)
-      {
-       finfo.section_info[i].relocs = NULL;
-       finfo.section_info[i].rel_hashes = NULL;
-       finfo.section_info[i].toc_rel_hashes = NULL;
-      }
-  }
-
-  /* Set the file positions for the relocs.  */
-  rel_filepos = obj_relocbase (abfd);
-  relsz = bfd_coff_relsz (abfd);
-  max_output_reloc_count = 0;
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      if (o->reloc_count == 0)
-       o->rel_filepos = 0;
-      else
-       {
-         /* A stripped file has no relocs.  However, we still
-             allocate the buffers, so that later code doesn't have to
-             worry about whether we are stripping or not.  */
-         if (info->strip == strip_all)
-           o->rel_filepos = 0;
-         else
+         for (i = 0; i < isymp->n_numaux && esym < esym_end; i++)
            {
-             o->flags |= SEC_RELOC;
-             o->rel_filepos = rel_filepos;
-             rel_filepos += o->reloc_count * relsz;
-           }
+             union internal_auxent aux;
 
-         /* We don't know the indices of global symbols until we have
-             written out all the local symbols.  For each section in
-             the output file, we keep an array of pointers to hash
-             table entries.  Each entry in the array corresponds to a
-             reloc.  When we find a reloc against a global symbol, we
-             set the corresponding entry in this array so that we can
-             fix up the symbol index after we have written out all the
-             local symbols.
+             bfd_coff_swap_aux_in (input_bfd, (void *) esym, isymp->n_type,
+                                   isymp->n_sclass, i, isymp->n_numaux,
+                                   (void *) &aux);
 
-            Because of this problem, we also keep the relocs in
-            memory until the end of the link.  This wastes memory.
-            We could backpatch the file later, I suppose, although it
-            would be slow.  */
-         amt = o->reloc_count;
-         amt *= sizeof (struct internal_reloc);
-         finfo.section_info[o->target_index].relocs =
-           (struct internal_reloc *) bfd_malloc (amt);
+             if (isymp->n_sclass == C_FILE)
+               {
+                 /* This is the file name (or some comment put in by
+                    the compiler).  If it is long, we must put it in
+                    the string table.  */
+                 if (aux.x_file.x_n.x_zeroes == 0
+                     && aux.x_file.x_n.x_offset != 0)
+                   {
+                     const char *filename;
+                     bfd_size_type indx;
 
-         amt = o->reloc_count;
-         amt *= sizeof (struct xcoff_link_hash_entry *);
-         finfo.section_info[o->target_index].rel_hashes =
-           (struct xcoff_link_hash_entry **) bfd_malloc (amt);
+                     BFD_ASSERT (aux.x_file.x_n.x_offset
+                                 >= STRING_SIZE_SIZE);
+                     if (strings == NULL)
+                       {
+                         strings = _bfd_coff_read_string_table (input_bfd);
+                         if (strings == NULL)
+                           return FALSE;
+                       }
+                     filename = strings + aux.x_file.x_n.x_offset;
+                     indx = _bfd_stringtab_add (finfo->strtab, filename,
+                                                hash, copy);
+                     if (indx == (bfd_size_type) -1)
+                       return FALSE;
+                     aux.x_file.x_n.x_offset = STRING_SIZE_SIZE + indx;
+                   }
+               }
+             else if (CSECT_SYM_P (isymp->n_sclass)
+                      && i + 1 == isymp->n_numaux)
+               {
 
-         if (finfo.section_info[o->target_index].relocs == NULL
-             || finfo.section_info[o->target_index].rel_hashes == NULL)
-           goto error_return;
+                 /* We don't support type checking.  I don't know if
+                    anybody does.  */
+                 aux.x_csect.x_parmhash = 0;
+                 /* I don't think anybody uses these fields, but we'd
+                    better clobber them just in case.  */
+                 aux.x_csect.x_stab = 0;
+                 aux.x_csect.x_snstab = 0;
 
-         if (o->reloc_count > max_output_reloc_count)
-           max_output_reloc_count = o->reloc_count;
-       }
-    }
+                 if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_LD)
+                   {
+                     unsigned long indx;
 
-  /* We now know the size of the relocs, so we can determine the file
-     positions of the line numbers.  */
-  line_filepos = rel_filepos;
-  finfo.line_filepos = line_filepos;
-  linesz = bfd_coff_linesz (abfd);
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      if (o->lineno_count == 0)
-       o->line_filepos = 0;
-      else
-       {
-         o->line_filepos = line_filepos;
-         line_filepos += o->lineno_count * linesz;
-       }
+                     indx = aux.x_csect.x_scnlen.l;
+                     if (indx < obj_raw_syment_count (input_bfd))
+                       {
+                         long symindx;
 
-      /* Reset the reloc and lineno counts, so that we can use them to
-        count the number of entries we have output so far.  */
-      o->reloc_count = 0;
-      o->lineno_count = 0;
-    }
+                         symindx = finfo->sym_indices[indx];
+                         if (symindx < 0)
+                           {
+                             aux.x_csect.x_scnlen.l = 0;
+                           }
+                         else
+                           {
+                             aux.x_csect.x_scnlen.l = symindx;
+                           }
+                       }
+                   }
+               }
+             else if (isymp->n_sclass != C_STAT || isymp->n_type != T_NULL)
+               {
+                 unsigned long indx;
 
-  obj_sym_filepos (abfd) = line_filepos;
+                 if (ISFCN (isymp->n_type)
+                     || ISTAG (isymp->n_sclass)
+                     || isymp->n_sclass == C_BLOCK
+                     || isymp->n_sclass == C_FCN)
+                   {
+                     indx = aux.x_sym.x_fcnary.x_fcn.x_endndx.l;
+                     if (indx > 0
+                         && indx < obj_raw_syment_count (input_bfd))
+                       {
+                         /* We look forward through the symbol for
+                            the index of the next symbol we are going
+                            to include.  I don't know if this is
+                            entirely right.  */
+                         while (finfo->sym_indices[indx] < 0
+                                && indx < obj_raw_syment_count (input_bfd))
+                           ++indx;
+                         if (indx >= obj_raw_syment_count (input_bfd))
+                           indx = output_index;
+                         else
+                           indx = finfo->sym_indices[indx];
+                         aux.x_sym.x_fcnary.x_fcn.x_endndx.l = indx;
 
-  /* Figure out the largest number of symbols in an input BFD.  Take
-     the opportunity to clear the output_has_begun fields of all the
-     input BFD's.  We want at least 6 symbols, since that is the
-     number which xcoff_write_global_symbol may need.  */
-  max_sym_count = 6;
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      bfd_size_type sz;
+                       }
+                   }
 
-      sub->output_has_begun = false;
-      sz = obj_raw_syment_count (sub);
-      if (sz > max_sym_count)
-       max_sym_count = sz;
-    }
+                 indx = aux.x_sym.x_tagndx.l;
+                 if (indx > 0 && indx < obj_raw_syment_count (input_bfd))
+                   {
+                     long symindx;
 
-  /* Allocate some buffers used while linking.  */
-  amt = max_sym_count * sizeof (struct internal_syment);
-  finfo.internal_syms = (struct internal_syment *) bfd_malloc (amt);
+                     symindx = finfo->sym_indices[indx];
+                     if (symindx < 0)
+                       aux.x_sym.x_tagndx.l = 0;
+                     else
+                       aux.x_sym.x_tagndx.l = symindx;
+                   }
 
-  amt = max_sym_count * sizeof (long);
-  finfo.sym_indices = (long *) bfd_malloc (amt);
+               }
 
-  amt = (max_sym_count + 1) * symesz;
-  finfo.outsyms = (bfd_byte *) bfd_malloc (amt);
+             /* Copy over the line numbers, unless we are stripping
+                them.  We do this on a symbol by symbol basis in
+                order to more easily handle garbage collection.  */
+             if (CSECT_SYM_P (isymp->n_sclass)
+                 && i == 0
+                 && isymp->n_numaux > 1
+                 && ISFCN (isymp->n_type)
+                 && aux.x_sym.x_fcnary.x_fcn.x_lnnoptr != 0)
+               {
+                 if (*lineno_counts == 0)
+                   aux.x_sym.x_fcnary.x_fcn.x_lnnoptr = 0;
+                 else
+                   {
+                     asection *enclosing;
+                     unsigned int enc_count;
+                     bfd_signed_vma linoff;
+                     struct internal_lineno lin;
+                     bfd_byte *linp;
+                     bfd_byte *linpend;
+                     bfd_vma offset;
+                     file_ptr pos;
+                     bfd_size_type amt;
 
-  amt = max_lineno_count * bfd_coff_linesz (abfd);
-  finfo.linenos = (bfd_byte *) bfd_malloc (amt);
+                     /* Read in the enclosing section's line-number
+                        information, if we haven't already.  */
+                     o = *csectpp;
+                     enclosing = xcoff_section_data (abfd, o)->enclosing;
+                     enc_count = xcoff_section_data (abfd, o)->lineno_count;
+                     if (oline != enclosing)
+                       {
+                         pos = enclosing->line_filepos;
+                         amt = linesz * enc_count;
+                         if (bfd_seek (input_bfd, pos, SEEK_SET) != 0
+                             || (bfd_bread (finfo->linenos, amt, input_bfd)
+                                 != amt))
+                           return FALSE;
+                         oline = enclosing;
+                       }
 
-  amt = max_contents_size;
-  finfo.contents = (bfd_byte *) bfd_malloc (amt);
+                     /* Copy across the first entry, adjusting its
+                        symbol index.  */
+                     linoff = (aux.x_sym.x_fcnary.x_fcn.x_lnnoptr
+                               - enclosing->line_filepos);
+                     linp = finfo->linenos + linoff;
+                     bfd_coff_swap_lineno_in (input_bfd, linp, &lin);
+                     lin.l_addr.l_symndx = *indexp;
+                     bfd_coff_swap_lineno_out (output_bfd, &lin, linp);
+                     linp += linesz;
+
+                     /* Copy the other entries, adjusting their addresses.  */
+                     linpend = linp + *lineno_counts * linesz;
+                     offset = (o->output_section->vma
+                               + o->output_offset
+                               - o->vma);
+                     for (; linp < linpend; linp += linesz)
+                       {
+                         bfd_coff_swap_lineno_in (input_bfd, linp, &lin);
+                         lin.l_addr.l_paddr += offset;
+                         bfd_coff_swap_lineno_out (output_bfd, &lin, linp);
+                       }
 
-  amt = max_reloc_count * relsz;
-  finfo.external_relocs = (bfd_byte *) bfd_malloc (amt);
+                     /* Write out the entries we've just processed.  */
+                     pos = (o->output_section->line_filepos
+                            + o->output_section->lineno_count * linesz);
+                     amt = linesz * *lineno_counts;
+                     if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+                         || bfd_bwrite (finfo->linenos + linoff,
+                                        amt, output_bfd) != amt)
+                       return FALSE;
+                     o->output_section->lineno_count += *lineno_counts;
 
-  if ((finfo.internal_syms == NULL && max_sym_count > 0)
-      || (finfo.sym_indices == NULL && max_sym_count > 0)
-      || finfo.outsyms == NULL
-      || (finfo.linenos == NULL && max_lineno_count > 0)
-      || (finfo.contents == NULL && max_contents_size > 0)
-      || (finfo.external_relocs == NULL && max_reloc_count > 0))
-    goto error_return;
+                     /* Record the offset of the symbol's line numbers
+                        in the output file.  */
+                     aux.x_sym.x_fcnary.x_fcn.x_lnnoptr = pos;
 
-  obj_raw_syment_count (abfd) = 0;
-  xcoff_data (abfd)->toc = (bfd_vma) -1;
+                     if (incls > 0)
+                       {
+                         struct internal_syment *iisp, *iispend;
+                         long *iindp;
+                         bfd_byte *oos;
+                         bfd_vma range_start, range_end;
+                         int iiadd;
+
+                         /* Update any C_BINCL or C_EINCL symbols
+                            that refer to a line number in the
+                            range we just output.  */
+                         iisp = finfo->internal_syms;
+                         iispend = iisp + obj_raw_syment_count (input_bfd);
+                         iindp = finfo->sym_indices;
+                         oos = finfo->outsyms;
+                         range_start = enclosing->line_filepos + linoff;
+                         range_end = range_start + *lineno_counts * linesz;
+                         while (iisp < iispend)
+                           {
+                             if (*iindp >= 0
+                                 && (iisp->n_sclass == C_BINCL
+                                     || iisp->n_sclass == C_EINCL)
+                                 && iisp->n_value >= range_start
+                                 && iisp->n_value < range_end)
+                               {
+                                 struct internal_syment iis;
+
+                                 bfd_coff_swap_sym_in (output_bfd, oos, &iis);
+                                 iis.n_value = (iisp->n_value
+                                                - range_start
+                                                + pos);
+                                 bfd_coff_swap_sym_out (output_bfd,
+                                                        &iis, oos);
+                                 --incls;
+                               }
 
-  /* We now know the position of everything in the file, except that
-     we don't know the size of the symbol table and therefore we don't
-     know where the string table starts.  We just build the string
-     table in memory as we go along.  We process all the relocations
-     for a single input file at once.  */
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      for (p = o->link_order_head; p != NULL; p = p->next)
-       {
-         if (p->type == bfd_indirect_link_order
-             && p->u.indirect.section->owner->xvec == abfd->xvec)
-           {
-             sub = p->u.indirect.section->owner;
-             if (! sub->output_has_begun)
-               {
-                 if (! xcoff_link_input_bfd (&finfo, sub))
-                   goto error_return;
-                 sub->output_has_begun = true;
+                             iiadd = 1 + iisp->n_numaux;
+                             if (*iindp >= 0)
+                               oos += iiadd * osymesz;
+                             iisp += iiadd;
+                             iindp += iiadd;
+                           }
+                       }
+                   }
                }
-           }
-         else if (p->type == bfd_section_reloc_link_order
-                  || p->type == bfd_symbol_reloc_link_order)
-           {
-             if (! xcoff_reloc_link_order (abfd, &finfo, o, p))
-               goto error_return;
-           }
-         else
-           {
-             if (! _bfd_default_link_order (abfd, info, o, p))
-               goto error_return;
+
+             bfd_coff_swap_aux_out (output_bfd, (void *) &aux, isymp->n_type,
+                                    isymp->n_sclass, i, isymp->n_numaux,
+                                    (void *) outsym);
+             outsym += osymesz;
+             esym += isymesz;
            }
        }
-    }
-
-
-  /* Free up the buffers used by xcoff_link_input_bfd.  */
 
-  if (finfo.internal_syms != NULL)
-    {
-      free (finfo.internal_syms);
-      finfo.internal_syms = NULL;
+      indexp += add;
+      isymp += add;
+      csectpp += add;
+      lineno_counts += add;
+      debug_index += add;
     }
-  if (finfo.sym_indices != NULL)
-    {
-      free (finfo.sym_indices);
-      finfo.sym_indices = NULL;
-    }
-  if (finfo.linenos != NULL)
-    {
-      free (finfo.linenos);
-      finfo.linenos = NULL;
-    }
-  if (finfo.contents != NULL)
-    {
-      free (finfo.contents);
-      finfo.contents = NULL;
-    }
-  if (finfo.external_relocs != NULL)
+
+  /* If we swapped out a C_FILE symbol, guess that the next C_FILE
+     symbol will be the first symbol in the next input file.  In the
+     normal case, this will save us from writing out the C_FILE symbol
+     again.  */
+  if (finfo->last_file_index != -1
+      && (bfd_size_type) finfo->last_file_index >= syment_base)
     {
-      free (finfo.external_relocs);
-      finfo.external_relocs = NULL;
+      finfo->last_file.n_value = output_index;
+      bfd_coff_swap_sym_out (output_bfd, (void *) &finfo->last_file,
+                            (void *) (finfo->outsyms
+                                   + ((finfo->last_file_index - syment_base)
+                                      * osymesz)));
     }
 
-  /* The value of the last C_FILE symbol is supposed to be -1.  Write
-     it out again.  */
-  if (finfo.last_file_index != -1)
+  /* Write the modified symbols to the output file.  */
+  if (outsym > finfo->outsyms)
     {
-      finfo.last_file.n_value = -(bfd_vma) 1;
-      bfd_coff_swap_sym_out (abfd, (PTR) &finfo.last_file,
-                            (PTR) finfo.outsyms);
-      pos = obj_sym_filepos (abfd) + finfo.last_file_index * symesz;
-      if (bfd_seek (abfd, pos, SEEK_SET) != 0
-         || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz)
-       goto error_return;
-    }
+      file_ptr pos = obj_sym_filepos (output_bfd) + syment_base * osymesz;
+      bfd_size_type amt = outsym - finfo->outsyms;
+      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+         || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt)
+       return FALSE;
 
-  /* Write out all the global symbols which do not come from XCOFF
-     input files.  */
-  xcoff_link_hash_traverse (xcoff_hash_table (info),
-                           xcoff_write_global_symbol,
-                           (PTR) &finfo);
+      BFD_ASSERT ((obj_raw_syment_count (output_bfd)
+                  + (outsym - finfo->outsyms) / osymesz)
+                 == output_index);
 
-  if (finfo.outsyms != NULL)
-    {
-      free (finfo.outsyms);
-      finfo.outsyms = NULL;
+      obj_raw_syment_count (output_bfd) = output_index;
     }
 
-  /* Now that we have written out all the global symbols, we know the
-     symbol indices to use for relocs against them, and we can finally
-     write out the relocs.  */
-  amt = max_output_reloc_count * relsz;
-  external_relocs = (bfd_byte *) bfd_malloc (amt);
-  if (external_relocs == NULL && max_output_reloc_count != 0)
-    goto error_return;
+  /* Don't let the linker relocation routines discard the symbols.  */
+  keep_syms = obj_coff_keep_syms (input_bfd);
+  obj_coff_keep_syms (input_bfd) = TRUE;
 
-  for (o = abfd->sections; o != NULL; o = o->next)
+  /* Relocate the contents of each section.  */
+  for (o = input_bfd->sections; o != NULL; o = o->next)
     {
-      struct internal_reloc *irel;
-      struct internal_reloc *irelend;
-      struct xcoff_link_hash_entry **rel_hash;
-      struct xcoff_toc_rel_hash *toc_rel_hash;
-      bfd_byte *erel;
-      bfd_size_type rel_size;
+      bfd_byte *contents;
 
-      /* A stripped file has no relocs.  */
-      if (info->strip == strip_all)
-       {
-         o->reloc_count = 0;
-         continue;
-       }
+      if (! o->linker_mark)
+       /* This section was omitted from the link.  */
+       continue;
 
-      if (o->reloc_count == 0)
+      if ((o->flags & SEC_HAS_CONTENTS) == 0
+         || o->size == 0
+         || (o->flags & SEC_IN_MEMORY) != 0)
        continue;
 
-      irel = finfo.section_info[o->target_index].relocs;
-      irelend = irel + o->reloc_count;
-      rel_hash = finfo.section_info[o->target_index].rel_hashes;
-      for (; irel < irelend; irel++, rel_hash++, erel += relsz)
+      /* We have set filepos correctly for the sections we created to
+        represent csects, so bfd_get_section_contents should work.  */
+      if (coff_section_data (input_bfd, o) != NULL
+         && coff_section_data (input_bfd, o)->contents != NULL)
+       contents = coff_section_data (input_bfd, o)->contents;
+      else
        {
-         if (*rel_hash != NULL)
-           {
-             if ((*rel_hash)->indx < 0)
-               {
-                 if (! ((*info->callbacks->unattached_reloc)
-                        (info, (*rel_hash)->root.root.string,
-                         (bfd *) NULL, o, irel->r_vaddr)))
-                   goto error_return;
-                 (*rel_hash)->indx = 0;
-               }
-             irel->r_symndx = (*rel_hash)->indx;
-           }
+         bfd_size_type sz = o->rawsize ? o->rawsize : o->size;
+         if (!bfd_get_section_contents (input_bfd, o, finfo->contents, 0, sz))
+           return FALSE;
+         contents = finfo->contents;
        }
 
-      for (toc_rel_hash = finfo.section_info[o->target_index].toc_rel_hashes;
-          toc_rel_hash != NULL;
-          toc_rel_hash = toc_rel_hash->next)
+      if ((o->flags & SEC_RELOC) != 0)
        {
-         if (toc_rel_hash->h->u.toc_indx < 0)
-           {
-             if (! ((*info->callbacks->unattached_reloc)
-                    (info, toc_rel_hash->h->root.root.string,
-                     (bfd *) NULL, o, toc_rel_hash->rel->r_vaddr)))
-               goto error_return;
-             toc_rel_hash->h->u.toc_indx = 0;
-           }
-         toc_rel_hash->rel->r_symndx = toc_rel_hash->h->u.toc_indx;
-       }
-
-      /* XCOFF requires that the relocs be sorted by address.  We tend
-        to produce them in the order in which their containing csects
-        appear in the symbol table, which is not necessarily by
-        address.  So we sort them here.  There may be a better way to
-        do this.  */
-      qsort ((PTR) finfo.section_info[o->target_index].relocs,
-            o->reloc_count, sizeof (struct internal_reloc),
-            xcoff_sort_relocs);
-
-      irel = finfo.section_info[o->target_index].relocs;
-      irelend = irel + o->reloc_count;
-      erel = external_relocs;
-      for (; irel < irelend; irel++, rel_hash++, erel += relsz)
-       bfd_coff_swap_reloc_out (abfd, (PTR) irel, (PTR) erel);
+         int target_index;
+         struct internal_reloc *internal_relocs;
+         struct internal_reloc *irel;
+         bfd_vma offset;
+         struct internal_reloc *irelend;
+         struct xcoff_link_hash_entry **rel_hash;
+         long r_symndx;
 
-      rel_size = relsz * o->reloc_count;
-      if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0
-         || bfd_bwrite ((PTR) external_relocs, rel_size, abfd) != rel_size)
-       goto error_return;
-    }
+         /* Read in the relocs.  */
+         target_index = o->output_section->target_index;
+         internal_relocs = (xcoff_read_internal_relocs
+                            (input_bfd, o, FALSE, finfo->external_relocs,
+                             TRUE,
+                             (finfo->section_info[target_index].relocs
+                              + o->output_section->reloc_count)));
+         if (internal_relocs == NULL)
+           return FALSE;
 
-  if (external_relocs != NULL)
-    {
-      free (external_relocs);
-      external_relocs = NULL;
-    }
+         /* Call processor specific code to relocate the section
+            contents.  */
+         if (! bfd_coff_relocate_section (output_bfd, finfo->info,
+                                          input_bfd, o,
+                                          contents,
+                                          internal_relocs,
+                                          finfo->internal_syms,
+                                          xcoff_data (input_bfd)->csects))
+           return FALSE;
 
-  /* Free up the section information.  */
-  if (finfo.section_info != NULL)
-    {
-      unsigned int i;
+         offset = o->output_section->vma + o->output_offset - o->vma;
+         irel = internal_relocs;
+         irelend = irel + o->reloc_count;
+         rel_hash = (finfo->section_info[target_index].rel_hashes
+                     + o->output_section->reloc_count);
+         for (; irel < irelend; irel++, rel_hash++)
+           {
+             struct xcoff_link_hash_entry *h = NULL;
+             struct internal_ldrel ldrel;
 
-      for (i = 0; i < abfd->section_count; i++)
-       {
-         if (finfo.section_info[i].relocs != NULL)
-           free (finfo.section_info[i].relocs);
-         if (finfo.section_info[i].rel_hashes != NULL)
-           free (finfo.section_info[i].rel_hashes);
-       }
-      free (finfo.section_info);
-      finfo.section_info = NULL;
-    }
+             *rel_hash = NULL;
 
-  /* Write out the loader section contents.  */
-  BFD_ASSERT ((bfd_byte *) finfo.ldrel
-             == (xcoff_hash_table (info)->loader_section->contents
-                 + xcoff_hash_table (info)->ldhdr.l_impoff));
-  o = xcoff_hash_table (info)->loader_section;
-  if (! bfd_set_section_contents (abfd, o->output_section, o->contents,
-                                 (file_ptr) o->output_offset, o->_raw_size))
-    goto error_return;
+             /* Adjust the reloc address and symbol index.  */
 
-  /* Write out the magic sections.  */
-  o = xcoff_hash_table (info)->linkage_section;
-  if (o->_raw_size > 0
-      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
-                                    (file_ptr) o->output_offset,
-                                    o->_raw_size))
-    goto error_return;
-  o = xcoff_hash_table (info)->toc_section;
-  if (o->_raw_size > 0
-      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
-                                    (file_ptr) o->output_offset,
-                                    o->_raw_size))
-    goto error_return;
-  o = xcoff_hash_table (info)->descriptor_section;
-  if (o->_raw_size > 0
-      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
-                                    (file_ptr) o->output_offset,
-                                    o->_raw_size))
-    goto error_return;
+             irel->r_vaddr += offset;
 
-  /* Write out the string table.  */
-  pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd) * symesz;
-  if (bfd_seek (abfd, pos, SEEK_SET) != 0)
-    goto error_return;
-  H_PUT_32 (abfd,
-           _bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE,
-           strbuf);
-  amt = STRING_SIZE_SIZE;
-  if (bfd_bwrite (strbuf, amt, abfd) != amt)
-    goto error_return;
-  if (! _bfd_stringtab_emit (abfd, finfo.strtab))
-    goto error_return;
+             r_symndx = irel->r_symndx;
 
-  _bfd_stringtab_free (finfo.strtab);
+             if (r_symndx == -1)
+               h = NULL;
+             else
+               h = obj_xcoff_sym_hashes (input_bfd)[r_symndx];
 
-  /* Write out the debugging string table.  */
-  o = xcoff_hash_table (info)->debug_section;
-  if (o != NULL)
-    {
-      struct bfd_strtab_hash *debug_strtab;
+             if (r_symndx != -1 && finfo->info->strip != strip_all)
+               {
+                 if (h != NULL
+                     && h->smclas != XMC_TD
+                     && (irel->r_type == R_TOC
+                         || irel->r_type == R_GL
+                         || irel->r_type == R_TCL
+                         || irel->r_type == R_TRL
+                         || irel->r_type == R_TRLA))
+                   {
+                     /* This is a TOC relative reloc with a symbol
+                        attached.  The symbol should be the one which
+                        this reloc is for.  We want to make this
+                        reloc against the TOC address of the symbol,
+                        not the symbol itself.  */
+                     BFD_ASSERT (h->toc_section != NULL);
+                     BFD_ASSERT ((h->flags & XCOFF_SET_TOC) == 0);
+                     if (h->u.toc_indx != -1)
+                       irel->r_symndx = h->u.toc_indx;
+                     else
+                       {
+                         struct xcoff_toc_rel_hash *n;
+                         struct xcoff_link_section_info *si;
+                         bfd_size_type amt;
 
-      debug_strtab = xcoff_hash_table (info)->debug_strtab;
-      BFD_ASSERT (o->output_section->_raw_size - o->output_offset
-                 >= _bfd_stringtab_size (debug_strtab));
-      pos = o->output_section->filepos + o->output_offset;
-      if (bfd_seek (abfd, pos, SEEK_SET) != 0)
-       goto error_return;
-      if (! _bfd_stringtab_emit (abfd, debug_strtab))
-       goto error_return;
-    }
-
-  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
-     not try to write out the symbols.  */
-  bfd_get_symcount (abfd) = 0;
+                         amt = sizeof (* n);
+                         n = bfd_alloc (finfo->output_bfd, amt);
+                         if (n == NULL)
+                           return FALSE;
+                         si = finfo->section_info + target_index;
+                         n->next = si->toc_rel_hashes;
+                         n->h = h;
+                         n->rel = irel;
+                         si->toc_rel_hashes = n;
+                       }
+                   }
+                 else if (h != NULL)
+                   {
+                     /* This is a global symbol.  */
+                     if (h->indx >= 0)
+                       irel->r_symndx = h->indx;
+                     else
+                       {
+                         /* This symbol is being written at the end
+                            of the file, and we do not yet know the
+                            symbol index.  We save the pointer to the
+                            hash table entry in the rel_hash list.
+                            We set the indx field to -2 to indicate
+                            that this symbol must not be stripped.  */
+                         *rel_hash = h;
+                         h->indx = -2;
+                       }
+                   }
+                 else
+                   {
+                     long indx;
 
-  return true;
+                     indx = finfo->sym_indices[r_symndx];
 
- error_return:
-  if (finfo.strtab != NULL)
-    _bfd_stringtab_free (finfo.strtab);
+                     if (indx == -1)
+                       {
+                         struct internal_syment *is;
 
-  if (finfo.section_info != NULL)
-    {
-      unsigned int i;
+                         /* Relocations against a TC0 TOC anchor are
+                            automatically transformed to be against
+                            the TOC anchor in the output file.  */
+                         is = finfo->internal_syms + r_symndx;
+                         if (is->n_sclass == C_HIDEXT
+                             && is->n_numaux > 0)
+                           {
+                             void * auxptr;
+                             union internal_auxent aux;
 
-      for (i = 0; i < abfd->section_count; i++)
-       {
-         if (finfo.section_info[i].relocs != NULL)
-           free (finfo.section_info[i].relocs);
-         if (finfo.section_info[i].rel_hashes != NULL)
-           free (finfo.section_info[i].rel_hashes);
-       }
-      free (finfo.section_info);
-    }
+                             auxptr = ((void *)
+                                       (((bfd_byte *)
+                                         obj_coff_external_syms (input_bfd))
+                                        + ((r_symndx + is->n_numaux)
+                                           * isymesz)));
+                             bfd_coff_swap_aux_in (input_bfd, auxptr,
+                                                   is->n_type, is->n_sclass,
+                                                   is->n_numaux - 1,
+                                                   is->n_numaux,
+                                                   (void *) &aux);
+                             if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_SD
+                                 && aux.x_csect.x_smclas == XMC_TC0)
+                               indx = finfo->toc_symindx;
+                           }
+                       }
 
-  if (finfo.internal_syms != NULL)
-    free (finfo.internal_syms);
-  if (finfo.sym_indices != NULL)
-    free (finfo.sym_indices);
-  if (finfo.outsyms != NULL)
-    free (finfo.outsyms);
-  if (finfo.linenos != NULL)
-    free (finfo.linenos);
-  if (finfo.contents != NULL)
-    free (finfo.contents);
-  if (finfo.external_relocs != NULL)
-    free (finfo.external_relocs);
-  if (external_relocs != NULL)
-    free (external_relocs);
-  return false;
-}
+                     if (indx != -1)
+                       irel->r_symndx = indx;
+                     else
+                       {
 
-/* Link an input file into the linker output file.  This function
-   handles all the sections and relocations of the input file at once.  */
+                         struct internal_syment *is;
 
-static boolean
-xcoff_link_input_bfd (finfo, input_bfd)
-     struct xcoff_final_link_info *finfo;
-     bfd *input_bfd;
-{
-  bfd *output_bfd;
-  const char *strings;
-  bfd_size_type syment_base;
-  unsigned int n_tmask;
-  unsigned int n_btshft;
-  boolean copy, hash;
-  bfd_size_type isymesz;
-  bfd_size_type osymesz;
-  bfd_size_type linesz;
-  bfd_byte *esym;
-  bfd_byte *esym_end;
-  struct xcoff_link_hash_entry **sym_hash;
-  struct internal_syment *isymp;
-  asection **csectpp;
-  unsigned long *debug_index;
-  long *indexp;
-  unsigned long output_index;
-  bfd_byte *outsym;
-  unsigned int incls;
-  asection *oline;
-  boolean keep_syms;
-  asection *o;
+                         const char *name;
+                         char buf[SYMNMLEN + 1];
 
-  /* We can just skip DYNAMIC files, unless this is a static link.  */
-  if ((input_bfd->flags & DYNAMIC) != 0
-      && ! finfo->info->static_link)
-    return true;
+                         /* This reloc is against a symbol we are
+                            stripping.  It would be possible to handle
+                            this case, but I don't think it's worth it.  */
+                         is = finfo->internal_syms + r_symndx;
 
-  /* Move all the symbols to the output file.  */
+                         name = (_bfd_coff_internal_syment_name
+                                 (input_bfd, is, buf));
 
-  output_bfd = finfo->output_bfd;
-  strings = NULL;
-  syment_base = obj_raw_syment_count (output_bfd);
-  isymesz = bfd_coff_symesz (input_bfd);
-  osymesz = bfd_coff_symesz (output_bfd);
-  linesz = bfd_coff_linesz (input_bfd);
-  BFD_ASSERT (linesz == bfd_coff_linesz (output_bfd));
+                         if (name == NULL)
+                           return FALSE;
 
-  n_tmask = coff_data (input_bfd)->local_n_tmask;
-  n_btshft = coff_data (input_bfd)->local_n_btshft;
+                         if (! ((*finfo->info->callbacks->unattached_reloc)
+                                (finfo->info, name, input_bfd, o,
+                                 irel->r_vaddr)))
+                           return FALSE;
+                       }
+                   }
+               }
 
-  /* Define macros so that ISFCN, et. al., macros work correctly.  */
-#define N_TMASK n_tmask
-#define N_BTSHFT n_btshft
+             switch (irel->r_type)
+               {
+               default:
+                 if (h == NULL
+                     || h->root.type == bfd_link_hash_defined
+                     || h->root.type == bfd_link_hash_defweak
+                     || h->root.type == bfd_link_hash_common)
+                   break;
+                 /* Fall through.  */
+               case R_POS:
+               case R_NEG:
+               case R_RL:
+               case R_RLA:
+                 if (h != NULL
+                     && (h->root.type == bfd_link_hash_defined
+                         || h->root.type == bfd_link_hash_defweak)
+                     && bfd_is_abs_section (h->root.u.def.section))
+                   break;
+                 /* This reloc needs to be copied into the .loader
+                    section.  */
+                 ldrel.l_vaddr = irel->r_vaddr;
+                 if (r_symndx == -1)
+                   ldrel.l_symndx = -(bfd_size_type ) 1;
+                 else if (h == NULL
+                          || (h->root.type == bfd_link_hash_defined
+                              || h->root.type == bfd_link_hash_defweak
+                              || h->root.type == bfd_link_hash_common))
+                   {
+                     asection *sec;
 
-  copy = false;
-  if (! finfo->info->keep_memory)
-    copy = true;
-  hash = true;
-  if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-    hash = false;
+                     if (h == NULL)
+                       sec = xcoff_data (input_bfd)->csects[r_symndx];
+                     else if (h->root.type == bfd_link_hash_common)
+                       sec = h->root.u.c.p->section;
+                     else
+                       sec = h->root.u.def.section;
+                     sec = sec->output_section;
 
-  if (! _bfd_coff_get_external_symbols (input_bfd))
-    return false;
+                     if (strcmp (sec->name, ".text") == 0)
+                       ldrel.l_symndx = 0;
+                     else if (strcmp (sec->name, ".data") == 0)
+                       ldrel.l_symndx = 1;
+                     else if (strcmp (sec->name, ".bss") == 0)
+                       ldrel.l_symndx = 2;
+                     else
+                       {
+                         (*_bfd_error_handler)
+                           (_("%B: loader reloc in unrecognized section `%A'"),
+                            input_bfd, sec);
+                         bfd_set_error (bfd_error_nonrepresentable_section);
+                         return FALSE;
+                       }
+                   }
+                 else
+                   {
+                     if (h->ldindx < 0)
+                       {
+                         (*_bfd_error_handler)
+                           (_("%B: `%s' in loader reloc but not loader sym"),
+                            input_bfd,
+                            h->root.root.string);
+                         bfd_set_error (bfd_error_bad_value);
+                         return FALSE;
+                       }
+                     ldrel.l_symndx = h->ldindx;
+                   }
+                 ldrel.l_rtype = (irel->r_size << 8) | irel->r_type;
+                 ldrel.l_rsecnm = o->output_section->target_index;
+                 if (xcoff_hash_table (finfo->info)->textro
+                     && strcmp (o->output_section->name, ".text") == 0)
+                   {
+                     (*_bfd_error_handler)
+                       (_("%B: loader reloc in read-only section %A"),
+                        input_bfd, o->output_section);
+                     bfd_set_error (bfd_error_invalid_operation);
+                     return FALSE;
+                   }
+                 bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel,
+                                           finfo->ldrel);
 
-  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
-  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
-  sym_hash = obj_xcoff_sym_hashes (input_bfd);
-  csectpp = xcoff_data (input_bfd)->csects;
-  debug_index = xcoff_data (input_bfd)->debug_indices;
-  isymp = finfo->internal_syms;
-  indexp = finfo->sym_indices;
-  output_index = syment_base;
-  outsym = finfo->outsyms;
-  incls = 0;
-  oline = NULL;
+                 finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
+                 break;
 
-  while (esym < esym_end)
-    {
+               case R_TOC:
+               case R_GL:
+               case R_TCL:
+               case R_TRL:
+               case R_TRLA:
+                 /* We should never need a .loader reloc for a TOC
+                    relative reloc.  */
+                 break;
+               }
+           }
 
-      struct internal_syment isym;
-      union internal_auxent aux;
-      int smtyp = 0;
-      boolean skip;
-      boolean require;
-      int add;
+         o->output_section->reloc_count += o->reloc_count;
+       }
 
-      bfd_coff_swap_sym_in (input_bfd, (PTR) esym, (PTR) isymp);
+      /* Write out the modified section contents.  */
+      if (! bfd_set_section_contents (output_bfd, o->output_section,
+                                     contents, (file_ptr) o->output_offset,
+                                     o->size))
+       return FALSE;
+    }
 
-      /* If this is a C_EXT or C_HIDEXT symbol, we need the csect
-         information.  */
-      if (isymp->n_sclass == C_EXT || isymp->n_sclass == C_HIDEXT)
-       {
-         BFD_ASSERT (isymp->n_numaux > 0);
-         bfd_coff_swap_aux_in (input_bfd,
-                               (PTR) (esym + isymesz * isymp->n_numaux),
-                               isymp->n_type, isymp->n_sclass,
-                               isymp->n_numaux - 1, isymp->n_numaux,
-                               (PTR) &aux);
+  obj_coff_keep_syms (input_bfd) = keep_syms;
 
-         smtyp = SMTYP_SMTYP (aux.x_csect.x_smtyp);
-       }
-
-      /* Make a copy of *isymp so that the relocate_section function
-        always sees the original values.  This is more reliable than
-        always recomputing the symbol value even if we are stripping
-        the symbol.  */
-      isym = *isymp;
-
-      /* If this symbol is in the .loader section, swap out the
-         .loader symbol information.  If this is an external symbol
-         reference to a defined symbol, though, then wait until we get
-         to the definition.  */
-      if (isym.n_sclass == C_EXT
-         && *sym_hash != NULL
-         && (*sym_hash)->ldsym != NULL
-         && (smtyp != XTY_ER
-             || (*sym_hash)->root.type == bfd_link_hash_undefined))
-       {
-         struct xcoff_link_hash_entry *h;
-         struct internal_ldsym *ldsym;
-
-         h = *sym_hash;
-         ldsym = h->ldsym;
-         if (isym.n_scnum > 0)
-           {
-             ldsym->l_scnum = (*csectpp)->output_section->target_index;
-             ldsym->l_value = (isym.n_value
-                               + (*csectpp)->output_section->vma
-                               + (*csectpp)->output_offset
-                               - (*csectpp)->vma);
-           }
-         else
-           {
-             ldsym->l_scnum = isym.n_scnum;
-             ldsym->l_value = isym.n_value;
-           }
+  if (! finfo->info->keep_memory)
+    {
+      if (! _bfd_coff_free_symbols (input_bfd))
+       return FALSE;
+    }
 
-         ldsym->l_smtype = smtyp;
-         if (((h->flags & XCOFF_DEF_REGULAR) == 0
-              && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
-             || (h->flags & XCOFF_IMPORT) != 0)
-           ldsym->l_smtype |= L_IMPORT;
-         if (((h->flags & XCOFF_DEF_REGULAR) != 0
-              && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
-             || (h->flags & XCOFF_EXPORT) != 0)
-           ldsym->l_smtype |= L_EXPORT;
-         if ((h->flags & XCOFF_ENTRY) != 0)
-           ldsym->l_smtype |= L_ENTRY;
+  return TRUE;
+}
 
-         ldsym->l_smclas = aux.x_csect.x_smclas;
+#undef N_TMASK
+#undef N_BTSHFT
 
-         if (ldsym->l_ifile == (bfd_size_type) -1)
-           ldsym->l_ifile = 0;
-         else if (ldsym->l_ifile == 0)
-           {
-             if ((ldsym->l_smtype & L_IMPORT) == 0)
-               ldsym->l_ifile = 0;
-             else
-               {
-                 bfd *impbfd;
+/* Sort relocs by VMA.  This is called via qsort.  */
 
-                 if (h->root.type == bfd_link_hash_defined
-                     || h->root.type == bfd_link_hash_defweak)
-                   impbfd = h->root.u.def.section->owner;
-                 else if (h->root.type == bfd_link_hash_undefined
-                          || h->root.type == bfd_link_hash_undefweak)
-                   impbfd = h->root.u.undef.abfd;
-                 else
-                   impbfd = NULL;
+static int
+xcoff_sort_relocs (const void * p1, const void * p2)
+{
+  const struct internal_reloc *r1 = (const struct internal_reloc *) p1;
+  const struct internal_reloc *r2 = (const struct internal_reloc *) p2;
 
-                 if (impbfd == NULL)
-                   ldsym->l_ifile = 0;
-                 else
-                   {
-                     BFD_ASSERT (impbfd->xvec == finfo->output_bfd->xvec);
-                     ldsym->l_ifile = xcoff_data (impbfd)->import_file_id;
-                   }
-               }
-           }
+  if (r1->r_vaddr > r2->r_vaddr)
+    return 1;
+  else if (r1->r_vaddr < r2->r_vaddr)
+    return -1;
+  else
+    return 0;
+}
 
-         ldsym->l_parm = 0;
+/* Return true if section SEC is a TOC section.  */
 
-         BFD_ASSERT (h->ldindx >= 0);
-         bfd_xcoff_swap_ldsym_out (finfo->output_bfd, ldsym,
-                                   (finfo->ldsym
-                                    + ((h->ldindx - 3)
-                                       * bfd_xcoff_ldsymsz (finfo->output_bfd))));
-         h->ldsym = NULL;
+static inline bfd_boolean
+xcoff_toc_section_p (asection *sec)
+{
+  const char *name;
 
-         /* Fill in snentry now that we know the target_index.  */
-         if ((h->flags & XCOFF_ENTRY) != 0
-             && (h->root.type == bfd_link_hash_defined
-                 || h->root.type == bfd_link_hash_defweak))
-           {
-             xcoff_data (output_bfd)->snentry =
-               h->root.u.def.section->output_section->target_index;
-           }
+  name = sec->name;
+  if (name[0] == '.' && name[1] == 't')
+    {
+      if (name[2] == 'c')
+       {
+         if (name[3] == '0' && name[4] == 0)
+           return TRUE;
+         if (name[3] == 0)
+           return TRUE;
        }
+      if (name[2] == 'd' && name[3] == 0)
+       return TRUE;
+    }
+  return FALSE;
+}
+
+/* See if the link requires a TOC (it usually does!).  If so, find a
+   good place to put the TOC anchor csect, and write out the associated
+   symbol.  */
 
-      *indexp = -1;
-
-      skip = false;
-      require = false;
-      add = 1 + isym.n_numaux;
-
-      /* If we are skipping this csect, we want to skip this symbol.  */
-      if (*csectpp == NULL)
-       skip = true;
-
-      /* If we garbage collected this csect, we want to skip this
-         symbol.  */
-      if (! skip
-         && xcoff_hash_table (finfo->info)->gc
-         && ((*csectpp)->flags & SEC_MARK) == 0
-         && *csectpp != bfd_abs_section_ptr)
-       skip = true;
-
-      /* An XCOFF linker always skips C_STAT symbols.  */
-      if (! skip
-         && isymp->n_sclass == C_STAT)
-       skip = true;
-
-      /* We skip all but the first TOC anchor.  */
-      if (! skip
-         && isymp->n_sclass == C_HIDEXT
-         && aux.x_csect.x_smclas == XMC_TC0)
+static bfd_boolean
+xcoff_find_tc0 (bfd *output_bfd, struct xcoff_final_link_info *finfo)
+{
+  bfd_vma toc_start, toc_end, start, end, best_address;
+  asection *sec;
+  bfd *input_bfd;
+  int section_index;
+  struct internal_syment irsym;
+  union internal_auxent iraux;
+  file_ptr pos;
+  size_t size;
+
+  /* Set [TOC_START, TOC_END) to the range of the TOC.  Record the
+     index of a csect at the beginning of the TOC.  */
+  toc_start = ~(bfd_vma) 0;
+  toc_end = 0;
+  section_index = -1;
+  for (input_bfd = finfo->info->input_bfds;
+       input_bfd != NULL;
+       input_bfd = input_bfd->link_next)
+    for (sec = input_bfd->sections; sec != NULL; sec = sec->next)
+      if ((sec->flags & SEC_MARK) != 0 && xcoff_toc_section_p (sec))
        {
-         if (finfo->toc_symindx != -1)
-           skip = true;
-         else
+         start = sec->output_section->vma + sec->output_offset;
+         if (toc_start > start)
            {
-             bfd_vma tocval, tocend;
-             bfd *inp;
-
-             tocval = ((*csectpp)->output_section->vma
-                       + (*csectpp)->output_offset
-                       + isym.n_value
-                       - (*csectpp)->vma);
-
-             /* We want to find out if tocval is a good value to use
-                 as the TOC anchor--that is, whether we can access all
-                 of the TOC using a 16 bit offset from tocval.  This
-                 test assumes that the TOC comes at the end of the
-                 output section, as it does in the default linker
-                 script.  */
-             tocend = ((*csectpp)->output_section->vma
-                       + (*csectpp)->output_section->_raw_size);
-             for (inp = finfo->info->input_bfds;
-                  inp != NULL;
-                  inp = inp->link_next)
-               {
-
-                 for (o = inp->sections; o != NULL; o = o->next)
-                   if (strcmp (o->name, ".tocbss") == 0)
-                     {
-                       bfd_vma new_toc_end;
-                       new_toc_end = (o->output_section->vma
-                                      + o->output_offset
-                                      + o->_cooked_size);
-                       if (new_toc_end > tocend)
-                         tocend = new_toc_end;
-                     }
+             toc_start = start;
+             section_index = sec->output_section->target_index;
+           }
 
-               }
+         end = start + sec->size;
+         if (toc_end < end)
+           toc_end = end;
+       }
 
-             if (tocval + 0x10000 < tocend)
-               {
-                 (*_bfd_error_handler)
-                   (_("TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling"),
-                    (unsigned long) (tocend - tocval));
-                 bfd_set_error (bfd_error_file_too_big);
-                 return false;
-               }
+  /* There's no need for a TC0 symbol if we don't have a TOC.  */
+  if (toc_end < toc_start)
+    {
+      xcoff_data (output_bfd)->toc = toc_start;
+      return TRUE;
+    }
 
-             if (tocval + 0x8000 < tocend)
+  if (toc_end - toc_start < 0x8000)
+    /* Every TOC csect can be accessed from TOC_START.  */
+    best_address = toc_start;
+  else
+    {
+      /* Find the lowest TOC csect that is still within range of TOC_END.  */
+      best_address = toc_end;
+      for (input_bfd = finfo->info->input_bfds;
+          input_bfd != NULL;
+          input_bfd = input_bfd->link_next)
+       for (sec = input_bfd->sections; sec != NULL; sec = sec->next)
+         if ((sec->flags & SEC_MARK) != 0 && xcoff_toc_section_p (sec))
+           {
+             start = sec->output_section->vma + sec->output_offset;
+             if (start < best_address
+                 && start + 0x8000 >= toc_end)
                {
-                 bfd_vma tocadd;
-
-                 tocadd = tocend - (tocval + 0x8000);
-                 tocval += tocadd;
-                 isym.n_value += tocadd;
+                 best_address = start;
+                 section_index = sec->output_section->target_index;
                }
-
-             finfo->toc_symindx = output_index;
-             xcoff_data (finfo->output_bfd)->toc = tocval;
-             xcoff_data (finfo->output_bfd)->sntoc =
-               (*csectpp)->output_section->target_index;
-             require = true;
-
            }
-       }
 
-      /* If we are stripping all symbols, we want to skip this one.  */
-      if (! skip
-         && finfo->info->strip == strip_all)
-       skip = true;
-
-      /* We can skip resolved external references.  */
-      if (! skip
-         && isym.n_sclass == C_EXT
-         && smtyp == XTY_ER
-         && (*sym_hash)->root.type != bfd_link_hash_undefined)
-       skip = true;
-
-      /* We can skip common symbols if they got defined somewhere
-         else.  */
-      if (! skip
-         && isym.n_sclass == C_EXT
-         && smtyp == XTY_CM
-         && ((*sym_hash)->root.type != bfd_link_hash_common
-             || (*sym_hash)->root.u.c.p->section != *csectpp)
-         && ((*sym_hash)->root.type != bfd_link_hash_defined
-             || (*sym_hash)->root.u.def.section != *csectpp))
-       skip = true;
-
-      /* Skip local symbols if we are discarding them.  */
-      if (! skip
-         && finfo->info->discard == discard_all
-         && isym.n_sclass != C_EXT
-         && (isym.n_sclass != C_HIDEXT
-             || smtyp != XTY_SD))
-       skip = true;
-
-      /* If we stripping debugging symbols, and this is a debugging
-         symbol, then skip it.  */
-      if (! skip
-         && finfo->info->strip == strip_debugger
-         && isym.n_scnum == N_DEBUG)
-       skip = true;
-
-      /* If some symbols are stripped based on the name, work out the
-        name and decide whether to skip this symbol.  We don't handle
-        this correctly for symbols whose names are in the .debug
-        section; to get it right we would need a new bfd_strtab_hash
-        function to return the string given the index.  */
-      if (! skip
-         && (finfo->info->strip == strip_some
-             || finfo->info->discard == discard_l)
-         && (debug_index == NULL || *debug_index == (unsigned long) -1))
+      /* Make sure that the start of the TOC is also within range.  */
+      if (best_address > toc_start + 0x8000)
        {
-         const char *name;
-         char buf[SYMNMLEN + 1];
+         (*_bfd_error_handler)
+           (_("TOC overflow: 0x%lx > 0x10000; try -mminimal-toc "
+              "when compiling"),
+            (unsigned long) (toc_end - toc_start));
+         bfd_set_error (bfd_error_file_too_big);
+         return FALSE;
+       }
+    }
 
-         name = _bfd_coff_internal_syment_name (input_bfd, &isym, buf);
+  /* Record the chosen TOC value.  */
+  finfo->toc_symindx = obj_raw_syment_count (output_bfd);
+  xcoff_data (output_bfd)->toc = best_address;
+  xcoff_data (output_bfd)->sntoc = section_index;
+
+  /* Fill out the TC0 symbol.  */
+  if (!bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab, &irsym, "TOC"))
+    return FALSE;
+  irsym.n_value = best_address;
+  irsym.n_scnum = section_index;
+  irsym.n_sclass = C_HIDEXT;
+  irsym.n_type = T_NULL;
+  irsym.n_numaux = 1;
+  bfd_coff_swap_sym_out (output_bfd, &irsym, finfo->outsyms);
+
+  /* Fill out the auxillary csect information.  */
+  memset (&iraux, 0, sizeof iraux);
+  iraux.x_csect.x_smtyp = XTY_SD;
+  iraux.x_csect.x_smclas = XMC_TC0;
+  iraux.x_csect.x_scnlen.l = 0;
+  bfd_coff_swap_aux_out (output_bfd, &iraux, T_NULL, C_HIDEXT, 0, 1,
+                        finfo->outsyms + bfd_coff_symesz (output_bfd));
+
+  /* Write the contents to the file.  */
+  pos = obj_sym_filepos (output_bfd);
+  pos += obj_raw_syment_count (output_bfd) * bfd_coff_symesz (output_bfd);
+  size = 2 * bfd_coff_symesz (output_bfd);
+  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+      || bfd_bwrite (finfo->outsyms, size, output_bfd) != size)
+    return FALSE;
+  obj_raw_syment_count (output_bfd) += 2;
 
-         if (name == NULL)
-           return false;
-
-         if ((finfo->info->strip == strip_some
-              && (bfd_hash_lookup (finfo->info->keep_hash, name, false,
-                                   false) == NULL))
-             || (finfo->info->discard == discard_l
-                 && (isym.n_sclass != C_EXT
-                     && (isym.n_sclass != C_HIDEXT
-                         || smtyp != XTY_SD))
-                 && bfd_is_local_label_name (input_bfd, name)))
-           skip = true;
-       }
+  return TRUE;
+}
 
-      /* We can not skip the first TOC anchor.  */
-      if (skip
-         && require
-         && finfo->info->strip != strip_all)
-       skip = false;
+/* Write out a non-XCOFF global symbol.  */
 
-      /* We now know whether we are to skip this symbol or not.  */
-      if (! skip)
-       {
-         /* Adjust the symbol in order to output it.  */
+static bfd_boolean
+xcoff_write_global_symbol (struct xcoff_link_hash_entry *h, void * inf)
+{
+  struct xcoff_final_link_info *finfo = (struct xcoff_final_link_info *) inf;
+  bfd *output_bfd;
+  bfd_byte *outsym;
+  struct internal_syment isym;
+  union internal_auxent aux;
+  bfd_boolean result;
+  file_ptr pos;
+  bfd_size_type amt;
 
-         if (isym._n._n_n._n_zeroes == 0
-             && isym._n._n_n._n_offset != 0)
-           {
-             /* This symbol has a long name.  Enter it in the string
-                table we are building.  If *debug_index != -1, the
-                name has already been entered in the .debug section.  */
-             if (debug_index != NULL && *debug_index != (unsigned long) -1)
-               isym._n._n_n._n_offset = *debug_index;
-             else
-               {
-                 const char *name;
-                 bfd_size_type indx;
+  output_bfd = finfo->output_bfd;
+  outsym = finfo->outsyms;
 
-                 name = _bfd_coff_internal_syment_name (input_bfd, &isym,
-                                                        (char *) NULL);
+  if (h->root.type == bfd_link_hash_warning)
+    {
+      h = (struct xcoff_link_hash_entry *) h->root.u.i.link;
+      if (h->root.type == bfd_link_hash_new)
+       return TRUE;
+    }
 
-                 if (name == NULL)
-                   return false;
-                 indx = _bfd_stringtab_add (finfo->strtab, name, hash, copy);
-                 if (indx == (bfd_size_type) -1)
-                   return false;
-                 isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
-               }
-           }
+  /* If this symbol was garbage collected, just skip it.  */
+  if (xcoff_hash_table (finfo->info)->gc
+      && (h->flags & XCOFF_MARK) == 0)
+    return TRUE;
 
-         if (isym.n_sclass != C_BSTAT
-             && isym.n_sclass != C_ESTAT
-             && isym.n_sclass != C_DECL
-             && isym.n_scnum > 0)
-           {
-             isym.n_scnum = (*csectpp)->output_section->target_index;
-             isym.n_value += ((*csectpp)->output_section->vma
-                              + (*csectpp)->output_offset
-                              - (*csectpp)->vma);
-           }
+  /* If we need a .loader section entry, write it out.  */
+  if (h->ldsym != NULL)
+    {
+      struct internal_ldsym *ldsym;
+      bfd *impbfd;
 
-         /* The value of a C_FILE symbol is the symbol index of the
-            next C_FILE symbol.  The value of the last C_FILE symbol
-            is -1.  We try to get this right, below, just before we
-            write the symbols out, but in the general case we may
-            have to write the symbol out twice.  */
-         if (isym.n_sclass == C_FILE)
-           {
-             if (finfo->last_file_index != -1
-                 && finfo->last_file.n_value != (bfd_vma) output_index)
-               {
-                 /* We must correct the value of the last C_FILE entry.  */
-                 finfo->last_file.n_value = output_index;
-                 if ((bfd_size_type) finfo->last_file_index >= syment_base)
-                   {
-                     /* The last C_FILE symbol is in this input file.  */
-                     bfd_coff_swap_sym_out (output_bfd,
-                                            (PTR) &finfo->last_file,
-                                            (PTR) (finfo->outsyms
-                                                   + ((finfo->last_file_index
-                                                       - syment_base)
-                                                      * osymesz)));
-                   }
-                 else
-                   {
-                     /* We have already written out the last C_FILE
-                        symbol.  We need to write it out again.  We
-                        borrow *outsym temporarily.  */
-                     file_ptr pos;
+      ldsym = h->ldsym;
 
-                     bfd_coff_swap_sym_out (output_bfd,
-                                            (PTR) &finfo->last_file,
-                                            (PTR) outsym);
+      if (h->root.type == bfd_link_hash_undefined
+         || h->root.type == bfd_link_hash_undefweak)
+       {
 
-                     pos = obj_sym_filepos (output_bfd);
-                     pos += finfo->last_file_index * osymesz;
-                     if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
-                         || (bfd_bwrite (outsym, osymesz, output_bfd)
-                             != osymesz))
-                       return false;
-                   }
-               }
+         ldsym->l_value = 0;
+         ldsym->l_scnum = N_UNDEF;
+         ldsym->l_smtype = XTY_ER;
+         impbfd = h->root.u.undef.abfd;
 
-             finfo->last_file_index = output_index;
-             finfo->last_file = isym;
-           }
+       }
+      else if (h->root.type == bfd_link_hash_defined
+              || h->root.type == bfd_link_hash_defweak)
+       {
+         asection *sec;
 
-         /* The value of a C_BINCL or C_EINCL symbol is a file offset
-             into the line numbers.  We update the symbol values when
-             we handle the line numbers.  */
-         if (isym.n_sclass == C_BINCL
-             || isym.n_sclass == C_EINCL)
-           {
-             isym.n_value = finfo->line_filepos;
-             ++incls;
-           }
+         sec = h->root.u.def.section;
+         ldsym->l_value = (sec->output_section->vma
+                           + sec->output_offset
+                           + h->root.u.def.value);
+         ldsym->l_scnum = sec->output_section->target_index;
+         ldsym->l_smtype = XTY_SD;
+         impbfd = sec->owner;
 
-         /* Output the symbol.  */
+       }
+      else
+       abort ();
 
-         bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym);
+      if (((h->flags & XCOFF_DEF_REGULAR) == 0
+          && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
+         || (h->flags & XCOFF_IMPORT) != 0)
+       /* Clear l_smtype
+          Import symbols are defined so the check above will make
+          the l_smtype XTY_SD.  But this is not correct, it should
+          be cleared.  */
+       ldsym->l_smtype |= L_IMPORT;
 
-         *indexp = output_index;
+      if (((h->flags & XCOFF_DEF_REGULAR) != 0
+          && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
+         || (h->flags & XCOFF_EXPORT) != 0)
+       ldsym->l_smtype |= L_EXPORT;
 
-         if (isym.n_sclass == C_EXT)
-           {
-             long indx;
-             struct xcoff_link_hash_entry *h;
+      if ((h->flags & XCOFF_ENTRY) != 0)
+       ldsym->l_smtype |= L_ENTRY;
 
-             indx = ((esym - (bfd_byte *) obj_coff_external_syms (input_bfd))
-                     / isymesz);
-             h = obj_xcoff_sym_hashes (input_bfd)[indx];
-             BFD_ASSERT (h != NULL);
-             h->indx = output_index;
-           }
+      if ((h->flags & XCOFF_RTINIT) != 0)
+       ldsym->l_smtype = XTY_SD;
 
-         /* If this is a symbol in the TOC which we may have merged
-             (class XMC_TC), remember the symbol index of the TOC
-             symbol.  */
-         if (isym.n_sclass == C_HIDEXT
-             && aux.x_csect.x_smclas == XMC_TC
-             && *sym_hash != NULL)
+      ldsym->l_smclas = h->smclas;
+
+      if (ldsym->l_smtype & L_IMPORT)
+       {
+         if ((h->root.type == bfd_link_hash_defined
+              || h->root.type == bfd_link_hash_defweak)
+             && (h->root.u.def.value != 0))
+           ldsym->l_smclas = XMC_XO;
+
+         else if ((h->flags & (XCOFF_SYSCALL32 | XCOFF_SYSCALL64)) ==
+                  (XCOFF_SYSCALL32 | XCOFF_SYSCALL64))
+           ldsym->l_smclas = XMC_SV3264;
+
+         else if (h->flags & XCOFF_SYSCALL32)
+           ldsym->l_smclas = XMC_SV;
+
+         else if (h->flags & XCOFF_SYSCALL64)
+           ldsym->l_smclas = XMC_SV64;
+       }
+
+      if (ldsym->l_ifile == -(bfd_size_type) 1)
+       {
+         ldsym->l_ifile = 0;
+       }
+      else if (ldsym->l_ifile == 0)
+       {
+         if ((ldsym->l_smtype & L_IMPORT) == 0)
+           ldsym->l_ifile = 0;
+         else if (impbfd == NULL)
+           ldsym->l_ifile = 0;
+         else
            {
-             BFD_ASSERT (((*sym_hash)->flags & XCOFF_SET_TOC) == 0);
-             BFD_ASSERT ((*sym_hash)->toc_section != NULL);
-             (*sym_hash)->u.toc_indx = output_index;
+             BFD_ASSERT (impbfd->xvec == output_bfd->xvec);
+             ldsym->l_ifile = xcoff_data (impbfd)->import_file_id;
            }
-
-         output_index += add;
-         outsym += add * osymesz;
        }
 
-      esym += add * isymesz;
-      isymp += add;
-      csectpp += add;
-      sym_hash += add;
-      if (debug_index != NULL)
-       debug_index += add;
-      ++indexp;
-      for (--add; add > 0; --add)
-       *indexp++ = -1;
-    }
+      ldsym->l_parm = 0;
 
-  /* Fix up the aux entries and the C_BSTAT symbols.  This must be
-     done in a separate pass, because we don't know the correct symbol
-     indices until we have already decided which symbols we are going
-     to keep.  */
+      BFD_ASSERT (h->ldindx >= 0);
 
-  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
-  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
-  isymp = finfo->internal_syms;
-  indexp = finfo->sym_indices;
-  csectpp = xcoff_data (input_bfd)->csects;
-  outsym = finfo->outsyms;
-  while (esym < esym_end)
+      bfd_xcoff_swap_ldsym_out (output_bfd, ldsym,
+                               (finfo->ldsym +
+                                (h->ldindx - 3)
+                                * bfd_xcoff_ldsymsz(finfo->output_bfd)));
+      h->ldsym = NULL;
+    }
+
+  /* If this symbol needs global linkage code, write it out.  */
+  if (h->root.type == bfd_link_hash_defined
+      && (h->root.u.def.section
+         == xcoff_hash_table (finfo->info)->linkage_section))
     {
-      int add;
+      bfd_byte *p;
+      bfd_vma tocoff;
+      unsigned int i;
 
-      add = 1 + isymp->n_numaux;
+      p = h->root.u.def.section->contents + h->root.u.def.value;
 
-      if (*indexp < 0)
-       esym += add * isymesz;
-      else
-       {
-         int i;
+      /* The first instruction in the global linkage code loads a
+        specific TOC element.  */
+      tocoff = (h->descriptor->toc_section->output_section->vma
+               + h->descriptor->toc_section->output_offset
+               - xcoff_data (output_bfd)->toc);
 
-         if (isymp->n_sclass == C_BSTAT)
-           {
-             struct internal_syment isym;
+      if ((h->descriptor->flags & XCOFF_SET_TOC) != 0)
+       tocoff += h->descriptor->u.toc_offset;
 
-             bfd_vma indx;
+      /* The first instruction in the glink code needs to be
+        cooked to to hold the correct offset in the toc.  The
+        rest are just output raw.  */
+      bfd_put_32 (output_bfd,
+                 bfd_xcoff_glink_code(output_bfd, 0) | (tocoff & 0xffff), p);
 
-             /* The value of a C_BSTAT symbol is the symbol table
-                 index of the containing csect.  */
-             bfd_coff_swap_sym_in (output_bfd, (PTR) outsym, (PTR) &isym);
-             indx = isym.n_value;
-             if (indx < obj_raw_syment_count (input_bfd))
-               {
-                 long symindx;
+      /* Start with i == 1 to get past the first instruction done above
+        The /4 is because the glink code is in bytes and we are going
+        4 at a pop.  */
+      for (i = 1; i < bfd_xcoff_glink_code_size(output_bfd) / 4; i++)
+       bfd_put_32 (output_bfd,
+                   (bfd_vma) bfd_xcoff_glink_code(output_bfd, i),
+                   &p[4 * i]);
+    }
 
-                 symindx = finfo->sym_indices[indx];
-                 if (symindx < 0)
-                   isym.n_value = 0;
-                 else
-                   isym.n_value = symindx;
-                 bfd_coff_swap_sym_out (output_bfd, (PTR) &isym,
-                                        (PTR) outsym);
-               }
-           }
+  /* If we created a TOC entry for this symbol, write out the required
+     relocs.  */
+  if ((h->flags & XCOFF_SET_TOC) != 0)
+    {
+      asection *tocsec;
+      asection *osec;
+      int oindx;
+      struct internal_reloc *irel;
+      struct internal_ldrel ldrel;
+      struct internal_syment irsym;
+      union internal_auxent iraux;
 
-         esym += isymesz;
-         outsym += osymesz;
+      tocsec = h->toc_section;
+      osec = tocsec->output_section;
+      oindx = osec->target_index;
+      irel = finfo->section_info[oindx].relocs + osec->reloc_count;
+      irel->r_vaddr = (osec->vma
+                      + tocsec->output_offset
+                      + h->u.toc_offset);
 
-         for (i = 0; i < isymp->n_numaux && esym < esym_end; i++)
-           {
-             union internal_auxent aux;
+      if (h->indx >= 0)
+       irel->r_symndx = h->indx;
+      else
+       {
+         h->indx = -2;
+         irel->r_symndx = obj_raw_syment_count (output_bfd);
+       }
 
-             bfd_coff_swap_aux_in (input_bfd, (PTR) esym, isymp->n_type,
-                                   isymp->n_sclass, i, isymp->n_numaux,
-                                   (PTR) &aux);
+      BFD_ASSERT (h->ldindx >= 0);
 
-             if (isymp->n_sclass == C_FILE)
-               {
-                 /* This is the file name (or some comment put in by
-                    the compiler).  If it is long, we must put it in
-                    the string table.  */
-                 if (aux.x_file.x_n.x_zeroes == 0
-                     && aux.x_file.x_n.x_offset != 0)
-                   {
-                     const char *filename;
-                     bfd_size_type indx;
+      /* Initialize the aux union here instead of closer to when it is
+        written out below because the length of the csect depends on
+        whether the output is 32 or 64 bit.  */
+      memset (&iraux, 0, sizeof iraux);
+      iraux.x_csect.x_smtyp = XTY_SD;
+      /* iraux.x_csect.x_scnlen.l = 4 or 8, see below.  */
+      iraux.x_csect.x_smclas = XMC_TC;
 
-                     BFD_ASSERT (aux.x_file.x_n.x_offset
-                                 >= STRING_SIZE_SIZE);
-                     if (strings == NULL)
-                       {
-                         strings = _bfd_coff_read_string_table (input_bfd);
-                         if (strings == NULL)
-                           return false;
-                       }
-                     filename = strings + aux.x_file.x_n.x_offset;
-                     indx = _bfd_stringtab_add (finfo->strtab, filename,
-                                                hash, copy);
-                     if (indx == (bfd_size_type) -1)
-                       return false;
-                     aux.x_file.x_n.x_offset = STRING_SIZE_SIZE + indx;
-                   }
-               }
-             else if ((isymp->n_sclass == C_EXT
-                       || isymp->n_sclass == C_HIDEXT)
-                      && i + 1 == isymp->n_numaux)
-               {
+      /* 32 bit uses a 32 bit R_POS to do the relocations
+        64 bit uses a 64 bit R_POS to do the relocations
 
-                 /* We don't support type checking.  I don't know if
-                     anybody does.  */
-                 aux.x_csect.x_parmhash = 0;
-                 /* I don't think anybody uses these fields, but we'd
-                     better clobber them just in case.  */
-                 aux.x_csect.x_stab = 0;
-                 aux.x_csect.x_snstab = 0;
+        Also needs to change the csect size : 4 for 32 bit, 8 for 64 bit
 
-                 if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_LD)
-                   {
-                     unsigned long indx;
+        Which one is determined by the backend.  */
+      if (bfd_xcoff_is_xcoff64 (output_bfd))
+       {
+         irel->r_size = 63;
+         iraux.x_csect.x_scnlen.l = 8;
+       }
+      else if (bfd_xcoff_is_xcoff32 (output_bfd))
+       {
+         irel->r_size = 31;
+         iraux.x_csect.x_scnlen.l = 4;
+       }
+      else
+       return FALSE;
 
-                     indx = aux.x_csect.x_scnlen.l;
-                     if (indx < obj_raw_syment_count (input_bfd))
-                       {
-                         long symindx;
+      irel->r_type = R_POS;
+      finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
+      ++osec->reloc_count;
 
-                         symindx = finfo->sym_indices[indx];
-                         if (symindx < 0)
-                           {
-                             aux.x_csect.x_scnlen.l = 0;
-                           }
-                         else
-                           {
-                             aux.x_csect.x_scnlen.l = symindx;
-                           }
-                       }
-                   }
-               }
-             else if (isymp->n_sclass != C_STAT || isymp->n_type != T_NULL)
-               {
-                 unsigned long indx;
+      ldrel.l_vaddr = irel->r_vaddr;
+      ldrel.l_symndx = h->ldindx;
+      ldrel.l_rtype = (irel->r_size << 8) | R_POS;
+      ldrel.l_rsecnm = oindx;
+      bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
+      finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
 
-                 if (ISFCN (isymp->n_type)
-                     || ISTAG (isymp->n_sclass)
-                     || isymp->n_sclass == C_BLOCK
-                     || isymp->n_sclass == C_FCN)
-                   {
-                     indx = aux.x_sym.x_fcnary.x_fcn.x_endndx.l;
-                     if (indx > 0
-                         && indx < obj_raw_syment_count (input_bfd))
-                       {
-                         /* We look forward through the symbol for
-                             the index of the next symbol we are going
-                             to include.  I don't know if this is
-                             entirely right.  */
-                         while (finfo->sym_indices[indx] < 0
-                                && indx < obj_raw_syment_count (input_bfd))
-                           ++indx;
-                         if (indx >= obj_raw_syment_count (input_bfd))
-                           indx = output_index;
-                         else
-                           indx = finfo->sym_indices[indx];
-                         aux.x_sym.x_fcnary.x_fcn.x_endndx.l = indx;
+      /* We need to emit a symbol to define a csect which holds
+        the reloc.  */
+      if (finfo->info->strip != strip_all)
+       {
+         result = bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab,
+                                             &irsym, h->root.root.string);
+         if (!result)
+           return FALSE;
 
-                       }
-                   }
+         irsym.n_value = irel->r_vaddr;
+         irsym.n_scnum = osec->target_index;
+         irsym.n_sclass = C_HIDEXT;
+         irsym.n_type = T_NULL;
+         irsym.n_numaux = 1;
 
-                 indx = aux.x_sym.x_tagndx.l;
-                 if (indx > 0 && indx < obj_raw_syment_count (input_bfd))
-                   {
-                     long symindx;
+         bfd_coff_swap_sym_out (output_bfd, (void *) &irsym, (void *) outsym);
+         outsym += bfd_coff_symesz (output_bfd);
 
-                     symindx = finfo->sym_indices[indx];
-                     if (symindx < 0)
-                       aux.x_sym.x_tagndx.l = 0;
-                     else
-                       aux.x_sym.x_tagndx.l = symindx;
-                   }
-
-               }
-
-             /* Copy over the line numbers, unless we are stripping
-                them.  We do this on a symbol by symbol basis in
-                order to more easily handle garbage collection.  */
-             if ((isymp->n_sclass == C_EXT
-                  || isymp->n_sclass == C_HIDEXT)
-                 && i == 0
-                 && isymp->n_numaux > 1
-                 && ISFCN (isymp->n_type)
-                 && aux.x_sym.x_fcnary.x_fcn.x_lnnoptr != 0)
-               {
-                 if (finfo->info->strip != strip_none
-                     && finfo->info->strip != strip_some)
-                   aux.x_sym.x_fcnary.x_fcn.x_lnnoptr = 0;
-                 else
-                   {
-                     asection *enclosing;
-                     unsigned int enc_count;
-                     bfd_signed_vma linoff;
-                     struct internal_lineno lin;
-
-                     o = *csectpp;
-                     enclosing = xcoff_section_data (abfd, o)->enclosing;
-                     enc_count = xcoff_section_data (abfd, o)->lineno_count;
-                     if (oline != enclosing)
-                       {
-                         file_ptr pos = enclosing->line_filepos;
-                         bfd_size_type amt = linesz * enc_count;
-                         if (bfd_seek (input_bfd, pos, SEEK_SET) != 0
-                             || (bfd_bread (finfo->linenos, amt, input_bfd)
-                                 != amt))
-                           return false;
-                         oline = enclosing;
-                       }
-
-                     linoff = (aux.x_sym.x_fcnary.x_fcn.x_lnnoptr
-                               - enclosing->line_filepos);
-
-                     bfd_coff_swap_lineno_in (input_bfd,
-                                              (PTR) (finfo->linenos + linoff),
-                                              (PTR) &lin);
-                     if (lin.l_lnno != 0
-                         || ((bfd_size_type) lin.l_addr.l_symndx
-                             != ((esym
-                                  - isymesz
-                                  - ((bfd_byte *)
-                                     obj_coff_external_syms (input_bfd)))
-                                 / isymesz)))
-                       aux.x_sym.x_fcnary.x_fcn.x_lnnoptr = 0;
-                     else
-                       {
-                         bfd_byte *linpend, *linp;
-                         bfd_vma offset;
-                         bfd_size_type count;
-
-                         lin.l_addr.l_symndx = *indexp;
-                         bfd_coff_swap_lineno_out (output_bfd, (PTR) &lin,
-                                                   (PTR) (finfo->linenos
-                                                          + linoff));
-
-                         linpend = (finfo->linenos
-                                    + enc_count * linesz);
-                         offset = (o->output_section->vma
-                                   + o->output_offset
-                                   - o->vma);
-                         for (linp = finfo->linenos + linoff + linesz;
-                              linp < linpend;
-                              linp += linesz)
-                           {
-                             bfd_coff_swap_lineno_in (input_bfd, (PTR) linp,
-                                                      (PTR) &lin);
-                             if (lin.l_lnno == 0)
-                               break;
-                             lin.l_addr.l_paddr += offset;
-                             bfd_coff_swap_lineno_out (output_bfd,
-                                                       (PTR) &lin,
-                                                       (PTR) linp);
-                           }
-
-                         count = (linp - (finfo->linenos + linoff)) / linesz;
-
-                         aux.x_sym.x_fcnary.x_fcn.x_lnnoptr =
-                           (o->output_section->line_filepos
-                            + o->output_section->lineno_count * linesz);
-
-                         if (bfd_seek (output_bfd,
-                                       aux.x_sym.x_fcnary.x_fcn.x_lnnoptr,
-                                       SEEK_SET) != 0
-                             || (bfd_bwrite (finfo->linenos + linoff,
-                                            linesz * count, output_bfd)
-                                 != linesz * count))
-                           return false;
-
-                         o->output_section->lineno_count += count;
+         /* Note : iraux is initialized above.  */
+         bfd_coff_swap_aux_out (output_bfd, (void *) &iraux, T_NULL, C_HIDEXT,
+                                0, 1, (void *) outsym);
+         outsym += bfd_coff_auxesz (output_bfd);
 
-                         if (incls > 0)
-                           {
-                             struct internal_syment *iisp, *iispend;
-                             long *iindp;
-                             bfd_byte *oos;
-                             int iiadd;
-
-                             /* Update any C_BINCL or C_EINCL symbols
-                                 that refer to a line number in the
-                                 range we just output.  */
-                             iisp = finfo->internal_syms;
-                             iispend = (iisp
-                                        + obj_raw_syment_count (input_bfd));
-                             iindp = finfo->sym_indices;
-                             oos = finfo->outsyms;
-                             while (iisp < iispend)
-                               {
-                                 if (*iindp >= 0
-                                     && (iisp->n_sclass == C_BINCL
-                                         || iisp->n_sclass == C_EINCL)
-                                     && ((bfd_size_type) iisp->n_value
-                                         >= (bfd_size_type)(enclosing->line_filepos + linoff))
-                                     && ((bfd_size_type) iisp->n_value
-                                         < (enclosing->line_filepos
-                                            + enc_count * linesz)))
-                                   {
-                                     struct internal_syment iis;
-
-                                     bfd_coff_swap_sym_in (output_bfd,
-                                                           (PTR) oos,
-                                                           (PTR) &iis);
-                                     iis.n_value =
-                                       (iisp->n_value
-                                        - enclosing->line_filepos
-                                        - linoff
-                                        + aux.x_sym.x_fcnary.x_fcn.x_lnnoptr);
-                                     bfd_coff_swap_sym_out (output_bfd,
-                                                            (PTR) &iis,
-                                                            (PTR) oos);
-                                     --incls;
-                                   }
-
-                                 iiadd = 1 + iisp->n_numaux;
-                                 if (*iindp >= 0)
-                                   oos += iiadd * osymesz;
-                                 iisp += iiadd;
-                                 iindp += iiadd;
-                               }
-                           }
-                       }
-                   }
-               }
+         if (h->indx >= 0)
+           {
+             /* We aren't going to write out the symbols below, so we
+                need to write them out now.  */
+             pos = obj_sym_filepos (output_bfd);
+             pos += (obj_raw_syment_count (output_bfd)
+                     * bfd_coff_symesz (output_bfd));
+             amt = outsym - finfo->outsyms;
+             if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+                 || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt)
+               return FALSE;
+             obj_raw_syment_count (output_bfd) +=
+               (outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd);
 
-             bfd_coff_swap_aux_out (output_bfd, (PTR) &aux, isymp->n_type,
-                                    isymp->n_sclass, i, isymp->n_numaux,
-                                    (PTR) outsym);
-             outsym += osymesz;
-             esym += isymesz;
+             outsym = finfo->outsyms;
            }
        }
-
-      indexp += add;
-      isymp += add;
-      csectpp += add;
-    }
-
-  /* If we swapped out a C_FILE symbol, guess that the next C_FILE
-     symbol will be the first symbol in the next input file.  In the
-     normal case, this will save us from writing out the C_FILE symbol
-     again.  */
-  if (finfo->last_file_index != -1
-      && (bfd_size_type) finfo->last_file_index >= syment_base)
-    {
-      finfo->last_file.n_value = output_index;
-      bfd_coff_swap_sym_out (output_bfd, (PTR) &finfo->last_file,
-                            (PTR) (finfo->outsyms
-                                   + ((finfo->last_file_index - syment_base)
-                                      * osymesz)));
-    }
-
-  /* Write the modified symbols to the output file.  */
-  if (outsym > finfo->outsyms)
-    {
-      file_ptr pos = obj_sym_filepos (output_bfd) + syment_base * osymesz;
-      bfd_size_type amt = outsym - finfo->outsyms;
-      if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
-         || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt)
-       return false;
-
-      BFD_ASSERT ((obj_raw_syment_count (output_bfd)
-                  + (outsym - finfo->outsyms) / osymesz)
-                 == output_index);
-
-      obj_raw_syment_count (output_bfd) = output_index;
     }
 
-  /* Don't let the linker relocation routines discard the symbols.  */
-  keep_syms = obj_coff_keep_syms (input_bfd);
-  obj_coff_keep_syms (input_bfd) = true;
+  /* If this symbol is a specially defined function descriptor, write
+     it out.  The first word is the address of the function code
+     itself, the second word is the address of the TOC, and the third
+     word is zero.
 
-  /* Relocate the contents of each section.  */
-  for (o = input_bfd->sections; o != NULL; o = o->next)
+     32 bit vs 64 bit
+     The addresses for the 32 bit will take 4 bytes and the addresses
+     for 64 bit will take 8 bytes.  Similar for the relocs.  This type
+     of logic was also done above to create a TOC entry in
+     xcoff_write_global_symbol.  */
+  if ((h->flags & XCOFF_DESCRIPTOR) != 0
+      && h->root.type == bfd_link_hash_defined
+      && (h->root.u.def.section
+         == xcoff_hash_table (finfo->info)->descriptor_section))
     {
+      asection *sec;
+      asection *osec;
+      int oindx;
+      bfd_byte *p;
+      struct xcoff_link_hash_entry *hentry;
+      asection *esec;
+      struct internal_reloc *irel;
+      struct internal_ldrel ldrel;
+      asection *tsec;
+      unsigned int reloc_size, byte_size;
 
-      bfd_byte *contents;
-
-      if (! o->linker_mark)
+      if (bfd_xcoff_is_xcoff64 (output_bfd))
        {
-         /* This section was omitted from the link.  */
-         continue;
+         reloc_size = 63;
+         byte_size = 8;
        }
-
-      if ((o->flags & SEC_HAS_CONTENTS) == 0
-         || o->_raw_size == 0
-         || (o->flags & SEC_IN_MEMORY) != 0)
-       continue;
-
-      /* We have set filepos correctly for the sections we created to
-        represent csects, so bfd_get_section_contents should work.  */
-      if (coff_section_data (input_bfd, o) != NULL
-         && coff_section_data (input_bfd, o)->contents != NULL)
-       contents = coff_section_data (input_bfd, o)->contents;
-      else {
-       if (! bfd_get_section_contents (input_bfd, o, finfo->contents,
-                                       (file_ptr) 0, o->_raw_size))
-         return false;
-       contents = finfo->contents;
-      }
-
-      if ((o->flags & SEC_RELOC) != 0)
+      else if (bfd_xcoff_is_xcoff32 (output_bfd))
        {
-         int target_index;
-         struct internal_reloc *internal_relocs;
-         struct internal_reloc *irel;
-         bfd_vma offset;
-         struct internal_reloc *irelend;
-         struct xcoff_link_hash_entry **rel_hash;
-         long r_symndx;
-
-         /* Read in the relocs.  */
-         target_index = o->output_section->target_index;
-         internal_relocs = (xcoff_read_internal_relocs
-                            (input_bfd, o, false, finfo->external_relocs,
-                             true,
-                             (finfo->section_info[target_index].relocs
-                              + o->output_section->reloc_count)));
-         if (internal_relocs == NULL)
-           return false;
-
-         /* Call processor specific code to relocate the section
-            contents.  */
-         if (! bfd_coff_relocate_section (output_bfd, finfo->info,
-                                          input_bfd, o,
-                                          contents,
-                                          internal_relocs,
-                                          finfo->internal_syms,
-                                          xcoff_data (input_bfd)->csects))
-           return false;
-
-         offset = o->output_section->vma + o->output_offset - o->vma;
-         irel = internal_relocs;
-         irelend = irel + o->reloc_count;
-         rel_hash = (finfo->section_info[target_index].rel_hashes
-                     + o->output_section->reloc_count);
-         for (; irel < irelend; irel++, rel_hash++)
-           {
-             struct xcoff_link_hash_entry *h = NULL;
-             struct internal_ldrel ldrel;
-             boolean quiet;
-
-             *rel_hash = NULL;
-
-             /* Adjust the reloc address and symbol index.  */
-
-             irel->r_vaddr += offset;
-
-             r_symndx = irel->r_symndx;
-
-             if (r_symndx == -1)
-               h = NULL;
-             else
-               h = obj_xcoff_sym_hashes (input_bfd)[r_symndx];
-
-             if (r_symndx != -1 && finfo->info->strip != strip_all)
-               {
-                 if (h != NULL
-                     && h->smclas != XMC_TD
-                     && (irel->r_type == R_TOC
-                         || irel->r_type == R_GL
-                         || irel->r_type == R_TCL
-                         || irel->r_type == R_TRL
-                         || irel->r_type == R_TRLA))
-                   {
-                     /* This is a TOC relative reloc with a symbol
-                        attached.  The symbol should be the one which
-                        this reloc is for.  We want to make this
-                        reloc against the TOC address of the symbol,
-                        not the symbol itself.  */
-                     BFD_ASSERT (h->toc_section != NULL);
-                     BFD_ASSERT ((h->flags & XCOFF_SET_TOC) == 0);
-                     if (h->u.toc_indx != -1)
-                       irel->r_symndx = h->u.toc_indx;
-                     else
-                       {
-                         struct xcoff_toc_rel_hash *n;
-                         struct xcoff_link_section_info *si;
-                         bfd_size_type amt;
-
-                         amt = sizeof (struct xcoff_toc_rel_hash);
-                         n = ((struct xcoff_toc_rel_hash *)
-                              bfd_alloc (finfo->output_bfd, amt));
-                         if (n == NULL)
-                           return false;
-                         si = finfo->section_info + target_index;
-                         n->next = si->toc_rel_hashes;
-                         n->h = h;
-                         n->rel = irel;
-                         si->toc_rel_hashes = n;
-                       }
-                   }
-                 else if (h != NULL)
-                   {
-                     /* This is a global symbol.  */
-                     if (h->indx >= 0)
-                       irel->r_symndx = h->indx;
-                     else
-                       {
-                         /* This symbol is being written at the end
-                            of the file, and we do not yet know the
-                            symbol index.  We save the pointer to the
-                            hash table entry in the rel_hash list.
-                            We set the indx field to -2 to indicate
-                            that this symbol must not be stripped.  */
-                         *rel_hash = h;
-                         h->indx = -2;
-                       }
-                   }
-                 else
-                   {
-                     long indx;
-
-                     indx = finfo->sym_indices[r_symndx];
-
-                     if (indx == -1)
-                       {
-                         struct internal_syment *is;
-
-                         /* Relocations against a TC0 TOC anchor are
-                            automatically transformed to be against
-                            the TOC anchor in the output file.  */
-                         is = finfo->internal_syms + r_symndx;
-                         if (is->n_sclass == C_HIDEXT
-                             && is->n_numaux > 0)
-                           {
-                             PTR auxptr;
-                             union internal_auxent aux;
-
-                             auxptr = ((PTR)
-                                       (((bfd_byte *)
-                                         obj_coff_external_syms (input_bfd))
-                                        + ((r_symndx + is->n_numaux)
-                                           * isymesz)));
-                             bfd_coff_swap_aux_in (input_bfd, auxptr,
-                                                   is->n_type, is->n_sclass,
-                                                   is->n_numaux - 1,
-                                                   is->n_numaux,
-                                                   (PTR) &aux);
-                             if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_SD
-                                 && aux.x_csect.x_smclas == XMC_TC0)
-                               indx = finfo->toc_symindx;
-                           }
-                       }
-
-                     if (indx != -1)
-                       irel->r_symndx = indx;
-                     else
-                       {
-
-                         struct internal_syment *is;
-
-                         const char *name;
-                         char buf[SYMNMLEN + 1];
-
-                         /* This reloc is against a symbol we are
-                            stripping.  It would be possible to handle
-                            this case, but I don't think it's worth it.  */
-                         is = finfo->internal_syms + r_symndx;
-
-                         name = (_bfd_coff_internal_syment_name
-                                 (input_bfd, is, buf));
+         reloc_size = 31;
+         byte_size = 4;
+       }
+      else
+       return FALSE;
 
-                         if (name == NULL)
-                           return false;
+      sec = h->root.u.def.section;
+      osec = sec->output_section;
+      oindx = osec->target_index;
+      p = sec->contents + h->root.u.def.value;
 
-                         if (! ((*finfo->info->callbacks->unattached_reloc)
-                                (finfo->info, name, input_bfd, o,
-                                 irel->r_vaddr)))
-                           return false;
-                       }
-                   }
-               }
+      hentry = h->descriptor;
+      BFD_ASSERT (hentry != NULL
+                 && (hentry->root.type == bfd_link_hash_defined
+                     || hentry->root.type == bfd_link_hash_defweak));
+      esec = hentry->root.u.def.section;
 
-             quiet = false;
-             switch (irel->r_type)
-               {
-               default:
-                 if (h == NULL
-                     || h->root.type == bfd_link_hash_defined
-                     || h->root.type == bfd_link_hash_defweak
-                     || h->root.type == bfd_link_hash_common)
-                   break;
-                 /* Fall through.  */
-               case R_POS:
-               case R_NEG:
-               case R_RL:
-               case R_RLA:
-                 /* This reloc needs to be copied into the .loader
-                    section.  */
-                 ldrel.l_vaddr = irel->r_vaddr;
-                 if (r_symndx == -1)
-                   ldrel.l_symndx = -(bfd_size_type ) 1;
-                 else if (h == NULL
-                          || (h->root.type == bfd_link_hash_defined
-                              || h->root.type == bfd_link_hash_defweak
-                              || h->root.type == bfd_link_hash_common))
-                   {
-                     asection *sec;
+      irel = finfo->section_info[oindx].relocs + osec->reloc_count;
+      irel->r_vaddr = (osec->vma
+                      + sec->output_offset
+                      + h->root.u.def.value);
+      irel->r_symndx = esec->output_section->target_index;
+      irel->r_type = R_POS;
+      irel->r_size = reloc_size;
+      finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
+      ++osec->reloc_count;
 
-                     if (h == NULL)
-                       sec = xcoff_data (input_bfd)->csects[r_symndx];
-                     else if (h->root.type == bfd_link_hash_common)
-                       sec = h->root.u.c.p->section;
-                     else
-                       sec = h->root.u.def.section;
-                     sec = sec->output_section;
+      ldrel.l_vaddr = irel->r_vaddr;
+      if (strcmp (esec->output_section->name, ".text") == 0)
+       ldrel.l_symndx = 0;
+      else if (strcmp (esec->output_section->name, ".data") == 0)
+       ldrel.l_symndx = 1;
+      else if (strcmp (esec->output_section->name, ".bss") == 0)
+       ldrel.l_symndx = 2;
+      else
+       {
+         (*_bfd_error_handler)
+           (_("%s: loader reloc in unrecognized section `%s'"),
+            bfd_get_filename (output_bfd),
+            esec->output_section->name);
+         bfd_set_error (bfd_error_nonrepresentable_section);
+         return FALSE;
+       }
+      ldrel.l_rtype = (reloc_size << 8) | R_POS;
+      ldrel.l_rsecnm = oindx;
+      bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
+      finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
 
-                     if (strcmp (sec->name, ".text") == 0)
-                       ldrel.l_symndx = 0;
-                     else if (strcmp (sec->name, ".data") == 0)
-                       ldrel.l_symndx = 1;
-                     else if (strcmp (sec->name, ".bss") == 0)
-                       ldrel.l_symndx = 2;
-                     else
-                       {
-                         (*_bfd_error_handler)
-                           (_("%s: loader reloc in unrecognized section `%s'"),
-                            bfd_archive_filename (input_bfd),
-                            sec->name);
-                         bfd_set_error (bfd_error_nonrepresentable_section);
-                         return false;
-                       }
-                   }
-                 else
-                   {
-                     if (! finfo->info->relocateable
-                         && (h->flags & XCOFF_DEF_DYNAMIC) == 0
-                         && (h->flags & XCOFF_IMPORT) == 0)
-                       {
-                         /* We already called the undefined_symbol
-                            callback for this relocation, in
-                            _bfd_ppc_xcoff_relocate_section.  Don't
-                            issue any more warnings.  */
-                         quiet = true;
-                       }
-                     if (h->ldindx < 0 && ! quiet)
-                       {
-                         (*_bfd_error_handler)
-                           (_("%s: `%s' in loader reloc but not loader sym"),
-                            bfd_archive_filename (input_bfd),
-                            h->root.root.string);
-                         bfd_set_error (bfd_error_bad_value);
-                         return false;
-                       }
-                     ldrel.l_symndx = h->ldindx;
-                   }
-                 ldrel.l_rtype = (irel->r_size << 8) | irel->r_type;
-                 ldrel.l_rsecnm = o->output_section->target_index;
-                 if (xcoff_hash_table (finfo->info)->textro
-                     && strcmp (o->output_section->name, ".text") == 0
-                     && ! quiet)
-                   {
-                     (*_bfd_error_handler)
-                       (_("%s: loader reloc in read-only section %s"),
-                        bfd_archive_filename (input_bfd),
-                        bfd_get_section_name (finfo->output_bfd,
-                                              o->output_section));
-                     bfd_set_error (bfd_error_invalid_operation);
-                     return false;
-                   }
-                 bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel,
-                                           finfo->ldrel);
+      /* There are three items to write out,
+        the address of the code
+        the address of the toc anchor
+        the environment pointer.
+        We are ignoring the environment pointer.  So set it to zero.  */
+      if (bfd_xcoff_is_xcoff64 (output_bfd))
+       {
+         bfd_put_64 (output_bfd,
+                     (esec->output_section->vma + esec->output_offset
+                      + hentry->root.u.def.value),
+                     p);
+         bfd_put_64 (output_bfd, xcoff_data (output_bfd)->toc, p + 8);
+         bfd_put_64 (output_bfd, (bfd_vma) 0, p + 16);
+       }
+      else
+       {
+         /* 32 bit backend
+            This logic was already called above so the error case where
+            the backend is neither has already been checked.  */
+         bfd_put_32 (output_bfd,
+                     (esec->output_section->vma + esec->output_offset
+                      + hentry->root.u.def.value),
+                     p);
+         bfd_put_32 (output_bfd, xcoff_data (output_bfd)->toc, p + 4);
+         bfd_put_32 (output_bfd, (bfd_vma) 0, p + 8);
+       }
 
-                 finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
-                 break;
+      tsec = coff_section_from_bfd_index (output_bfd,
+                                         xcoff_data (output_bfd)->sntoc);
 
-               case R_TOC:
-               case R_GL:
-               case R_TCL:
-               case R_TRL:
-               case R_TRLA:
-                 /* We should never need a .loader reloc for a TOC
-                    relative reloc.  */
-                 break;
-               }
-           }
+      ++irel;
+      irel->r_vaddr = (osec->vma
+                      + sec->output_offset
+                      + h->root.u.def.value
+                      + byte_size);
+      irel->r_symndx = tsec->output_section->target_index;
+      irel->r_type = R_POS;
+      irel->r_size = reloc_size;
+      finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
+      ++osec->reloc_count;
 
-         o->output_section->reloc_count += o->reloc_count;
+      ldrel.l_vaddr = irel->r_vaddr;
+      if (strcmp (tsec->output_section->name, ".text") == 0)
+       ldrel.l_symndx = 0;
+      else if (strcmp (tsec->output_section->name, ".data") == 0)
+       ldrel.l_symndx = 1;
+      else if (strcmp (tsec->output_section->name, ".bss") == 0)
+       ldrel.l_symndx = 2;
+      else
+       {
+         (*_bfd_error_handler)
+           (_("%s: loader reloc in unrecognized section `%s'"),
+            bfd_get_filename (output_bfd),
+            tsec->output_section->name);
+         bfd_set_error (bfd_error_nonrepresentable_section);
+         return FALSE;
        }
+      ldrel.l_rtype = (reloc_size << 8) | R_POS;
+      ldrel.l_rsecnm = oindx;
+      bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
+      finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
+    }
 
-      /* Write out the modified section contents.  */
-      if (! bfd_set_section_contents (output_bfd, o->output_section,
-                                     contents, (file_ptr) o->output_offset,
-                                     (o->_cooked_size != 0
-                                      ? o->_cooked_size
-                                      : o->_raw_size)))
-       return false;
+  if (h->indx >= 0 || finfo->info->strip == strip_all)
+    {
+      BFD_ASSERT (outsym == finfo->outsyms);
+      return TRUE;
     }
 
-  obj_coff_keep_syms (input_bfd) = keep_syms;
+  if (h->indx != -2
+      && (finfo->info->strip == strip_all
+         || (finfo->info->strip == strip_some
+             && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string,
+                                 FALSE, FALSE) == NULL)))
+    {
+      BFD_ASSERT (outsym == finfo->outsyms);
+      return TRUE;
+    }
 
-  if (! finfo->info->keep_memory)
+  if (h->indx != -2
+      && (h->flags & (XCOFF_REF_REGULAR | XCOFF_DEF_REGULAR)) == 0)
     {
-      if (! _bfd_coff_free_symbols (input_bfd))
-       return false;
+      BFD_ASSERT (outsym == finfo->outsyms);
+      return TRUE;
     }
 
-  return true;
-}
+  memset (&aux, 0, sizeof aux);
 
-#undef N_TMASK
-#undef N_BTSHFT
+  h->indx = obj_raw_syment_count (output_bfd);
 
-/* Write out a non-XCOFF global symbol.  */
+  result = bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab, &isym,
+                                     h->root.root.string);
+  if (!result)
+    return FALSE;
 
+  if (h->root.type == bfd_link_hash_undefined
+      || h->root.type == bfd_link_hash_undefweak)
+    {
+      isym.n_value = 0;
+      isym.n_scnum = N_UNDEF;
+      if (h->root.type == bfd_link_hash_undefweak
+         && C_WEAKEXT == C_AIX_WEAKEXT)
+       isym.n_sclass = C_WEAKEXT;
+      else
+       isym.n_sclass = C_EXT;
+      aux.x_csect.x_smtyp = XTY_ER;
+    }
+  else if ((h->root.type == bfd_link_hash_defined
+           || h->root.type == bfd_link_hash_defweak)
+          && h->smclas == XMC_XO)
+    {
+      BFD_ASSERT (bfd_is_abs_section (h->root.u.def.section));
+      isym.n_value = h->root.u.def.value;
+      isym.n_scnum = N_UNDEF;
+      if (h->root.type == bfd_link_hash_undefweak
+         && C_WEAKEXT == C_AIX_WEAKEXT)
+       isym.n_sclass = C_WEAKEXT;
+      else
+       isym.n_sclass = C_EXT;
+      aux.x_csect.x_smtyp = XTY_ER;
+    }
+  else if (h->root.type == bfd_link_hash_defined
+          || h->root.type == bfd_link_hash_defweak)
+    {
+      struct xcoff_link_size_list *l;
 
-static boolean
-xcoff_write_global_symbol (h, inf)
-     struct xcoff_link_hash_entry *h;
-     PTR inf;
-{
-  struct xcoff_final_link_info *finfo = (struct xcoff_final_link_info *) inf;
-  bfd *output_bfd;
-  bfd_byte *outsym;
-  struct internal_syment isym;
-  union internal_auxent aux;
-  boolean result;
-  file_ptr pos;
-  bfd_size_type amt;
+      isym.n_value = (h->root.u.def.section->output_section->vma
+                     + h->root.u.def.section->output_offset
+                     + h->root.u.def.value);
+      if (bfd_is_abs_section (h->root.u.def.section->output_section))
+       isym.n_scnum = N_ABS;
+      else
+       isym.n_scnum = h->root.u.def.section->output_section->target_index;
+      isym.n_sclass = C_HIDEXT;
+      aux.x_csect.x_smtyp = XTY_SD;
 
-  output_bfd = finfo->output_bfd;
-  outsym = finfo->outsyms;
+      if ((h->flags & XCOFF_HAS_SIZE) != 0)
+       {
+         for (l = xcoff_hash_table (finfo->info)->size_list;
+              l != NULL;
+              l = l->next)
+           {
+             if (l->h == h)
+               {
+                 aux.x_csect.x_scnlen.l = l->size;
+                 break;
+               }
+           }
+       }
+    }
+  else if (h->root.type == bfd_link_hash_common)
+    {
+      isym.n_value = (h->root.u.c.p->section->output_section->vma
+                     + h->root.u.c.p->section->output_offset);
+      isym.n_scnum = h->root.u.c.p->section->output_section->target_index;
+      isym.n_sclass = C_EXT;
+      aux.x_csect.x_smtyp = XTY_CM;
+      aux.x_csect.x_scnlen.l = h->root.u.c.size;
+    }
+  else
+    abort ();
 
-  /* If this symbol was garbage collected, just skip it.  */
-  if (xcoff_hash_table (finfo->info)->gc
-      && (h->flags & XCOFF_MARK) == 0)
-    return true;
+  isym.n_type = T_NULL;
+  isym.n_numaux = 1;
 
-  /* If we need a .loader section entry, write it out.  */
-  if (h->ldsym != NULL)
-    {
-      struct internal_ldsym *ldsym;
-      bfd *impbfd;
+  bfd_coff_swap_sym_out (output_bfd, (void *) &isym, (void *) outsym);
+  outsym += bfd_coff_symesz (output_bfd);
 
-      ldsym = h->ldsym;
+  aux.x_csect.x_smclas = h->smclas;
+  bfd_coff_swap_aux_out (output_bfd, (void *) &aux, T_NULL, isym.n_sclass, 0, 1,
+                        (void *) outsym);
+  outsym += bfd_coff_auxesz (output_bfd);
 
-      if (h->root.type == bfd_link_hash_undefined
-         || h->root.type == bfd_link_hash_undefweak)
-       {
+  if ((h->root.type == bfd_link_hash_defined
+       || h->root.type == bfd_link_hash_defweak)
+      && h->smclas != XMC_XO)
+    {
+      /* We just output an SD symbol.  Now output an LD symbol.  */
+      h->indx += 2;
 
-         ldsym->l_value = 0;
-         ldsym->l_scnum = N_UNDEF;
-         ldsym->l_smtype = XTY_ER;
-         impbfd = h->root.u.undef.abfd;
+      if (h->root.type == bfd_link_hash_undefweak
+         && C_WEAKEXT == C_AIX_WEAKEXT)
+       isym.n_sclass = C_WEAKEXT;
+      else
+       isym.n_sclass = C_EXT;
+      bfd_coff_swap_sym_out (output_bfd, (void *) &isym, (void *) outsym);
+      outsym += bfd_coff_symesz (output_bfd);
 
-       }
-      else if (h->root.type == bfd_link_hash_defined
-              || h->root.type == bfd_link_hash_defweak)
-       {
+      aux.x_csect.x_smtyp = XTY_LD;
+      aux.x_csect.x_scnlen.l = obj_raw_syment_count (output_bfd);
+      bfd_coff_swap_aux_out (output_bfd, (void *) &aux, T_NULL, C_EXT, 0, 1,
+                            (void *) outsym);
+      outsym += bfd_coff_auxesz (output_bfd);
+    }
 
-         asection *sec;
+  pos = obj_sym_filepos (output_bfd);
+  pos += obj_raw_syment_count (output_bfd) * bfd_coff_symesz (output_bfd);
+  amt = outsym - finfo->outsyms;
+  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
+      || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt)
+    return FALSE;
+  obj_raw_syment_count (output_bfd) +=
+    (outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd);
 
-         sec = h->root.u.def.section;
-         ldsym->l_value = (sec->output_section->vma
-                           + sec->output_offset
-                           + h->root.u.def.value);
-         ldsym->l_scnum = sec->output_section->target_index;
-         ldsym->l_smtype = XTY_SD;
-         impbfd = sec->owner;
+  return TRUE;
+}
 
-       }
-      else
-       abort ();
+/* Handle a link order which is supposed to generate a reloc.  */
 
-      if (((h->flags & XCOFF_DEF_REGULAR) == 0
-          && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
-         || (h->flags & XCOFF_IMPORT) != 0)
-       {
-         /* Clear l_smtype
-            Import symbols are defined so the check above will make
-            the l_smtype XTY_SD.  But this is not correct, it should
-            be cleared.  */
-         ldsym->l_smtype |= L_IMPORT;
-       }
+static bfd_boolean
+xcoff_reloc_link_order (bfd *output_bfd,
+                       struct xcoff_final_link_info *finfo,
+                       asection *output_section,
+                       struct bfd_link_order *link_order)
+{
+  reloc_howto_type *howto;
+  struct xcoff_link_hash_entry *h;
+  asection *hsec;
+  bfd_vma hval;
+  bfd_vma addend;
+  struct internal_reloc *irel;
+  struct xcoff_link_hash_entry **rel_hash_ptr;
+  struct internal_ldrel ldrel;
 
-      if (((h->flags & XCOFF_DEF_REGULAR) != 0
-          && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
-         || (h->flags & XCOFF_EXPORT) != 0)
-       {
-         ldsym->l_smtype |= L_EXPORT;
-       }
+  if (link_order->type == bfd_section_reloc_link_order)
+    /* We need to somehow locate a symbol in the right section.  The
+       symbol must either have a value of zero, or we must adjust
+       the addend by the value of the symbol.  FIXME: Write this
+       when we need it.  The old linker couldn't handle this anyhow.  */
+    abort ();
 
-      if ((h->flags & XCOFF_ENTRY) != 0)
-       {
-         ldsym->l_smtype |= L_ENTRY;
-       }
+  howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
+  if (howto == NULL)
+    {
+      bfd_set_error (bfd_error_bad_value);
+      return FALSE;
+    }
 
-      if ((h->flags & XCOFF_RTINIT) != 0)
-       {
-         ldsym->l_smtype = XTY_SD;
-       }
+  h = ((struct xcoff_link_hash_entry *)
+       bfd_wrapped_link_hash_lookup (output_bfd, finfo->info,
+                                    link_order->u.reloc.p->u.name,
+                                    FALSE, FALSE, TRUE));
+  if (h == NULL)
+    {
+      if (! ((*finfo->info->callbacks->unattached_reloc)
+            (finfo->info, link_order->u.reloc.p->u.name, NULL, NULL, (bfd_vma) 0)))
+       return FALSE;
+      return TRUE;
+    }
 
-      ldsym->l_smclas = h->smclas;
+  if (h->root.type == bfd_link_hash_common)
+    {
+      hsec = h->root.u.c.p->section;
+      hval = 0;
+    }
+  else if (h->root.type == bfd_link_hash_defined
+          || h->root.type == bfd_link_hash_defweak)
+    {
+      hsec = h->root.u.def.section;
+      hval = h->root.u.def.value;
+    }
+  else
+    {
+      hsec = NULL;
+      hval = 0;
+    }
 
-      if (ldsym->l_smtype & L_IMPORT)
-       {
-         if ((h->root.type == bfd_link_hash_defined
-              || h->root.type == bfd_link_hash_defweak)
-             && (h->root.u.def.value != 0))
-           {
-             ldsym->l_smclas = XMC_XO;
-           }
-         else if ((h->flags & (XCOFF_SYSCALL32 | XCOFF_SYSCALL64)) ==
-                  (XCOFF_SYSCALL32 | XCOFF_SYSCALL64))
-           {
-             ldsym->l_smclas = XMC_SV3264;
-           }
-         else if (h->flags & XCOFF_SYSCALL32)
-           {
-             ldsym->l_smclas = XMC_SV;
-           }
-         else if (h->flags & XCOFF_SYSCALL64)
-           {
-             ldsym->l_smclas = XMC_SV64;
-           }
-       }
+  addend = link_order->u.reloc.p->addend;
+  if (hsec != NULL)
+    addend += (hsec->output_section->vma
+              + hsec->output_offset
+              + hval);
+
+  if (addend != 0)
+    {
+      bfd_size_type size;
+      bfd_byte *buf;
+      bfd_reloc_status_type rstat;
+      bfd_boolean ok;
 
-      if (ldsym->l_ifile == -(bfd_size_type) 1)
-       {
-         ldsym->l_ifile = 0;
-       }
-      else if (ldsym->l_ifile == 0)
+      size = bfd_get_reloc_size (howto);
+      buf = bfd_zmalloc (size);
+      if (buf == NULL)
+       return FALSE;
+
+      rstat = _bfd_relocate_contents (howto, output_bfd, addend, buf);
+      switch (rstat)
        {
-         if ((ldsym->l_smtype & L_IMPORT) == 0)
-           {
-             ldsym->l_ifile = 0;
-           }
-         else if (impbfd == NULL)
-           {
-             ldsym->l_ifile = 0;
-           }
-         else
+       case bfd_reloc_ok:
+         break;
+       default:
+       case bfd_reloc_outofrange:
+         abort ();
+       case bfd_reloc_overflow:
+         if (! ((*finfo->info->callbacks->reloc_overflow)
+                (finfo->info, NULL, link_order->u.reloc.p->u.name,
+                 howto->name, addend, NULL, NULL, (bfd_vma) 0)))
            {
-             BFD_ASSERT (impbfd->xvec == output_bfd->xvec);
-             ldsym->l_ifile = xcoff_data (impbfd)->import_file_id;
+             free (buf);
+             return FALSE;
            }
+         break;
        }
+      ok = bfd_set_section_contents (output_bfd, output_section, (void *) buf,
+                                    (file_ptr) link_order->offset, size);
+      free (buf);
+      if (! ok)
+       return FALSE;
+    }
 
-      ldsym->l_parm = 0;
+  /* Store the reloc information in the right place.  It will get
+     swapped and written out at the end of the final_link routine.  */
+  irel = (finfo->section_info[output_section->target_index].relocs
+         + output_section->reloc_count);
+  rel_hash_ptr = (finfo->section_info[output_section->target_index].rel_hashes
+                 + output_section->reloc_count);
 
-      BFD_ASSERT (h->ldindx >= 0);
+  memset (irel, 0, sizeof (struct internal_reloc));
+  *rel_hash_ptr = NULL;
 
-      bfd_xcoff_swap_ldsym_out (output_bfd, ldsym,
-                               (finfo->ldsym +
-                                (h->ldindx - 3)
-                                * bfd_xcoff_ldsymsz(finfo->output_bfd)));
-      h->ldsym = NULL;
-    }
+  irel->r_vaddr = output_section->vma + link_order->offset;
 
-  /* If this symbol needs global linkage code, write it out.  */
-  if (h->root.type == bfd_link_hash_defined
-      && (h->root.u.def.section
-         == xcoff_hash_table (finfo->info)->linkage_section))
+  if (h->indx >= 0)
+    irel->r_symndx = h->indx;
+  else
     {
-      bfd_byte *p;
-      bfd_vma tocoff;
-      unsigned int i;
+      /* Set the index to -2 to force this symbol to get written out.  */
+      h->indx = -2;
+      *rel_hash_ptr = h;
+      irel->r_symndx = 0;
+    }
 
-      p = h->root.u.def.section->contents + h->root.u.def.value;
+  irel->r_type = howto->type;
+  irel->r_size = howto->bitsize - 1;
+  if (howto->complain_on_overflow == complain_overflow_signed)
+    irel->r_size |= 0x80;
 
-      /* The first instruction in the global linkage code loads a
-        specific TOC element.  */
-      tocoff = (h->descriptor->toc_section->output_section->vma
-               + h->descriptor->toc_section->output_offset
-               - xcoff_data (output_bfd)->toc);
+  ++output_section->reloc_count;
 
-      if ((h->descriptor->flags & XCOFF_SET_TOC) != 0)
-       {
-         tocoff += h->descriptor->u.toc_offset;
-       }
+  /* Now output the reloc to the .loader section.  */
 
+  ldrel.l_vaddr = irel->r_vaddr;
 
-      /* The first instruction in the glink code needs to be
-        cooked to to hold the correct offset in the toc.  The
-        rest are just output raw.  */
-      bfd_put_32 (output_bfd,
-                 bfd_xcoff_glink_code(output_bfd, 0) | (tocoff & 0xffff), p);
+  if (hsec != NULL)
+    {
+      const char *secname;
 
-      /* Start with i == 1 to get past the first instruction done above
-        The /4 is because the glink code is in bytes and we are going
-        4 at a pop.  */
-      for (i = 1; i < bfd_xcoff_glink_code_size(output_bfd) / 4; i++)
+      secname = hsec->output_section->name;
+
+      if (strcmp (secname, ".text") == 0)
+       ldrel.l_symndx = 0;
+      else if (strcmp (secname, ".data") == 0)
+       ldrel.l_symndx = 1;
+      else if (strcmp (secname, ".bss") == 0)
+       ldrel.l_symndx = 2;
+      else
        {
-         bfd_put_32 (output_bfd,
-                     (bfd_vma) bfd_xcoff_glink_code(output_bfd, i),
-                     &p[4 * i]);
+         (*_bfd_error_handler)
+           (_("%s: loader reloc in unrecognized section `%s'"),
+            bfd_get_filename (output_bfd), secname);
+         bfd_set_error (bfd_error_nonrepresentable_section);
+         return FALSE;
        }
     }
-
-  /* If we created a TOC entry for this symbol, write out the required
-     relocs.  */
-  if ((h->flags & XCOFF_SET_TOC) != 0)
+  else
     {
-      asection *tocsec;
-      asection *osec;
-      int oindx;
-      struct internal_reloc *irel;
-      struct internal_ldrel ldrel;
-      struct internal_syment irsym;
-      union internal_auxent iraux;
+      if (h->ldindx < 0)
+       {
+         (*_bfd_error_handler)
+           (_("%s: `%s' in loader reloc but not loader sym"),
+            bfd_get_filename (output_bfd),
+            h->root.root.string);
+         bfd_set_error (bfd_error_bad_value);
+         return FALSE;
+       }
+      ldrel.l_symndx = h->ldindx;
+    }
 
-      tocsec = h->toc_section;
-      osec = tocsec->output_section;
-      oindx = osec->target_index;
-      irel = finfo->section_info[oindx].relocs + osec->reloc_count;
-      irel->r_vaddr = (osec->vma
-                      + tocsec->output_offset
-                      + h->u.toc_offset);
+  ldrel.l_rtype = (irel->r_size << 8) | irel->r_type;
+  ldrel.l_rsecnm = output_section->target_index;
+  bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
+  finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
 
+  return TRUE;
+}
 
-      if (h->indx >= 0)
-       {
-         irel->r_symndx = h->indx;
-       }
-      else
-       {
-         h->indx = -2;
-         irel->r_symndx = obj_raw_syment_count (output_bfd);
-       }
+/* Do the final link step.  */
 
-      BFD_ASSERT (h->ldindx >= 0);
+bfd_boolean
+_bfd_xcoff_bfd_final_link (bfd *abfd, struct bfd_link_info *info)
+{
+  bfd_size_type symesz;
+  struct xcoff_final_link_info finfo;
+  asection *o;
+  struct bfd_link_order *p;
+  bfd_size_type max_contents_size;
+  bfd_size_type max_sym_count;
+  bfd_size_type max_lineno_count;
+  bfd_size_type max_reloc_count;
+  bfd_size_type max_output_reloc_count;
+  file_ptr rel_filepos;
+  unsigned int relsz;
+  file_ptr line_filepos;
+  unsigned int linesz;
+  bfd *sub;
+  bfd_byte *external_relocs = NULL;
+  char strbuf[STRING_SIZE_SIZE];
+  file_ptr pos;
+  bfd_size_type amt;
 
-      /* Initialize the aux union here instead of closer to when it is
-        written out below because the length of the csect depends on
-        whether the output is 32 or 64 bit.  */
-      memset (&iraux, 0, sizeof iraux);
-      iraux.x_csect.x_smtyp = XTY_SD;
-      /* iraux.x_csect.x_scnlen.l = 4 or 8, see below */
-      iraux.x_csect.x_smclas = XMC_TC;
+  if (info->shared)
+    abfd->flags |= DYNAMIC;
 
-      /* 32 bit uses a 32 bit R_POS to do the relocations
-        64 bit uses a 64 bit R_POS to do the relocations
+  symesz = bfd_coff_symesz (abfd);
 
-        Also needs to change the csect size : 4 for 32 bit, 8 for 64 bit
+  finfo.info = info;
+  finfo.output_bfd = abfd;
+  finfo.strtab = NULL;
+  finfo.section_info = NULL;
+  finfo.last_file_index = -1;
+  finfo.toc_symindx = -1;
+  finfo.internal_syms = NULL;
+  finfo.sym_indices = NULL;
+  finfo.outsyms = NULL;
+  finfo.linenos = NULL;
+  finfo.contents = NULL;
+  finfo.external_relocs = NULL;
 
-        Which one is determined by the backend.  */
-      if (bfd_xcoff_is_xcoff64 (output_bfd))
-       {
-         irel->r_size = 63;
-         iraux.x_csect.x_scnlen.l = 8;
-       }
-      else if (bfd_xcoff_is_xcoff32 (output_bfd))
-       {
-         irel->r_size = 31;
-         iraux.x_csect.x_scnlen.l = 4;
-       }
-      else
+  finfo.ldsym = (xcoff_hash_table (info)->loader_section->contents
+                + bfd_xcoff_ldhdrsz (abfd));
+  finfo.ldrel = (xcoff_hash_table (info)->loader_section->contents
+                + bfd_xcoff_ldhdrsz(abfd)
+                + (xcoff_hash_table (info)->ldhdr.l_nsyms
+                   * bfd_xcoff_ldsymsz(abfd)));
+
+  xcoff_data (abfd)->coff.link_info = info;
+
+  finfo.strtab = _bfd_stringtab_init ();
+  if (finfo.strtab == NULL)
+    goto error_return;
+
+  /* Count the relocation entries required for the output file.
+     (We've already counted the line numbers.)  Determine a few
+     maximum sizes.  */
+  max_contents_size = 0;
+  max_lineno_count = 0;
+  max_reloc_count = 0;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      o->reloc_count = 0;
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
        {
-         return false;
-       }
-      irel->r_type = R_POS;
-      finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
-      ++osec->reloc_count;
+         if (p->type == bfd_indirect_link_order)
+           {
+             asection *sec;
+
+             sec = p->u.indirect.section;
+
+             /* Mark all sections which are to be included in the
+                link.  This will normally be every section.  We need
+                to do this so that we can identify any sections which
+                the linker has decided to not include.  */
+             sec->linker_mark = TRUE;
+
+             o->reloc_count += sec->reloc_count;
+
+             if (sec->rawsize > max_contents_size)
+               max_contents_size = sec->rawsize;
+             if (sec->size > max_contents_size)
+               max_contents_size = sec->size;
+             if (coff_section_data (sec->owner, sec) != NULL
+                 && xcoff_section_data (sec->owner, sec) != NULL
+                 && (xcoff_section_data (sec->owner, sec)->lineno_count
+                     > max_lineno_count))
+               max_lineno_count =
+                 xcoff_section_data (sec->owner, sec)->lineno_count;
+             if (sec->reloc_count > max_reloc_count)
+               max_reloc_count = sec->reloc_count;
+           }
+         else if (p->type == bfd_section_reloc_link_order
+                  || p->type == bfd_symbol_reloc_link_order)
+           ++o->reloc_count;
+       }
+    }
 
-      ldrel.l_vaddr = irel->r_vaddr;
-      ldrel.l_symndx = h->ldindx;
-      ldrel.l_rtype = (irel->r_size << 8) | R_POS;
-      ldrel.l_rsecnm = oindx;
-      bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
-      finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
+  /* Compute the file positions for all the sections.  */
+  if (abfd->output_has_begun)
+    {
+      if (xcoff_hash_table (info)->file_align != 0)
+       abort ();
+    }
+  else
+    {
+      bfd_vma file_align;
 
-      /* We need to emit a symbol to define a csect which holds
-        the reloc.  */
-      if (finfo->info->strip != strip_all)
+      file_align = xcoff_hash_table (info)->file_align;
+      if (file_align != 0)
        {
+         bfd_boolean saw_contents;
+         int indx;
+         file_ptr sofar;
 
-         result = bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab,
-                                             &irsym, h->root.root.string);
-         if (false == result)
+         /* Insert .pad sections before every section which has
+            contents and is loaded, if it is preceded by some other
+            section which has contents and is loaded.  */
+         saw_contents = TRUE;
+         for (o = abfd->sections; o != NULL; o = o->next)
            {
-             return false;
-           }
+             if (strcmp (o->name, ".pad") == 0)
+               saw_contents = FALSE;
+             else if ((o->flags & SEC_HAS_CONTENTS) != 0
+                      && (o->flags & SEC_LOAD) != 0)
+               {
+                 if (! saw_contents)
+                   saw_contents = TRUE;
+                 else
+                   {
+                     asection *n;
 
-         irsym.n_value = irel->r_vaddr;
-         irsym.n_scnum = osec->target_index;
-         irsym.n_sclass = C_HIDEXT;
-         irsym.n_type = T_NULL;
-         irsym.n_numaux = 1;
+                     /* Create a pad section and place it before the section
+                        that needs padding.  This requires unlinking and
+                        relinking the bfd's section list.  */
 
-         bfd_coff_swap_sym_out (output_bfd, (PTR) &irsym, (PTR) outsym);
-         outsym += bfd_coff_symesz (output_bfd);
+                     n = bfd_make_section_anyway_with_flags (abfd, ".pad",
+                                                             SEC_HAS_CONTENTS);
+                     n->alignment_power = 0;
 
-         /* note : iraux is initialized above */
-         bfd_coff_swap_aux_out (output_bfd, (PTR) &iraux, T_NULL, C_HIDEXT,
-                                0, 1, (PTR) outsym);
-         outsym += bfd_coff_auxesz (output_bfd);
+                     bfd_section_list_remove (abfd, n);
+                     bfd_section_list_insert_before (abfd, o, n);
+                     saw_contents = FALSE;
+                   }
+               }
+           }
 
-         if (h->indx >= 0)
+         /* Reset the section indices after inserting the new
+            sections.  */
+         indx = 0;
+         for (o = abfd->sections; o != NULL; o = o->next)
            {
-             /* We aren't going to write out the symbols below, so we
-                need to write them out now.  */
-             pos = obj_sym_filepos (output_bfd);
-             pos += (obj_raw_syment_count (output_bfd)
-                     * bfd_coff_symesz (output_bfd));
-             amt = outsym - finfo->outsyms;
-             if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
-                 || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt)
-               return false;
-             obj_raw_syment_count (output_bfd) +=
-               (outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd);
-
-             outsym = finfo->outsyms;
+             ++indx;
+             o->target_index = indx;
            }
-       }
-    }
+         BFD_ASSERT ((unsigned int) indx == abfd->section_count);
 
-  /* If this symbol is a specially defined function descriptor, write
-     it out.  The first word is the address of the function code
-     itself, the second word is the address of the TOC, and the third
-     word is zero.
+         /* Work out appropriate sizes for the .pad sections to force
+            each section to land on a page boundary.  This bit of
+            code knows what compute_section_file_positions is going
+            to do.  */
+         sofar = bfd_coff_filhsz (abfd);
+         sofar += bfd_coff_aoutsz (abfd);
+         sofar += abfd->section_count * bfd_coff_scnhsz (abfd);
+         for (o = abfd->sections; o != NULL; o = o->next)
+           if ((bfd_xcoff_is_reloc_count_overflow
+                (abfd, (bfd_vma) o->reloc_count))
+               || (bfd_xcoff_is_lineno_count_overflow
+                   (abfd, (bfd_vma) o->lineno_count)))
+             /* 64 does not overflow, need to check if 32 does */
+             sofar += bfd_coff_scnhsz (abfd);
 
-     32 bit vs 64 bit
-     The addresses for the 32 bit will take 4 bytes and the addresses
-     for 64 bit will take 8 bytes.  Similar for the relocs.  This type
-     of logic was also done above to create a TOC entry in
-     xcoff_write_global_symbol.  */
-  if ((h->flags & XCOFF_DESCRIPTOR) != 0
-      && h->root.type == bfd_link_hash_defined
-      && (h->root.u.def.section
-         == xcoff_hash_table (finfo->info)->descriptor_section))
-    {
-      asection *sec;
-      asection *osec;
-      int oindx;
-      bfd_byte *p;
-      struct xcoff_link_hash_entry *hentry;
-      asection *esec;
-      struct internal_reloc *irel;
-      struct internal_ldrel ldrel;
-      asection *tsec;
-      unsigned int reloc_size, byte_size;
+         for (o = abfd->sections; o != NULL; o = o->next)
+           {
+             if (strcmp (o->name, ".pad") == 0)
+               {
+                 bfd_vma pageoff;
 
-      if (bfd_xcoff_is_xcoff64 (output_bfd))
-       {
-         reloc_size = 63;
-         byte_size = 8;
-       }
-      else if (bfd_xcoff_is_xcoff32 (output_bfd))
-       {
-         reloc_size = 31;
-         byte_size = 4;
-       }
-      else
-       {
-         return false;
+                 BFD_ASSERT (o->size == 0);
+                 pageoff = sofar & (file_align - 1);
+                 if (pageoff != 0)
+                   {
+                     o->size = file_align - pageoff;
+                     sofar += file_align - pageoff;
+                     o->flags |= SEC_HAS_CONTENTS;
+                   }
+               }
+             else
+               {
+                 if ((o->flags & SEC_HAS_CONTENTS) != 0)
+                   sofar += BFD_ALIGN (o->size,
+                                       1 << o->alignment_power);
+               }
+           }
        }
 
-      sec = h->root.u.def.section;
-      osec = sec->output_section;
-      oindx = osec->target_index;
-      p = sec->contents + h->root.u.def.value;
+      if (! bfd_coff_compute_section_file_positions (abfd))
+       goto error_return;
+    }
 
-      hentry = h->descriptor;
-      BFD_ASSERT (hentry != NULL
-                 && (hentry->root.type == bfd_link_hash_defined
-                     || hentry->root.type == bfd_link_hash_defweak));
-      esec = hentry->root.u.def.section;
+  /* Allocate space for the pointers we need to keep for the relocs.  */
+  {
+    unsigned int i;
 
-      irel = finfo->section_info[oindx].relocs + osec->reloc_count;
-      irel->r_vaddr = (osec->vma
-                      + sec->output_offset
-                      + h->root.u.def.value);
-      irel->r_symndx = esec->output_section->target_index;
-      irel->r_type = R_POS;
-      irel->r_size = reloc_size;
-      finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
-      ++osec->reloc_count;
+    /* We use section_count + 1, rather than section_count, because
+       the target_index fields are 1 based.  */
+    amt = abfd->section_count + 1;
+    amt *= sizeof (struct xcoff_link_section_info);
+    finfo.section_info = bfd_malloc (amt);
+    if (finfo.section_info == NULL)
+      goto error_return;
+    for (i = 0; i <= abfd->section_count; i++)
+      {
+       finfo.section_info[i].relocs = NULL;
+       finfo.section_info[i].rel_hashes = NULL;
+       finfo.section_info[i].toc_rel_hashes = NULL;
+      }
+  }
 
-      ldrel.l_vaddr = irel->r_vaddr;
-      if (strcmp (esec->output_section->name, ".text") == 0)
-       ldrel.l_symndx = 0;
-      else if (strcmp (esec->output_section->name, ".data") == 0)
-       ldrel.l_symndx = 1;
-      else if (strcmp (esec->output_section->name, ".bss") == 0)
-       ldrel.l_symndx = 2;
+  /* Set the file positions for the relocs.  */
+  rel_filepos = obj_relocbase (abfd);
+  relsz = bfd_coff_relsz (abfd);
+  max_output_reloc_count = 0;
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if (o->reloc_count == 0)
+       o->rel_filepos = 0;
       else
        {
-         (*_bfd_error_handler)
-           (_("%s: loader reloc in unrecognized section `%s'"),
-            bfd_get_filename (output_bfd),
-            esec->output_section->name);
-         bfd_set_error (bfd_error_nonrepresentable_section);
-         return false;
-       }
-      ldrel.l_rtype = (reloc_size << 8) | R_POS;
-      ldrel.l_rsecnm = oindx;
-      bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
-      finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
+         /* A stripped file has no relocs.  However, we still
+            allocate the buffers, so that later code doesn't have to
+            worry about whether we are stripping or not.  */
+         if (info->strip == strip_all)
+           o->rel_filepos = 0;
+         else
+           {
+             o->flags |= SEC_RELOC;
+             o->rel_filepos = rel_filepos;
+             rel_filepos += o->reloc_count * relsz;
+           }
 
-      /* There are three items to write out,
-        the address of the code
-        the address of the toc anchor
-        the environment pointer.
-        We are ignoring the environment pointer.  So set it to zero.  */
-      if (bfd_xcoff_is_xcoff64 (output_bfd))
-       {
-         bfd_put_64 (output_bfd,
-                     (esec->output_section->vma + esec->output_offset
-                      + hentry->root.u.def.value),
-                     p);
-         bfd_put_64 (output_bfd, xcoff_data (output_bfd)->toc, p + 8);
-         bfd_put_64 (output_bfd, (bfd_vma) 0, p + 16);
-       }
-      else
-       {
-         /* 32 bit backend
-            This logic was already called above so the error case where
-            the backend is neither has already been checked.  */
-         bfd_put_32 (output_bfd,
-                     (esec->output_section->vma + esec->output_offset
-                      + hentry->root.u.def.value),
-                     p);
-         bfd_put_32 (output_bfd, xcoff_data (output_bfd)->toc, p + 4);
-         bfd_put_32 (output_bfd, (bfd_vma) 0, p + 8);
-       }
+         /* We don't know the indices of global symbols until we have
+            written out all the local symbols.  For each section in
+            the output file, we keep an array of pointers to hash
+            table entries.  Each entry in the array corresponds to a
+            reloc.  When we find a reloc against a global symbol, we
+            set the corresponding entry in this array so that we can
+            fix up the symbol index after we have written out all the
+            local symbols.
 
-      tsec = coff_section_from_bfd_index (output_bfd,
-                                         xcoff_data (output_bfd)->sntoc);
+            Because of this problem, we also keep the relocs in
+            memory until the end of the link.  This wastes memory.
+            We could backpatch the file later, I suppose, although it
+            would be slow.  */
+         amt = o->reloc_count;
+         amt *= sizeof (struct internal_reloc);
+         finfo.section_info[o->target_index].relocs = bfd_malloc (amt);
 
-      ++irel;
-      irel->r_vaddr = (osec->vma
-                      + sec->output_offset
-                      + h->root.u.def.value
-                      + byte_size);
-      irel->r_symndx = tsec->output_section->target_index;
-      irel->r_type = R_POS;
-      irel->r_size = reloc_size;
-      finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
-      ++osec->reloc_count;
+         amt = o->reloc_count;
+         amt *= sizeof (struct xcoff_link_hash_entry *);
+         finfo.section_info[o->target_index].rel_hashes = bfd_malloc (amt);
+
+         if (finfo.section_info[o->target_index].relocs == NULL
+             || finfo.section_info[o->target_index].rel_hashes == NULL)
+           goto error_return;
+
+         if (o->reloc_count > max_output_reloc_count)
+           max_output_reloc_count = o->reloc_count;
+       }
+    }
 
-      ldrel.l_vaddr = irel->r_vaddr;
-      if (strcmp (tsec->output_section->name, ".text") == 0)
-       ldrel.l_symndx = 0;
-      else if (strcmp (tsec->output_section->name, ".data") == 0)
-       ldrel.l_symndx = 1;
-      else if (strcmp (tsec->output_section->name, ".bss") == 0)
-       ldrel.l_symndx = 2;
+  /* We now know the size of the relocs, so we can determine the file
+     positions of the line numbers.  */
+  line_filepos = rel_filepos;
+  finfo.line_filepos = line_filepos;
+  linesz = bfd_coff_linesz (abfd);
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      if (o->lineno_count == 0)
+       o->line_filepos = 0;
       else
        {
-         (*_bfd_error_handler)
-           (_("%s: loader reloc in unrecognized section `%s'"),
-            bfd_get_filename (output_bfd),
-            tsec->output_section->name);
-         bfd_set_error (bfd_error_nonrepresentable_section);
-         return false;
+         o->line_filepos = line_filepos;
+         line_filepos += o->lineno_count * linesz;
        }
-      ldrel.l_rtype = (reloc_size << 8) | R_POS;
-      ldrel.l_rsecnm = oindx;
-      bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
-      finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
-    }
 
-  if (h->indx >= 0 || finfo->info->strip == strip_all)
-    {
-      BFD_ASSERT (outsym == finfo->outsyms);
-      return true;
+      /* Reset the reloc and lineno counts, so that we can use them to
+        count the number of entries we have output so far.  */
+      o->reloc_count = 0;
+      o->lineno_count = 0;
     }
 
-  if (h->indx != -2
-      && (finfo->info->strip == strip_all
-         || (finfo->info->strip == strip_some
-             && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string,
-                                 false, false) == NULL)))
-    {
-      BFD_ASSERT (outsym == finfo->outsyms);
-      return true;
-    }
+  obj_sym_filepos (abfd) = line_filepos;
 
-  if (h->indx != -2
-      && (h->flags & (XCOFF_REF_REGULAR | XCOFF_DEF_REGULAR)) == 0)
+  /* Figure out the largest number of symbols in an input BFD.  Take
+     the opportunity to clear the output_has_begun fields of all the
+     input BFD's.  We want at least 6 symbols, since that is the
+     number which xcoff_write_global_symbol may need.  */
+  max_sym_count = 6;
+  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
     {
-      BFD_ASSERT (outsym == finfo->outsyms);
-      return true;
+      bfd_size_type sz;
+
+      sub->output_has_begun = FALSE;
+      sz = obj_raw_syment_count (sub);
+      if (sz > max_sym_count)
+       max_sym_count = sz;
     }
 
-  memset (&aux, 0, sizeof aux);
+  /* Allocate some buffers used while linking.  */
+  amt = max_sym_count * sizeof (struct internal_syment);
+  finfo.internal_syms = bfd_malloc (amt);
 
-  h->indx = obj_raw_syment_count (output_bfd);
+  amt = max_sym_count * sizeof (long);
+  finfo.sym_indices = bfd_malloc (amt);
 
-  result = bfd_xcoff_put_symbol_name (output_bfd, finfo->strtab, &isym,
-                                     h->root.root.string);
-  if (false == result)
-    {
-      return false;
-    }
+  amt = (max_sym_count + 1) * symesz;
+  finfo.outsyms = bfd_malloc (amt);
 
-  if (h->root.type == bfd_link_hash_undefined
-      || h->root.type == bfd_link_hash_undefweak)
-    {
-      isym.n_value = 0;
-      isym.n_scnum = N_UNDEF;
-      isym.n_sclass = C_EXT;
-      aux.x_csect.x_smtyp = XTY_ER;
-    }
-  else if ((h->root.type == bfd_link_hash_defined
-           || h->root.type == bfd_link_hash_defweak)
-          && h->smclas == XMC_XO)
-    {
-      BFD_ASSERT (bfd_is_abs_section (h->root.u.def.section));
-      isym.n_value = h->root.u.def.value;
-      isym.n_scnum = N_UNDEF;
-      isym.n_sclass = C_EXT;
-      aux.x_csect.x_smtyp = XTY_ER;
-    }
-  else if (h->root.type == bfd_link_hash_defined
-          || h->root.type == bfd_link_hash_defweak)
-    {
-      struct xcoff_link_size_list *l;
+  amt = max_lineno_count * bfd_coff_linesz (abfd);
+  finfo.linenos = bfd_malloc (amt);
 
-      isym.n_value = (h->root.u.def.section->output_section->vma
-                     + h->root.u.def.section->output_offset
-                     + h->root.u.def.value);
-      isym.n_scnum = h->root.u.def.section->output_section->target_index;
-      isym.n_sclass = C_HIDEXT;
-      aux.x_csect.x_smtyp = XTY_SD;
+  amt = max_contents_size;
+  finfo.contents = bfd_malloc (amt);
 
-      if ((h->flags & XCOFF_HAS_SIZE) != 0)
+  amt = max_reloc_count * relsz;
+  finfo.external_relocs = bfd_malloc (amt);
+
+  if ((finfo.internal_syms == NULL && max_sym_count > 0)
+      || (finfo.sym_indices == NULL && max_sym_count > 0)
+      || finfo.outsyms == NULL
+      || (finfo.linenos == NULL && max_lineno_count > 0)
+      || (finfo.contents == NULL && max_contents_size > 0)
+      || (finfo.external_relocs == NULL && max_reloc_count > 0))
+    goto error_return;
+
+  obj_raw_syment_count (abfd) = 0;
+
+  /* Find a TOC symbol, if we need one.  */
+  if (!xcoff_find_tc0 (abfd, &finfo))
+    goto error_return;
+
+  /* We now know the position of everything in the file, except that
+     we don't know the size of the symbol table and therefore we don't
+     know where the string table starts.  We just build the string
+     table in memory as we go along.  We process all the relocations
+     for a single input file at once.  */
+  for (o = abfd->sections; o != NULL; o = o->next)
+    {
+      for (p = o->map_head.link_order; p != NULL; p = p->next)
        {
-         for (l = xcoff_hash_table (finfo->info)->size_list;
-              l != NULL;
-              l = l->next)
+         if (p->type == bfd_indirect_link_order
+             && p->u.indirect.section->owner->xvec == abfd->xvec)
            {
-             if (l->h == h)
+             sub = p->u.indirect.section->owner;
+             if (! sub->output_has_begun)
                {
-                 aux.x_csect.x_scnlen.l = l->size;
-                 break;
+                 if (! xcoff_link_input_bfd (&finfo, sub))
+                   goto error_return;
+                 sub->output_has_begun = TRUE;
                }
            }
+         else if (p->type == bfd_section_reloc_link_order
+                  || p->type == bfd_symbol_reloc_link_order)
+           {
+             if (! xcoff_reloc_link_order (abfd, &finfo, o, p))
+               goto error_return;
+           }
+         else
+           {
+             if (! _bfd_default_link_order (abfd, info, o, p))
+               goto error_return;
+           }
        }
     }
-  else if (h->root.type == bfd_link_hash_common)
-    {
-      isym.n_value = (h->root.u.c.p->section->output_section->vma
-                     + h->root.u.c.p->section->output_offset);
-      isym.n_scnum = h->root.u.c.p->section->output_section->target_index;
-      isym.n_sclass = C_EXT;
-      aux.x_csect.x_smtyp = XTY_CM;
-      aux.x_csect.x_scnlen.l = h->root.u.c.size;
-    }
-  else
-    abort ();
-
-  isym.n_type = T_NULL;
-  isym.n_numaux = 1;
-
-  bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym);
-  outsym += bfd_coff_symesz (output_bfd);
-
-  aux.x_csect.x_smclas = h->smclas;
-  bfd_coff_swap_aux_out (output_bfd, (PTR) &aux, T_NULL, isym.n_sclass, 0, 1,
-                        (PTR) outsym);
-  outsym += bfd_coff_auxesz (output_bfd);
 
-  if ((h->root.type == bfd_link_hash_defined
-       || h->root.type == bfd_link_hash_defweak)
-      && h->smclas != XMC_XO)
+  /* Free up the buffers used by xcoff_link_input_bfd.  */
+  if (finfo.internal_syms != NULL)
     {
-      /* We just output an SD symbol.  Now output an LD symbol.  */
-
-      h->indx += 2;
-
-      isym.n_sclass = C_EXT;
-      bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym);
-      outsym += bfd_coff_symesz (output_bfd);
-
-      aux.x_csect.x_smtyp = XTY_LD;
-      aux.x_csect.x_scnlen.l = obj_raw_syment_count (output_bfd);
-      bfd_coff_swap_aux_out (output_bfd, (PTR) &aux, T_NULL, C_EXT, 0, 1,
-                            (PTR) outsym);
-      outsym += bfd_coff_auxesz (output_bfd);
+      free (finfo.internal_syms);
+      finfo.internal_syms = NULL;
     }
-
-  pos = obj_sym_filepos (output_bfd);
-  pos += obj_raw_syment_count (output_bfd) * bfd_coff_symesz (output_bfd);
-  amt = outsym - finfo->outsyms;
-  if (bfd_seek (output_bfd, pos, SEEK_SET) != 0
-      || bfd_bwrite (finfo->outsyms, amt, output_bfd) != amt)
-    return false;
-  obj_raw_syment_count (output_bfd) +=
-    (outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd);
-
-  return true;
-}
-
-/* Handle a link order which is supposed to generate a reloc.  */
-
-static boolean
-xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
-     bfd *output_bfd;
-     struct xcoff_final_link_info *finfo;
-     asection *output_section;
-     struct bfd_link_order *link_order;
-{
-  reloc_howto_type *howto;
-  struct xcoff_link_hash_entry *h;
-  asection *hsec;
-  bfd_vma hval;
-  bfd_vma addend;
-  struct internal_reloc *irel;
-  struct xcoff_link_hash_entry **rel_hash_ptr;
-  struct internal_ldrel ldrel;
-
-  if (link_order->type == bfd_section_reloc_link_order)
+  if (finfo.sym_indices != NULL)
     {
-      /* We need to somehow locate a symbol in the right section.  The
-         symbol must either have a value of zero, or we must adjust
-         the addend by the value of the symbol.  FIXME: Write this
-         when we need it.  The old linker couldn't handle this anyhow.  */
-      abort ();
+      free (finfo.sym_indices);
+      finfo.sym_indices = NULL;
     }
-
-  howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
-  if (howto == NULL)
+  if (finfo.linenos != NULL)
     {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
+      free (finfo.linenos);
+      finfo.linenos = NULL;
     }
-
-  h = ((struct xcoff_link_hash_entry *)
-       bfd_wrapped_link_hash_lookup (output_bfd, finfo->info,
-                                    link_order->u.reloc.p->u.name,
-                                    false, false, true));
-  if (h == NULL)
+  if (finfo.contents != NULL)
     {
-      if (! ((*finfo->info->callbacks->unattached_reloc)
-            (finfo->info, link_order->u.reloc.p->u.name, (bfd *) NULL,
-             (asection *) NULL, (bfd_vma) 0)))
-       return false;
-      return true;
+      free (finfo.contents);
+      finfo.contents = NULL;
     }
-
-  if (h->root.type == bfd_link_hash_common)
+  if (finfo.external_relocs != NULL)
     {
-      hsec = h->root.u.c.p->section;
-      hval = 0;
+      free (finfo.external_relocs);
+      finfo.external_relocs = NULL;
     }
-  else if (h->root.type == bfd_link_hash_defined
-          || h->root.type == bfd_link_hash_defweak)
+
+  /* The value of the last C_FILE symbol is supposed to be -1.  Write
+     it out again.  */
+  if (finfo.last_file_index != -1)
     {
-      hsec = h->root.u.def.section;
-      hval = h->root.u.def.value;
+      finfo.last_file.n_value = -(bfd_vma) 1;
+      bfd_coff_swap_sym_out (abfd, (void *) &finfo.last_file,
+                            (void *) finfo.outsyms);
+      pos = obj_sym_filepos (abfd) + finfo.last_file_index * symesz;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0
+         || bfd_bwrite (finfo.outsyms, symesz, abfd) != symesz)
+       goto error_return;
     }
-  else
+
+  /* Write out all the global symbols which do not come from XCOFF
+     input files.  */
+  xcoff_link_hash_traverse (xcoff_hash_table (info),
+                           xcoff_write_global_symbol,
+                           (void *) &finfo);
+
+  if (finfo.outsyms != NULL)
     {
-      hsec = NULL;
-      hval = 0;
+      free (finfo.outsyms);
+      finfo.outsyms = NULL;
     }
 
-  addend = link_order->u.reloc.p->addend;
-  if (hsec != NULL)
-    addend += (hsec->output_section->vma
-              + hsec->output_offset
-              + hval);
+  /* Now that we have written out all the global symbols, we know the
+     symbol indices to use for relocs against them, and we can finally
+     write out the relocs.  */
+  amt = max_output_reloc_count * relsz;
+  external_relocs = bfd_malloc (amt);
+  if (external_relocs == NULL && max_output_reloc_count != 0)
+    goto error_return;
 
-  if (addend != 0)
+  for (o = abfd->sections; o != NULL; o = o->next)
     {
-      bfd_size_type size;
-      bfd_byte *buf;
-      bfd_reloc_status_type rstat;
-      boolean ok;
+      struct internal_reloc *irel;
+      struct internal_reloc *irelend;
+      struct xcoff_link_hash_entry **rel_hash;
+      struct xcoff_toc_rel_hash *toc_rel_hash;
+      bfd_byte *erel;
+      bfd_size_type rel_size;
 
-      size = bfd_get_reloc_size (howto);
-      buf = (bfd_byte *) bfd_zmalloc (size);
-      if (buf == NULL)
-       return false;
+      /* A stripped file has no relocs.  */
+      if (info->strip == strip_all)
+       {
+         o->reloc_count = 0;
+         continue;
+       }
 
-      rstat = _bfd_relocate_contents (howto, output_bfd, addend, buf);
-      switch (rstat)
+      if (o->reloc_count == 0)
+       continue;
+
+      irel = finfo.section_info[o->target_index].relocs;
+      irelend = irel + o->reloc_count;
+      rel_hash = finfo.section_info[o->target_index].rel_hashes;
+      for (; irel < irelend; irel++, rel_hash++, erel += relsz)
        {
-       case bfd_reloc_ok:
-         break;
-       default:
-       case bfd_reloc_outofrange:
-         abort ();
-       case bfd_reloc_overflow:
-         if (! ((*finfo->info->callbacks->reloc_overflow)
-                (finfo->info, link_order->u.reloc.p->u.name,
-                 howto->name, addend, (bfd *) NULL, (asection *) NULL,
-                 (bfd_vma) 0)))
+         if (*rel_hash != NULL)
            {
-             free (buf);
-             return false;
+             if ((*rel_hash)->indx < 0)
+               {
+                 if (! ((*info->callbacks->unattached_reloc)
+                        (info, (*rel_hash)->root.root.string,
+                         NULL, o, irel->r_vaddr)))
+                   goto error_return;
+                 (*rel_hash)->indx = 0;
+               }
+             irel->r_symndx = (*rel_hash)->indx;
            }
-         break;
        }
-      ok = bfd_set_section_contents (output_bfd, output_section, (PTR) buf,
-                                    (file_ptr) link_order->offset, size);
-      free (buf);
-      if (! ok)
-       return false;
-    }
 
-  /* Store the reloc information in the right place.  It will get
-     swapped and written out at the end of the final_link routine.  */
+      for (toc_rel_hash = finfo.section_info[o->target_index].toc_rel_hashes;
+          toc_rel_hash != NULL;
+          toc_rel_hash = toc_rel_hash->next)
+       {
+         if (toc_rel_hash->h->u.toc_indx < 0)
+           {
+             if (! ((*info->callbacks->unattached_reloc)
+                    (info, toc_rel_hash->h->root.root.string,
+                     NULL, o, toc_rel_hash->rel->r_vaddr)))
+               goto error_return;
+             toc_rel_hash->h->u.toc_indx = 0;
+           }
+         toc_rel_hash->rel->r_symndx = toc_rel_hash->h->u.toc_indx;
+       }
 
-  irel = (finfo->section_info[output_section->target_index].relocs
-         + output_section->reloc_count);
-  rel_hash_ptr = (finfo->section_info[output_section->target_index].rel_hashes
-                 + output_section->reloc_count);
+      /* XCOFF requires that the relocs be sorted by address.  We tend
+        to produce them in the order in which their containing csects
+        appear in the symbol table, which is not necessarily by
+        address.  So we sort them here.  There may be a better way to
+        do this.  */
+      qsort ((void *) finfo.section_info[o->target_index].relocs,
+            o->reloc_count, sizeof (struct internal_reloc),
+            xcoff_sort_relocs);
 
-  memset (irel, 0, sizeof (struct internal_reloc));
-  *rel_hash_ptr = NULL;
+      irel = finfo.section_info[o->target_index].relocs;
+      irelend = irel + o->reloc_count;
+      erel = external_relocs;
+      for (; irel < irelend; irel++, rel_hash++, erel += relsz)
+       bfd_coff_swap_reloc_out (abfd, (void *) irel, (void *) erel);
 
-  irel->r_vaddr = output_section->vma + link_order->offset;
+      rel_size = relsz * o->reloc_count;
+      if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0
+         || bfd_bwrite ((void *) external_relocs, rel_size, abfd) != rel_size)
+       goto error_return;
+    }
 
-  if (h->indx >= 0)
-    irel->r_symndx = h->indx;
-  else
+  if (external_relocs != NULL)
     {
-      /* Set the index to -2 to force this symbol to get written out.  */
-      h->indx = -2;
-      *rel_hash_ptr = h;
-      irel->r_symndx = 0;
+      free (external_relocs);
+      external_relocs = NULL;
     }
 
-  irel->r_type = howto->type;
-  irel->r_size = howto->bitsize - 1;
-  if (howto->complain_on_overflow == complain_overflow_signed)
-    irel->r_size |= 0x80;
-
-  ++output_section->reloc_count;
-
-  /* Now output the reloc to the .loader section.  */
-
-  ldrel.l_vaddr = irel->r_vaddr;
-
-  if (hsec != NULL)
+  /* Free up the section information.  */
+  if (finfo.section_info != NULL)
     {
-      const char *secname;
-
-      secname = hsec->output_section->name;
+      unsigned int i;
 
-      if (strcmp (secname, ".text") == 0)
-       ldrel.l_symndx = 0;
-      else if (strcmp (secname, ".data") == 0)
-       ldrel.l_symndx = 1;
-      else if (strcmp (secname, ".bss") == 0)
-       ldrel.l_symndx = 2;
-      else
-       {
-         (*_bfd_error_handler)
-           (_("%s: loader reloc in unrecognized section `%s'"),
-            bfd_get_filename (output_bfd), secname);
-         bfd_set_error (bfd_error_nonrepresentable_section);
-         return false;
-       }
-    }
-  else
-    {
-      if (h->ldindx < 0)
+      for (i = 0; i < abfd->section_count; i++)
        {
-         (*_bfd_error_handler)
-           (_("%s: `%s' in loader reloc but not loader sym"),
-            bfd_get_filename (output_bfd),
-            h->root.root.string);
-         bfd_set_error (bfd_error_bad_value);
-         return false;
+         if (finfo.section_info[i].relocs != NULL)
+           free (finfo.section_info[i].relocs);
+         if (finfo.section_info[i].rel_hashes != NULL)
+           free (finfo.section_info[i].rel_hashes);
        }
-      ldrel.l_symndx = h->ldindx;
+      free (finfo.section_info);
+      finfo.section_info = NULL;
     }
 
-  ldrel.l_rtype = (irel->r_size << 8) | irel->r_type;
-  ldrel.l_rsecnm = output_section->target_index;
-  bfd_xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
-  finfo->ldrel += bfd_xcoff_ldrelsz(output_bfd);
+  /* Write out the loader section contents.  */
+  BFD_ASSERT ((bfd_byte *) finfo.ldrel
+             == (xcoff_hash_table (info)->loader_section->contents
+                 + xcoff_hash_table (info)->ldhdr.l_impoff));
+  o = xcoff_hash_table (info)->loader_section;
+  if (! bfd_set_section_contents (abfd, o->output_section, o->contents,
+                                 (file_ptr) o->output_offset, o->size))
+    goto error_return;
 
-  return true;
-}
+  /* Write out the magic sections.  */
+  o = xcoff_hash_table (info)->linkage_section;
+  if (o->size > 0
+      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
+                                    (file_ptr) o->output_offset,
+                                    o->size))
+    goto error_return;
+  o = xcoff_hash_table (info)->toc_section;
+  if (o->size > 0
+      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
+                                    (file_ptr) o->output_offset,
+                                    o->size))
+    goto error_return;
+  o = xcoff_hash_table (info)->descriptor_section;
+  if (o->size > 0
+      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
+                                    (file_ptr) o->output_offset,
+                                    o->size))
+    goto error_return;
 
-/* Sort relocs by VMA.  This is called via qsort.  */
+  /* Write out the string table.  */
+  pos = obj_sym_filepos (abfd) + obj_raw_syment_count (abfd) * symesz;
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+    goto error_return;
+  H_PUT_32 (abfd,
+           _bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE,
+           strbuf);
+  amt = STRING_SIZE_SIZE;
+  if (bfd_bwrite (strbuf, amt, abfd) != amt)
+    goto error_return;
+  if (! _bfd_stringtab_emit (abfd, finfo.strtab))
+    goto error_return;
 
-static int
-xcoff_sort_relocs (p1, p2)
-     const PTR p1;
-     const PTR p2;
-{
-  const struct internal_reloc *r1 = (const struct internal_reloc *) p1;
-  const struct internal_reloc *r2 = (const struct internal_reloc *) p2;
+  _bfd_stringtab_free (finfo.strtab);
 
-  if (r1->r_vaddr > r2->r_vaddr)
-    return 1;
-  else if (r1->r_vaddr < r2->r_vaddr)
-    return -1;
-  else
-    return 0;
-}
+  /* Write out the debugging string table.  */
+  o = xcoff_hash_table (info)->debug_section;
+  if (o != NULL)
+    {
+      struct bfd_strtab_hash *debug_strtab;
+
+      debug_strtab = xcoff_hash_table (info)->debug_strtab;
+      BFD_ASSERT (o->output_section->size - o->output_offset
+                 >= _bfd_stringtab_size (debug_strtab));
+      pos = o->output_section->filepos + o->output_offset;
+      if (bfd_seek (abfd, pos, SEEK_SET) != 0)
+       goto error_return;
+      if (! _bfd_stringtab_emit (abfd, debug_strtab))
+       goto error_return;
+    }
+
+  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
+     not try to write out the symbols.  */
+  bfd_get_symcount (abfd) = 0;
+
+  return TRUE;
 
+ error_return:
+  if (finfo.strtab != NULL)
+    _bfd_stringtab_free (finfo.strtab);
 
+  if (finfo.section_info != NULL)
+    {
+      unsigned int i;
 
+      for (i = 0; i < abfd->section_count; i++)
+       {
+         if (finfo.section_info[i].relocs != NULL)
+           free (finfo.section_info[i].relocs);
+         if (finfo.section_info[i].rel_hashes != NULL)
+           free (finfo.section_info[i].rel_hashes);
+       }
+      free (finfo.section_info);
+    }
 
+  if (finfo.internal_syms != NULL)
+    free (finfo.internal_syms);
+  if (finfo.sym_indices != NULL)
+    free (finfo.sym_indices);
+  if (finfo.outsyms != NULL)
+    free (finfo.outsyms);
+  if (finfo.linenos != NULL)
+    free (finfo.linenos);
+  if (finfo.contents != NULL)
+    free (finfo.contents);
+  if (finfo.external_relocs != NULL)
+    free (finfo.external_relocs);
+  if (external_relocs != NULL)
+    free (external_relocs);
+  return FALSE;
+}
This page took 0.128864 seconds and 4 git commands to generate.