* sunos.c (sunos_create_dynamic_sections): We need the dynamic
[deliverable/binutils-gdb.git] / bfd / coffcode.h
index 7e50f2aef777a446c9c81746704d17e7d7beb0f1..ae07e91d9c0a5d22ede8f6abc86c5a4752840904 100644 (file)
@@ -1,5 +1,5 @@
 /* Support for the generic parts of most COFF variants, for BFD.
-   Copyright 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -16,11 +16,11 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/* 
+/*
 Most of this hacked by  Steve Chamberlain,
-                       sac@cygnus.com 
+                       sac@cygnus.com
 */
 /*
 
@@ -30,7 +30,7 @@ SECTION
        BFD supports a number of different flavours of coff format.
        The major differences between formats are the sizes and
        alignments of fields in structures on disk, and the occasional
-       extra field.  
+       extra field.
 
        Coff in all its varieties is implemented with a few common
        files and a number of implementation specific files. For
@@ -45,7 +45,7 @@ SECTION
        The Intel i960 processor version of coff is implemented in
        @file{coff-i960.c}. This file has the same structure as
        @file{coff-m88k.c}, except that it includes @file{coff/i960.h}
-       rather than @file{coff-m88k.h}. 
+       rather than @file{coff-m88k.h}.
 
 SUBSECTION
        Porting to a new version of coff
@@ -61,7 +61,7 @@ SUBSECTION
        structures in @file{../include/coff/foo.h} so that they match
        what you need. You will probably also have to add
        @code{#ifdef}s to the code in @file{coff/internal.h} and
-       @file{coffcode.h} if your version of coff is too wild. 
+       @file{coffcode.h} if your version of coff is too wild.
 
        You can verify that your new BFD backend works quite simply by
        building @file{objdump} from the @file{binutils} directory,
@@ -127,7 +127,7 @@ SUBSUBSECTION
        @code{PUT_LNSZ_LNNO} and @code{GET_LNSZ_LNNO} will select the
        correct one. No doubt, some day someone will find a version of
        coff which has a varying field size not catered to at the
-       moment. To port BFD, that person will have to add more @code{#defines}.  
+       moment. To port BFD, that person will have to add more @code{#defines}.
        Three of the bit twiddling routines are exported to
        @code{gdb}; @code{coff_swap_aux_in}, @code{coff_swap_sym_in}
        and @code{coff_swap_linno_in}. @code{GDB} reads the symbol
@@ -149,7 +149,7 @@ SUBSUBSECTION
        The simple canonical form for symbols used by BFD is not rich
        enough to keep all the information available in a coff symbol
        table. The back end gets around this problem by keeping the original
-       symbol table around, "behind the scenes". 
+       symbol table around, "behind the scenes".
 
        When a symbol table is requested (through a call to
        @code{bfd_canonicalize_symtab}), a request gets through to
@@ -166,7 +166,7 @@ SUBSUBSECTION
        (<<C_FILE>> symbols) are modified so that the internal
        string points to the value in the auxent (the real filename)
        rather than the normal text associated with the symbol
-       (@code{".file"}). 
+       (@code{".file"}).
 
        At this time the symbol names are moved around. Coff stores
        all symbols less than nine characters long physically
@@ -180,10 +180,10 @@ SUBSUBSECTION
        is inspected in turn, and a decision made (using the
        @code{sclass} field) about the various flags to set in the
        @code{asymbol}.  @xref{Symbols}. The generated canonical table
-       shares strings with the hidden internal symbol table. 
+       shares strings with the hidden internal symbol table.
 
        Any linenumbers are read from the coff file too, and attached
-       to the symbols which own the functions the linenumbers belong to. 
+       to the symbols which own the functions the linenumbers belong to.
 
 SUBSUBSECTION
        Symbol writing
@@ -217,7 +217,7 @@ SUBSUBSECTION
        changed at this point to reflect their sum with their owning
        section.  This transformation uses the
        <<output_section>> field of the @code{asymbol}'s
-       @code{asection} @xref{Sections}. 
+       @code{asection} @xref{Sections}.
 
        o <<coff_mangle_symbols>>
 
@@ -231,7 +231,7 @@ SUBSUBSECTION
 
        This routine runs through the symbol table and patches up the
        symbols from their internal form into the coff way, calls the
-       bit twiddlers, and writes out the table to the file. 
+       bit twiddlers, and writes out the table to the file.
 
 */
 
@@ -245,20 +245,33 @@ DESCRIPTION
 
 CODE_FRAGMENT
 .
-.typedef struct coff_ptr_struct 
+.typedef struct coff_ptr_struct
 .{
 .
 .       {* Remembers the offset from the first symbol in the file for
 .          this symbol. Generated by coff_renumber_symbols. *}
 .unsigned int offset;
 .
+.       {* Should the value of this symbol be renumbered.  Used for
+.          XCOFF C_BSTAT symbols.  Set by coff_slurp_symbol_table.  *}
+.unsigned int fix_value : 1;
+.
 .       {* Should the tag field of this symbol be renumbered.
 .          Created by coff_pointerize_aux. *}
-.char fix_tag;
+.unsigned int fix_tag : 1;
 .
 .       {* Should the endidx field of this symbol be renumbered.
 .          Created by coff_pointerize_aux. *}
-.char fix_end;
+.unsigned int fix_end : 1;
+.
+.       {* Should the x_csect.x_scnlen field be renumbered.
+.          Created by coff_pointerize_aux. *}
+.unsigned int fix_scnlen : 1;
+.
+.       {* Fix up an XCOFF C_BINCL/C_EINCL symbol.  The value is the
+.          index into the line number entries.  Set by
+.          coff_slurp_symbol_table.  *}
+.unsigned int fix_line : 1;
 .
 .       {* The container for the symbol structure as read and translated
 .           from the file. *}
@@ -290,7 +303,13 @@ CODE_FRAGMENT
 
 */
 
+#ifdef COFF_WITH_PE
+#include "peicode.h"
+#else
 #include "coffswap.h"
+#endif
+
+#define STRING_SIZE_SIZE (4)
 \f
 /* void warning(); */
 
@@ -307,35 +326,29 @@ sec_to_styp_flags (sec_name, sec_flags)
 {
   long styp_flags = 0;
 
-  if (!strcmp(sec_name, _TEXT)) 
+  if (!strcmp (sec_name, _TEXT))
     {
       styp_flags = STYP_TEXT;
     }
-  else if (!strcmp(sec_name, _DATA)) 
+  else if (!strcmp (sec_name, _DATA))
     {
       styp_flags = STYP_DATA;
-#ifdef TWO_DATA_SECS
     }
-  else if (!strcmp(sec_name, ".data2")) 
-    {
-      styp_flags = STYP_DATA;
-#endif                         /* TWO_DATA_SECS */
-    }
-  else if (!strcmp(sec_name, _BSS)) 
+  else if (!strcmp (sec_name, _BSS))
     {
       styp_flags = STYP_BSS;
 #ifdef _COMMENT
-    } 
-  else if (!strcmp(sec_name, _COMMENT)) 
+    }
+  else if (!strcmp (sec_name, _COMMENT))
     {
       styp_flags = STYP_INFO;
-#endif                         /* _COMMENT */
+#endif /* _COMMENT */
 #ifdef _LIB
     }
-  else if (!strcmp(sec_name, _LIB)) 
+  else if (!strcmp (sec_name, _LIB))
     {
       styp_flags = STYP_LIB;
-#endif                         /* _LIB */
+#endif /* _LIB */
 #ifdef _LIT
     }
   else if (!strcmp (sec_name, _LIT))
@@ -343,21 +356,40 @@ sec_to_styp_flags (sec_name, sec_flags)
       styp_flags = STYP_LIT;
 #endif /* _LIT */
     }
-  else if (!strcmp(sec_name, ".debug"))
+  else if (!strcmp (sec_name, ".debug"))
     {
+#ifdef STYP_DEBUG
+      styp_flags = STYP_DEBUG;
+#else
       styp_flags = STYP_INFO;
+#endif
     }
-  else if (!strcmp(sec_name, ".stab")
-          || !strncmp(sec_name, ".stabstr", 8))
+  else if (!strncmp (sec_name, ".stab", 5))
     {
       styp_flags = STYP_INFO;
     }
+#ifdef COFF_WITH_PE
+  else if (!strcmp (sec_name, ".edata"))
+    {
+      styp_flags = STYP_DATA;
+    }
+#endif
+#ifdef RS6000COFF_C
+  else if (!strcmp (sec_name, _PAD))
+    {
+      styp_flags = STYP_PAD;
+    }
+  else if (!strcmp (sec_name, _LOADER))
+    {
+      styp_flags = STYP_LOADER;
+    }
+#endif
   /* Try and figure out what it should be */
-  else if (sec_flags & SEC_CODE) 
+  else if (sec_flags & SEC_CODE)
     {
       styp_flags = STYP_TEXT;
     }
-  else  if (sec_flags & SEC_DATA) 
+  else if (sec_flags & SEC_DATA)
     {
       styp_flags = STYP_DATA;
     }
@@ -367,7 +399,7 @@ sec_to_styp_flags (sec_name, sec_flags)
       styp_flags = STYP_LIT;
 #else
       styp_flags = STYP_TEXT;
-#endif                         /* STYP_LIT */
+#endif /* STYP_LIT */
     }
   else if (sec_flags & SEC_LOAD)
     {
@@ -379,11 +411,16 @@ sec_to_styp_flags (sec_name, sec_flags)
     }
 
 #ifdef STYP_NOLOAD
-  if (sec_flags & SEC_NEVER_LOAD)
-   styp_flags |= STYP_NOLOAD;
+  if ((sec_flags & (SEC_NEVER_LOAD | SEC_COFF_SHARED_LIBRARY)) != 0)
+    styp_flags |= STYP_NOLOAD;
 #endif
 
-  return(styp_flags);
+#ifdef COFF_WITH_PE
+  if (sec_flags & SEC_LINK_ONCE)
+    styp_flags |= IMAGE_SCN_LNK_COMDAT;
+#endif
+
+  return (styp_flags);
 }
 /*
  * Return a word with SEC_* flags set to represent the incoming
@@ -393,76 +430,219 @@ sec_to_styp_flags (sec_name, sec_flags)
  *      in sec_to_styp_flags().
  */
 static flagword
-DEFUN(styp_to_sec_flags, (abfd, hdr),
-      bfd *abfd AND
-      PTR hdr)
+styp_to_sec_flags (abfd, hdr, name)
+     bfd *abfd;
+     PTR hdr;
+     const char *name;
 {
   struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
   long styp_flags = internal_s->s_flags;
-  flagword     sec_flags=0;
+  flagword sec_flags = 0;
 
 #ifdef STYP_NOLOAD
   if (styp_flags & STYP_NOLOAD)
-  {
-    sec_flags |= SEC_NEVER_LOAD;
-  }
+    {
+      sec_flags |= SEC_NEVER_LOAD;
+    }
 #endif /* STYP_NOLOAD */
 
   /* For 386 COFF, at least, an unloadable text or data section is
      actually a shared library section.  */
   if (styp_flags & STYP_TEXT)
-  {
-    if (sec_flags & SEC_NEVER_LOAD)
-      sec_flags |= SEC_CODE | SEC_SHARED_LIBRARY;
-    else
-      sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
-  }
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+       sec_flags |= SEC_CODE | SEC_COFF_SHARED_LIBRARY;
+      else
+       sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
+    }
   else if (styp_flags & STYP_DATA)
-  {
-    if (sec_flags & SEC_NEVER_LOAD)
-      sec_flags |= SEC_DATA | SEC_SHARED_LIBRARY;
-    else
-      sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
-  }
-  else if (styp_flags & STYP_BSS) 
-  {
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+       sec_flags |= SEC_DATA | SEC_COFF_SHARED_LIBRARY;
+      else
+       sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
+    }
+  else if (styp_flags & STYP_BSS)
+    {
 #ifdef BSS_NOLOAD_IS_SHARED_LIBRARY
-    if (sec_flags & SEC_NEVER_LOAD)
-      sec_flags |= SEC_ALLOC | SEC_SHARED_LIBRARY;
-    else
+      if (sec_flags & SEC_NEVER_LOAD)
+       sec_flags |= SEC_ALLOC | SEC_COFF_SHARED_LIBRARY;
+      else
 #endif
-      sec_flags |= SEC_ALLOC;
-  }
-  else if (styp_flags & STYP_INFO) 
+       sec_flags |= SEC_ALLOC;
+    }
+  else if (styp_flags & STYP_INFO)
+    {
+      /* We mark these as SEC_DEBUGGING, but only if COFF_PAGE_SIZE is
+        defined.  coff_compute_section_file_positions uses
+        COFF_PAGE_SIZE to ensure that the low order bits of the
+        section VMA and the file offset match.  If we don't know
+        COFF_PAGE_SIZE, we can't ensure the correct correspondence,
+        and demand page loading of the file will fail.  */
+#ifdef COFF_PAGE_SIZE
+      sec_flags |= SEC_DEBUGGING;
+#endif
+    }
+  else if (styp_flags & STYP_PAD)
+    {
+      sec_flags = 0;
+    }
+  else if (strcmp (name, _TEXT) == 0)
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+       sec_flags |= SEC_CODE | SEC_COFF_SHARED_LIBRARY;
+      else
+       sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
+    }
+  else if (strcmp (name, _DATA) == 0)
+    {
+      if (sec_flags & SEC_NEVER_LOAD)
+       sec_flags |= SEC_DATA | SEC_COFF_SHARED_LIBRARY;
+      else
+       sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
+    }
+  else if (strcmp (name, _BSS) == 0)
+    {
+#ifdef BSS_NOLOAD_IS_SHARED_LIBRARY
+      if (sec_flags & SEC_NEVER_LOAD)
+       sec_flags |= SEC_ALLOC | SEC_COFF_SHARED_LIBRARY;
+      else
+#endif
+       sec_flags |= SEC_ALLOC;
+    }
+  else if (strcmp (name, ".debug") == 0
+#ifdef _COMMENT
+          || strcmp (name, _COMMENT) == 0
+#endif
+          || strncmp (name, ".stab", 5) == 0)
+    {
+#ifdef COFF_PAGE_SIZE
+      sec_flags |= SEC_DEBUGGING;
+#endif
+    }
+#ifdef _LIB
+  else if (strcmp (name, _LIB) == 0)
+    ;
+#endif
+#ifdef _LIT
+  else if (strcmp (name, _LIT) == 0)
     {
-      /* This should be marked as SEC_DEBUGGING, but that can't be
-        done until we make sure that strip can still work.  strip
-        will probably have to preserve the same number of sections to
-        ensure that the section vma matches the section file
-        position.  */
+      sec_flags = SEC_LOAD | SEC_ALLOC | SEC_READONLY;
     }
+#endif
   else
-  {
-    sec_flags |= SEC_ALLOC | SEC_LOAD;
-  }
+    {
+      sec_flags |= SEC_ALLOC | SEC_LOAD;
+    }
 
 #ifdef STYP_LIT                        /* A29k readonly text/data section type */
   if ((styp_flags & STYP_LIT) == STYP_LIT)
-  {
-    sec_flags = (SEC_LOAD | SEC_ALLOC | SEC_READONLY);
-  }
-#endif                         /* STYP_LIT */
+    {
+      sec_flags = (SEC_LOAD | SEC_ALLOC | SEC_READONLY);
+    }
+#endif /* STYP_LIT */
 #ifdef STYP_OTHER_LOAD         /* Other loaded sections */
   if (styp_flags & STYP_OTHER_LOAD)
-  {
-    sec_flags = (SEC_LOAD | SEC_ALLOC);
-  }
-#endif                         /* STYP_SDATA */
+    {
+      sec_flags = (SEC_LOAD | SEC_ALLOC);
+    }
+#endif /* STYP_SDATA */
+
+#ifdef COFF_WITH_PE
+  if (styp_flags & IMAGE_SCN_LNK_REMOVE)
+    sec_flags |= SEC_EXCLUDE;
+
+  if (styp_flags & IMAGE_SCN_LNK_COMDAT)
+    {
+      sec_flags |= SEC_LINK_ONCE;
+
+      /* Unfortunately, the PE format stores essential information in
+         the symbol table, of all places.  We need to extract that
+         information now, so that objdump and the linker will know how
+         to handle the section without worrying about the symbols.  We
+         can't call slurp_symtab, because the linker doesn't want the
+         swapped symbols.  */
+
+      if (_bfd_coff_get_external_symbols (abfd))
+       {
+         bfd_byte *esym, *esymend;
+
+         esym = (bfd_byte *) obj_coff_external_syms (abfd);
+         esymend = esym + obj_raw_syment_count (abfd) * SYMESZ;
+
+         while (esym < esymend)
+           {
+             struct internal_syment isym;
+
+             bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &isym);
 
-  return(sec_flags);
+             if (sizeof (internal_s->s_name) > SYMNMLEN)
+               {
+                 /* This case implies that the matching symbol name
+                     will be in the string table.  */
+                 abort ();
+               }
+
+             if (isym.n_sclass == C_STAT
+                 && isym.n_type == T_NULL
+                 && isym.n_numaux == 1)
+               {
+                 char buf[SYMNMLEN + 1];
+                 const char *symname;
+
+                 symname = _bfd_coff_internal_syment_name (abfd, &isym, buf);
+                 if (symname == NULL)
+                   abort ();
+
+                 if (strcmp (name, symname) == 0)
+                   {
+                     union internal_auxent aux;
+
+                     /* This is the section symbol.  */
+
+                     bfd_coff_swap_aux_in (abfd, (PTR) (esym + SYMESZ),
+                                           isym.n_type, isym.n_sclass,
+                                           0, isym.n_numaux, (PTR) &aux);
+
+                     switch (aux.x_scn.x_comdat)
+                       {
+                       case IMAGE_COMDAT_SELECT_NODUPLICATES:
+                         sec_flags |= SEC_LINK_DUPLICATES_ONE_ONLY;
+                         break;
+
+                       default:
+                       case IMAGE_COMDAT_SELECT_ANY:
+                         sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
+                         break;
+
+                       case IMAGE_COMDAT_SELECT_SAME_SIZE:
+                         sec_flags |= SEC_LINK_DUPLICATES_SAME_SIZE;
+                         break;
+
+                       case IMAGE_COMDAT_SELECT_EXACT_MATCH:
+                         sec_flags |= SEC_LINK_DUPLICATES_SAME_CONTENTS;
+                         break;
+
+                       case IMAGE_COMDAT_SELECT_ASSOCIATIVE:
+                         /* FIXME: This is not currently implemented.  */
+                         sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
+                         break;
+                       }
+
+                     break;
+                   }
+               }
+
+             esym += (isym.n_numaux + 1) * SYMESZ;
+           }
+       }
+    }
+#endif
+
+  return (sec_flags);
 }
 
-#define        get_index(symbol)       ((long) (symbol)->udata)
+#define        get_index(symbol)       ((symbol)->udata.i)
 
 /*
 INTERNAL_DEFINITION
@@ -471,7 +651,7 @@ INTERNAL_DEFINITION
 CODE_FRAGMENT
 
 Special entry points for gdb to swap in coff symbol table parts:
-.typedef struct 
+.typedef struct
 .{
 .  void (*_bfd_coff_swap_aux_in) PARAMS ((
 .       bfd            *abfd,
@@ -543,8 +723,10 @@ dependent COFF routines:
 . unsigned int _bfd_scnhsz;
 . unsigned int _bfd_symesz;
 . unsigned int _bfd_auxesz;
+. unsigned int _bfd_relsz;
 . unsigned int _bfd_linesz;
 . boolean _bfd_coff_long_filenames;
+. boolean _bfd_coff_long_section_names;
 . void (*_bfd_coff_swap_filehdr_in) PARAMS ((
 .       bfd     *abfd,
 .       PTR     ext,
@@ -557,6 +739,10 @@ dependent COFF routines:
 .       bfd     *abfd,
 .       PTR     ext,
 .       PTR     in));
+. void (*_bfd_coff_swap_reloc_in) PARAMS ((
+.       bfd     *abfd,
+.       PTR     ext,
+.       PTR     in));
 . boolean (*_bfd_coff_bad_format_hook) PARAMS ((
 .       bfd     *abfd,
 .       PTR     internal_filehdr));
@@ -569,10 +755,8 @@ dependent COFF routines:
 .       PTR     internal_aouthdr));
 . flagword (*_bfd_styp_to_sec_flags_hook) PARAMS ((
 .       bfd     *abfd,
-.       PTR     internal_scnhdr));
-. asection *(*_bfd_make_section_hook) PARAMS ((
-.       bfd     *abfd,
-.       char    *name));
+.       PTR     internal_scnhdr,
+.       const char *name));
 . void (*_bfd_set_alignment_hook) PARAMS ((
 .       bfd     *abfd,
 .       asection *sec,
@@ -582,6 +766,19 @@ dependent COFF routines:
 . boolean (*_bfd_coff_symname_in_debug) PARAMS ((
 .       bfd     *abfd,
 .       struct internal_syment *sym));
+. boolean (*_bfd_coff_pointerize_aux_hook) PARAMS ((
+.       bfd *abfd,
+.       combined_entry_type *table_base,
+.       combined_entry_type *symbol,
+.       unsigned int indaux,
+.       combined_entry_type *aux));
+. boolean (*_bfd_coff_print_aux) PARAMS ((
+.       bfd *abfd,
+.       FILE *file,
+.       combined_entry_type *table_base,
+.       combined_entry_type *symbol,
+.       combined_entry_type *aux,
+.       unsigned int indaux));
 . void (*_bfd_coff_reloc16_extra_cases) PARAMS ((
 .       bfd     *abfd,
 .       struct bfd_link_info *link_info,
@@ -591,11 +788,53 @@ dependent COFF routines:
 .       unsigned int *src_ptr,
 .       unsigned int *dst_ptr));
 . int (*_bfd_coff_reloc16_estimate) PARAMS ((
+.       bfd *abfd,
 .       asection *input_section,
-.       asymbol **symbols,
 .       arelent *r,
 .       unsigned int shrink,
 .       struct bfd_link_info *link_info));
+. boolean (*_bfd_coff_sym_is_global) PARAMS ((
+.       bfd *abfd,
+.       struct internal_syment *));
+. void (*_bfd_coff_compute_section_file_positions) PARAMS ((
+.       bfd *abfd));
+. boolean (*_bfd_coff_start_final_link) PARAMS ((
+.       bfd *output_bfd,
+.       struct bfd_link_info *info));
+. boolean (*_bfd_coff_relocate_section) PARAMS ((
+.       bfd *output_bfd,
+.       struct bfd_link_info *info,
+.       bfd *input_bfd,
+.       asection *input_section,
+.       bfd_byte *contents,
+.       struct internal_reloc *relocs,
+.       struct internal_syment *syms,
+.       asection **sections));
+. reloc_howto_type *(*_bfd_coff_rtype_to_howto) PARAMS ((
+.       bfd *abfd,
+.       asection *sec,
+.       struct internal_reloc *rel,
+.       struct coff_link_hash_entry *h,
+.       struct internal_syment *sym,
+.       bfd_vma *addendp));
+. boolean (*_bfd_coff_adjust_symndx) PARAMS ((
+.       bfd *obfd,
+.       struct bfd_link_info *info,
+.       bfd *ibfd,
+.       asection *sec,
+.       struct internal_reloc *reloc,
+.       boolean *adjustedp));
+. boolean (*_bfd_coff_link_add_one_symbol) PARAMS ((
+.       struct bfd_link_info *info,
+.       bfd *abfd,
+.       const char *name,
+.       flagword flags, 
+.       asection *section,
+.       bfd_vma value,
+.       const char *string,
+.       boolean copy,
+.       boolean collect, 
+.       struct bfd_link_hash_entry **hashp));
 .
 .} bfd_coff_backend_data;
 .
@@ -636,8 +875,11 @@ dependent COFF routines:
 .#define bfd_coff_scnhsz(abfd) (coff_backend_info (abfd)->_bfd_scnhsz)
 .#define bfd_coff_symesz(abfd) (coff_backend_info (abfd)->_bfd_symesz)
 .#define bfd_coff_auxesz(abfd) (coff_backend_info (abfd)->_bfd_auxesz)
+.#define bfd_coff_relsz(abfd)  (coff_backend_info (abfd)->_bfd_relsz)
 .#define bfd_coff_linesz(abfd) (coff_backend_info (abfd)->_bfd_linesz)
 .#define bfd_coff_long_filenames(abfd) (coff_backend_info (abfd)->_bfd_coff_long_filenames)
+.#define bfd_coff_long_section_names(abfd) \
+.        (coff_backend_info (abfd)->_bfd_coff_long_section_names)
 .#define bfd_coff_swap_filehdr_in(abfd, i,o) \
 .        ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_in) (abfd, i, o))
 .
@@ -647,6 +889,9 @@ dependent COFF routines:
 .#define bfd_coff_swap_scnhdr_in(abfd, i,o) \
 .        ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_in) (abfd, i, o))
 .
+.#define bfd_coff_swap_reloc_in(abfd, i, o) \
+.        ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_in) (abfd, i, o))
+.
 .#define bfd_coff_bad_format_hook(abfd, filehdr) \
 .        ((coff_backend_info (abfd)->_bfd_coff_bad_format_hook) (abfd, filehdr))
 .
@@ -655,11 +900,8 @@ dependent COFF routines:
 .#define bfd_coff_mkobject_hook(abfd, filehdr, aouthdr)\
 .        ((coff_backend_info (abfd)->_bfd_coff_mkobject_hook) (abfd, filehdr, aouthdr))
 .
-.#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr)\
-.        ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook) (abfd, scnhdr))
-.
-.#define bfd_coff_make_section_hook(abfd, name)\
-.        ((coff_backend_info (abfd)->_bfd_make_section_hook) (abfd, name))
+.#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name)\
+.        ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook) (abfd, scnhdr, name))
 .
 .#define bfd_coff_set_alignment_hook(abfd, sec, scnhdr)\
 .        ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr))
@@ -670,22 +912,50 @@ dependent COFF routines:
 .#define bfd_coff_symname_in_debug(abfd, sym)\
 .        ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym))
 .
+.#define bfd_coff_print_aux(abfd, file, base, symbol, aux, indaux)\
+.        ((coff_backend_info (abfd)->_bfd_coff_print_aux)\
+.         (abfd, file, base, symbol, aux, indaux))
+.
 .#define bfd_coff_reloc16_extra_cases(abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)\
 .        ((coff_backend_info (abfd)->_bfd_coff_reloc16_extra_cases)\
 .         (abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr))
 .
-.#define bfd_coff_reloc16_estimate(abfd, section, symbols, reloc, shrink, link_info)\
+.#define bfd_coff_reloc16_estimate(abfd, section, reloc, shrink, link_info)\
 .        ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\
-.         (section, symbols, reloc, shrink, link_info))
-. 
+.         (abfd, section, reloc, shrink, link_info))
+.
+.#define bfd_coff_sym_is_global(abfd, sym)\
+.        ((coff_backend_info (abfd)->_bfd_coff_sym_is_global)\
+.         (abfd, sym))
+.
+.#define bfd_coff_compute_section_file_positions(abfd)\
+.        ((coff_backend_info (abfd)->_bfd_coff_compute_section_file_positions)\
+.         (abfd))
+.
+.#define bfd_coff_start_final_link(obfd, info)\
+.        ((coff_backend_info (obfd)->_bfd_coff_start_final_link)\
+.         (obfd, info))
+.#define bfd_coff_relocate_section(obfd,info,ibfd,o,con,rel,isyms,secs)\
+.        ((coff_backend_info (ibfd)->_bfd_coff_relocate_section)\
+.         (obfd, info, ibfd, o, con, rel, isyms, secs))
+.#define bfd_coff_rtype_to_howto(abfd, sec, rel, h, sym, addendp)\
+.        ((coff_backend_info (abfd)->_bfd_coff_rtype_to_howto)\
+.         (abfd, sec, rel, h, sym, addendp))
+.#define bfd_coff_adjust_symndx(obfd, info, ibfd, sec, rel, adjustedp)\
+.        ((coff_backend_info (abfd)->_bfd_coff_adjust_symndx)\
+.         (obfd, info, ibfd, sec, rel, adjustedp))
+.#define bfd_coff_link_add_one_symbol(info,abfd,name,flags,section,value,string,cp,coll,hashp)\
+.        ((coff_backend_info (abfd)->_bfd_coff_link_add_one_symbol)\
+.         (info, abfd, name, flags, section, value, string, cp, coll, hashp))
+.
 */
 
 /* See whether the magic number matches.  */
 
 static boolean
-DEFUN(coff_bad_format_hook, (abfd, filehdr),
-      bfd *abfd AND
-      PTR filehdr)
+coff_bad_format_hook (abfd, filehdr)
+     bfd * abfd;
+     PTR filehdr;
 {
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
@@ -709,53 +979,65 @@ DEFUN(coff_bad_format_hook, (abfd, filehdr),
   return true;
 }
 
-static asection *
-DEFUN (coff_make_section_hook, (abfd, name),
-       bfd *abfd AND
-       char *name)
-{
-#ifdef TWO_DATA_SECS
-  /* FIXME: This predates the call to bfd_make_section_anyway
-     in make_a_section_from_file, and can probably go away.  */
-  /* On SCO a file created by the Microsoft assembler can have two
-     .data sections.  We use .data2 for the second one.  */
-  if (strcmp (name, _DATA) == 0)
-    return bfd_make_section (abfd, ".data2");
-#endif
-  return (asection *) NULL;
-}
-
 /*
    initialize a section structure with information peculiar to this
    particular implementation of coff
 */
 
 static boolean
-DEFUN(coff_new_section_hook,(abfd, section),
-      bfd            *abfd AND
-      asection       *section)
+coff_new_section_hook (abfd, section)
+     bfd * abfd;
+     asection * section;
 {
-  section->alignment_power = abfd->xvec->align_power_min;
+  section->alignment_power = COFF_DEFAULT_SECTION_ALIGNMENT_POWER;
+
+#ifdef RS6000COFF_C
+  if (xcoff_data (abfd)->text_align_power != 0
+      && strcmp (bfd_get_section_name (abfd, section), ".text") == 0)
+    section->alignment_power = xcoff_data (abfd)->text_align_power;
+  if (xcoff_data (abfd)->data_align_power != 0
+      && strcmp (bfd_get_section_name (abfd, section), ".data") == 0)
+    section->alignment_power = xcoff_data (abfd)->data_align_power;
+#endif
+
   /* Allocate aux records for section symbols, to store size and
      related info.
 
-     @@ Shouldn't use constant multiplier here!  */
+     @@ The 10 is a guess at a plausible maximum number of aux entries
+     (but shouldn't be a constant).  */
   coffsymbol (section->symbol)->native =
     (combined_entry_type *) bfd_zalloc (abfd,
                                        sizeof (combined_entry_type) * 10);
+
+  /* The .stab section must be aligned to 2**2 at most, because
+     otherwise there may be gaps in the section which gdb will not
+     know how to interpret.  Examining the section name is a hack, but
+     that is also how gdb locates the section.
+     We need to handle the .ctors and .dtors sections similarly, to
+     avoid introducing null words in the tables.  */
+  if (COFF_DEFAULT_SECTION_ALIGNMENT_POWER > 2
+      && (strncmp (section->name, ".stab", 5) == 0
+         || strcmp (section->name, ".ctors") == 0
+         || strcmp (section->name, ".dtors") == 0))
+    section->alignment_power = 2;
+
+  /* Similarly, the .stabstr section must be aligned to 2**0 at most.  */
+  if (COFF_DEFAULT_SECTION_ALIGNMENT_POWER > 0
+      && strncmp (section->name, ".stabstr", 8) == 0)
+    section->alignment_power = 0;
+
   return true;
 }
 
-
 #ifdef I960
 
 /* Set the alignment of a BFD section.  */
 
 static void
-DEFUN (coff_set_alignment_hook, (abfd, section, scnhdr),
-       bfd *abfd AND
-       asection *section AND
-       PTR scnhdr)
+coff_set_alignment_hook (abfd, section, scnhdr)
+     bfd * abfd;
+     asection * section;
+     PTR scnhdr;
 {
   struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
   unsigned int i;
@@ -767,40 +1049,178 @@ DEFUN (coff_set_alignment_hook, (abfd, section, scnhdr),
 }
 
 #else /* ! I960 */
+#ifdef COFF_WITH_PE
+
+/* a couple of macros to help setting the alignment power field */
+#define ALIGN_SET(field,x,y) \
+  if (((field) & IMAGE_SCN_ALIGN_64BYTES) == x )\
+  {\
+     section->alignment_power = y;\
+  }
+
+#define ELIFALIGN_SET(field,x,y) \
+  else if (( (field) & IMAGE_SCN_ALIGN_64BYTES) == x ) \
+  {\
+     section->alignment_power = y;\
+  }
+
+static void
+coff_set_alignment_hook (abfd, section, scnhdr)
+     bfd * abfd;
+     asection * section;
+     PTR scnhdr;
+{
+  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
+
+  ALIGN_SET     (hdr->s_flags, IMAGE_SCN_ALIGN_64BYTES, 6)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_32BYTES, 5)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_16BYTES, 4)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_8BYTES,  3)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_4BYTES,  2)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_2BYTES,  1)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_1BYTES,  0)
+
+#ifdef POWERPC_LE_PE
+  if (strcmp (section->name, ".idata$2") == 0)
+    {
+      section->alignment_power = 0;
+    }
+  else if (strcmp (section->name, ".idata$3") == 0)
+    {
+      section->alignment_power = 0;
+    }
+  else if (strcmp (section->name, ".idata$4") == 0)
+    {
+      section->alignment_power = 2;
+    }
+  else if (strcmp (section->name, ".idata$5") == 0)
+    {
+      section->alignment_power = 2;
+    }
+  else if (strcmp (section->name, ".idata$6") == 0)
+    {
+      section->alignment_power = 1;
+    }
+  else if (strcmp (section->name, ".reloc") == 0)
+    {
+      section->alignment_power = 1;
+    }
+  else if (strncmp (section->name, ".stab", 5) == 0)
+    {
+      section->alignment_power = 2;
+    }
+#endif
+
+#ifdef COFF_IMAGE_WITH_PE
+  /* In a PE image file, the s_paddr field holds the virtual size of a
+     section, while the s_size field holds the raw size.  */
+  if (hdr->s_paddr != 0)
+    {
+      if (coff_section_data (abfd, section) == NULL)
+       {
+         section->used_by_bfd =
+           (PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata));
+         if (section->used_by_bfd == NULL)
+           {
+             /* FIXME: Return error.  */
+             abort ();
+           }
+       }
+      if (pei_section_data (abfd, section) == NULL)
+       {
+         coff_section_data (abfd, section)->tdata =
+           (PTR) bfd_zalloc (abfd, sizeof (struct pei_section_tdata));
+         if (coff_section_data (abfd, section)->tdata == NULL)
+           {
+             /* FIXME: Return error.  */
+             abort ();
+           }
+       }
+      pei_section_data (abfd, section)->virt_size = hdr->s_paddr;
+    }
+#endif
+
+}
+#undef ALIGN_SET
+#undef ELIFALIGN_SET
+
+#else /* ! COFF_WITH_PE */
+#ifdef RS6000COFF_C
+
+/* We grossly abuse this function to handle XCOFF overflow headers.
+   When we see one, we correct the reloc and line number counts in the
+   real header, and remove the section we just created.  */
+
+static void
+coff_set_alignment_hook (abfd, section, scnhdr)
+     bfd *abfd;
+     asection *section;
+     PTR scnhdr;
+{
+  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
+  asection *real_sec;
+  asection **ps;
+
+  if ((hdr->s_flags & STYP_OVRFLO) == 0)
+    return;
+
+  real_sec = coff_section_from_bfd_index (abfd, hdr->s_nreloc);
+  if (real_sec == NULL)
+    return;
+
+  real_sec->reloc_count = hdr->s_paddr;
+  real_sec->lineno_count = hdr->s_vaddr;
+
+  for (ps = &abfd->sections; *ps != NULL; ps = &(*ps)->next)
+    {
+      if (*ps == section)
+       {
+         *ps = (*ps)->next;
+         --abfd->section_count;
+         break;
+       }
+    }
+}
+
+#else /* ! RS6000COFF_C */
 
 #define coff_set_alignment_hook \
   ((void (*) PARAMS ((bfd *, asection *, PTR))) bfd_void)
 
+#endif /* ! RS6000COFF_C */
+#endif /* ! COFF_WITH_PE */
 #endif /* ! I960 */
 
-static          boolean
-DEFUN(coff_mkobject,(abfd),
-      bfd            *abfd)
+#ifndef coff_mkobject
+static boolean
+coff_mkobject (abfd)
+     bfd * abfd;
 {
   coff_data_type *coff;
 
-  abfd->tdata.coff_obj_data = (struct coff_tdata *)bfd_zalloc (abfd,sizeof(coff_data_type));
-  if (abfd->tdata.coff_obj_data == 0){
-    bfd_error = no_memory;
+  abfd->tdata.coff_obj_data = (struct coff_tdata *) bfd_zalloc (abfd, sizeof (coff_data_type));
+  if (abfd->tdata.coff_obj_data == 0)
     return false;
-  }
   coff = coff_data (abfd);
   coff->symbols = (coff_symbol_type *) NULL;
   coff->conversion_table = (unsigned int *) NULL;
   coff->raw_syments = (struct coff_ptr_struct *) NULL;
-  coff->raw_linenos = (struct lineno *) NULL;
   coff->relocbase = 0;
+  coff->local_toc_sym_map = 0;
+
 /*  make_abs_section(abfd);*/
+
   return true;
 }
+#endif
 
 /* Create the COFF backend specific information.  */
-
-static          PTR
-DEFUN(coff_mkobject_hook,(abfd, filehdr, aouthdr),
-      bfd            *abfd AND
-      PTR           filehdr AND
-      PTR           aouthdr)
+#ifndef coff_mkobject_hook
+static PTR
+coff_mkobject_hook (abfd, filehdr, aouthdr)
+     bfd * abfd;
+     PTR filehdr;
+     PTR aouthdr;
 {
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
   coff_data_type *coff;
@@ -811,21 +1231,48 @@ DEFUN(coff_mkobject_hook,(abfd, filehdr, aouthdr),
   coff = coff_data (abfd);
 
   coff->sym_filepos = internal_f->f_symptr;
-  coff->flags = internal_f->f_flags;
 
   /* These members communicate important constants about the symbol
      table to GDB's symbol-reading code.  These `constants'
      unfortunately vary among coff implementations...  */
   coff->local_n_btmask = N_BTMASK;
   coff->local_n_btshft = N_BTSHFT;
-  coff->local_n_tmask  = N_TMASK;
+  coff->local_n_tmask = N_TMASK;
   coff->local_n_tshift = N_TSHIFT;
-  coff->local_symesz   = SYMESZ;
-  coff->local_auxesz   = AUXESZ;
-  coff->local_linesz   = LINESZ;
+  coff->local_symesz = SYMESZ;
+  coff->local_auxesz = AUXESZ;
+  coff->local_linesz = LINESZ;
+
+  obj_raw_syment_count (abfd) =
+    obj_conv_table_size (abfd) =
+      internal_f->f_nsyms;
+
+#ifdef RS6000COFF_C
+  if ((internal_f->f_flags & F_SHROBJ) != 0)
+    abfd->flags |= DYNAMIC;
+  if (aouthdr != NULL && internal_f->f_opthdr >= AOUTSZ)
+    {
+      struct internal_aouthdr *internal_a =
+       (struct internal_aouthdr *) aouthdr;
+      struct xcoff_tdata *xcoff;
+
+      xcoff = xcoff_data (abfd);
+      xcoff->full_aouthdr = true;
+      xcoff->toc = internal_a->o_toc;
+      xcoff->sntoc = internal_a->o_sntoc;
+      xcoff->snentry = internal_a->o_snentry;
+      xcoff->text_align_power = internal_a->o_algntext;
+      xcoff->data_align_power = internal_a->o_algndata;
+      xcoff->modtype = internal_a->o_modtype;
+      xcoff->cputype = internal_a->o_cputype;
+      xcoff->maxdata = internal_a->o_maxdata;
+      xcoff->maxstack = internal_a->o_maxstack;
+    }
+#endif
 
   return (PTR) coff;
 }
+#endif
 
 /* Determine the machine architecture and type.  FIXME: This is target
    dependent because the magic numbers are defined in the target
@@ -835,7 +1282,7 @@ DEFUN(coff_mkobject_hook,(abfd, filehdr, aouthdr),
    at linking together COFF files for different architectures.  */
 
 static boolean
-coff_set_arch_mach_hook(abfd, filehdr)
+coff_set_arch_mach_hook (abfd, filehdr)
      bfd *abfd;
      PTR filehdr;
 {
@@ -844,71 +1291,87 @@ coff_set_arch_mach_hook(abfd, filehdr)
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
   machine = 0;
-  switch (internal_f->f_magic) {
+  switch (internal_f->f_magic)
+    {
+#ifdef PPCMAGIC
+    case PPCMAGIC:
+      arch = bfd_arch_powerpc;
+      machine = 0; /* what does this mean? (krk) */
+      break; 
+#endif
 #ifdef I386MAGIC
-  case I386MAGIC:
-  case I386PTXMAGIC:
-  case I386AIXMAGIC:           /* Danbury PS/2 AIX C Compiler */
-  case LYNXCOFFMAGIC:          /* shadows the m68k Lynx number below, sigh */
-    arch = bfd_arch_i386;
-    machine = 0;
-    break;
+    case I386MAGIC:
+    case I386PTXMAGIC:
+    case I386AIXMAGIC:         /* Danbury PS/2 AIX C Compiler */
+    case LYNXCOFFMAGIC:        /* shadows the m68k Lynx number below, sigh */
+      arch = bfd_arch_i386;
+      machine = 0;
+      break;
 #endif
-
 #ifdef A29K_MAGIC_BIG
-  case  A29K_MAGIC_BIG:
-  case  A29K_MAGIC_LITTLE:
-    arch = bfd_arch_a29k;
-    machine = 0;
-    break;
+    case A29K_MAGIC_BIG:
+    case A29K_MAGIC_LITTLE:
+      arch = bfd_arch_a29k;
+      machine = 0;
+      break;
+#endif
+#ifdef ARMMAGIC
+    case ARMMAGIC:
+      arch = bfd_arch_arm;
+      machine =0;
+      break;
 #endif
-
 #ifdef MC68MAGIC
-  case MC68MAGIC:
-  case M68MAGIC:
+    case MC68MAGIC:
+    case M68MAGIC:
 #ifdef MC68KBCSMAGIC
-  case MC68KBCSMAGIC:
+    case MC68KBCSMAGIC:
 #endif
 #ifdef APOLLOM68KMAGIC
-  case APOLLOM68KMAGIC:
+    case APOLLOM68KMAGIC:
 #endif
 #ifdef LYNXCOFFMAGIC
-  case LYNXCOFFMAGIC:
+    case LYNXCOFFMAGIC:
 #endif
-    arch = bfd_arch_m68k;
-    machine = 68020;
-    break;
+      arch = bfd_arch_m68k;
+      machine = 68020;
+      break;
 #endif
 #ifdef MC88MAGIC
-  case MC88MAGIC:
-  case MC88DMAGIC:
-  case MC88OMAGIC:
-    arch = bfd_arch_m88k;
-    machine = 88100;
-    break;
+    case MC88MAGIC:
+    case MC88DMAGIC:
+    case MC88OMAGIC:
+      arch = bfd_arch_m88k;
+      machine = 88100;
+      break;
 #endif
 #ifdef Z8KMAGIC
-   case Z8KMAGIC:
-    arch = bfd_arch_z8k;
-    switch (internal_f->f_flags & F_MACHMASK) 
-      {
-      case F_Z8001:
-       machine = bfd_mach_z8001;
-       break;
-      case F_Z8002:
-       machine = bfd_mach_z8002;
-       break;
-      default:
-       return false;
-      }
-    break;
+    case Z8KMAGIC:
+      arch = bfd_arch_z8k;
+      switch (internal_f->f_flags & F_MACHMASK)
+       {
+       case F_Z8001:
+         machine = bfd_mach_z8001;
+         break;
+       case F_Z8002:
+         machine = bfd_mach_z8002;
+         break;
+       default:
+         return false;
+       }
+      break;
+#endif
+#ifdef I860
+    case I860MAGIC:
+      arch = bfd_arch_i860;
+      break;
 #endif
 #ifdef I960
 #ifdef I960ROMAGIC
-  case I960ROMAGIC:
-  case I960RWMAGIC:
-    arch = bfd_arch_i960;
-    switch (F_I960TYPE & internal_f->f_flags)
+    case I960ROMAGIC:
+    case I960RWMAGIC:
+      arch = bfd_arch_i960;
+      switch (F_I960TYPE & internal_f->f_flags)
        {
        default:
        case F_I960CORE:
@@ -917,7 +1380,7 @@ coff_set_arch_mach_hook(abfd, filehdr)
        case F_I960KB:
          machine = bfd_mach_i960_kb_sb;
          break;
-       case  F_I960MC:
+       case F_I960MC:
          machine = bfd_mach_i960_mc;
          break;
        case F_I960XA:
@@ -929,81 +1392,168 @@ coff_set_arch_mach_hook(abfd, filehdr)
        case F_I960KA:
          machine = bfd_mach_i960_ka_sa;
          break;
+       case F_I960JX:
+         machine = bfd_mach_i960_jx;
+         break;
+       case F_I960HX:
+         machine = bfd_mach_i960_hx;
+         break;
        }
-    break;
+      break;
 #endif
 #endif
 
-#ifdef U802ROMAGIC
-  case U802ROMAGIC:
-  case U802WRMAGIC:
-  case U802TOCMAGIC:
-    arch = bfd_arch_rs6000;
-    machine = 6000;
-    break;
+#ifdef RS6000COFF_C
+    case U802ROMAGIC:
+    case U802WRMAGIC:
+    case U802TOCMAGIC:
+      {
+       int cputype;
+
+       if (xcoff_data (abfd)->cputype != -1)
+         cputype = xcoff_data (abfd)->cputype & 0xff;
+       else
+         {
+           /* We did not get a value from the a.out header.  If the
+              file has not been stripped, we may be able to get the
+              architecture information from the first symbol, if it
+              is a .file symbol.  */
+           if (obj_raw_syment_count (abfd) == 0)
+             cputype = 0;
+           else
+             {
+               bfd_byte buf[SYMESZ];
+               struct internal_syment sym;
+
+               if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
+                   || bfd_read (buf, 1, SYMESZ, abfd) != SYMESZ)
+                 return false;
+               coff_swap_sym_in (abfd, (PTR) buf, (PTR) &sym);
+               if (sym.n_sclass == C_FILE)
+                 cputype = sym.n_type & 0xff;
+               else
+                 cputype = 0;
+             }
+         }
+
+       /* FIXME: We don't handle all cases here.  */
+       switch (cputype)
+         {
+         default:
+         case 0:
+#ifdef POWERMAC
+           /* PowerPC Macs use the same magic numbers as RS/6000
+              (because that's how they were bootstrapped originally),
+              but they are always PowerPC architecture.  */
+           arch = bfd_arch_powerpc;
+           machine = 0;
+#else
+           arch = bfd_arch_rs6000;
+           machine = 6000;
+#endif /* POWERMAC */
+           break;
+
+         case 1:
+           arch = bfd_arch_powerpc;
+           machine = 601;
+           break;
+         case 2: /* 64 bit PowerPC */
+           arch = bfd_arch_powerpc;
+           machine = 620;
+           break;
+         case 3:
+           arch = bfd_arch_powerpc;
+           machine = 0;
+           break;
+         case 4:
+           arch = bfd_arch_rs6000;
+           machine = 6000;
+           break;
+         }
+      }
+      break;
 #endif
 
 #ifdef WE32KMAGIC
-  case WE32KMAGIC:
-    arch = bfd_arch_we32k;
-    machine = 0;
-    break;
+    case WE32KMAGIC:
+      arch = bfd_arch_we32k;
+      machine = 0;
+      break;
 #endif
 
 #ifdef H8300MAGIC
-  case H8300MAGIC:
-    arch = bfd_arch_h8300;
-    machine = bfd_mach_h8300;
-    /* !! FIXME this probably isn't the right place for this */
-    abfd->flags |= BFD_IS_RELAXABLE;
-    break;
+    case H8300MAGIC:
+      arch = bfd_arch_h8300;
+      machine = bfd_mach_h8300;
+      /* !! FIXME this probably isn't the right place for this */
+      abfd->flags |= BFD_IS_RELAXABLE;
+      break;
 #endif
 
 #ifdef H8300HMAGIC
-  case H8300HMAGIC:
-    arch = bfd_arch_h8300;
-    machine = bfd_mach_h8300h;
-    /* !! FIXME this probably isn't the right place for this */
-    abfd->flags |= BFD_IS_RELAXABLE;
-    break;
+    case H8300HMAGIC:
+      arch = bfd_arch_h8300;
+      machine = bfd_mach_h8300h;
+      /* !! FIXME this probably isn't the right place for this */
+      abfd->flags |= BFD_IS_RELAXABLE;
+      break;
+#endif
+
+#ifdef H8300SMAGIC
+    case H8300SMAGIC:
+      arch = bfd_arch_h8300;
+      machine = bfd_mach_h8300s;
+      /* !! FIXME this probably isn't the right place for this */
+      abfd->flags |= BFD_IS_RELAXABLE;
+      break;
 #endif
 
-#ifdef SHMAGIC
-  case SHMAGIC:
-    arch = bfd_arch_sh;
-    machine = 0;
-    break;
+#ifdef SH_ARCH_MAGIC_BIG
+    case SH_ARCH_MAGIC_BIG:
+    case SH_ARCH_MAGIC_LITTLE:
+      arch = bfd_arch_sh;
+      machine = 0;
+      break;
 #endif
 
 #ifdef H8500MAGIC
-  case H8500MAGIC:
-    arch = bfd_arch_h8500;
-    machine = 0;
-    break;
+    case H8500MAGIC:
+      arch = bfd_arch_h8500;
+      machine = 0;
+      break;
 #endif
 
 #ifdef SPARCMAGIC
-  case SPARCMAGIC:
-    arch = bfd_arch_sparc;
-    machine = 0;
-    break;
+    case SPARCMAGIC:
+#ifdef LYNXCOFFMAGIC
+    case LYNXCOFFMAGIC:
+#endif
+      arch = bfd_arch_sparc;
+      machine = 0;
+      break;
 #endif
 
-  default:                     /* Unreadable input file type */
-    arch = bfd_arch_obscure;
-break;
-  }
-
-  bfd_default_set_arch_mach(abfd, arch, machine);
+#ifdef TIC80_ARCH_MAGIC
+    case TIC80_ARCH_MAGIC:
+      arch = bfd_arch_tic80;
+      break;
+#endif
+
+    default:                   /* Unreadable input file type */
+      arch = bfd_arch_obscure;
+      break;
+    }
+
+  bfd_default_set_arch_mach (abfd, arch, machine);
   return true;
 }
 
 #ifdef SYMNAME_IN_DEBUG
 
 static boolean
-DEFUN (symname_in_debug_hook, (abfd, sym),
-       bfd *abfd AND
-       struct internal_syment *sym)
+symname_in_debug_hook (abfd, sym)
+     bfd * abfd;
+     struct internal_syment *sym;
 {
   return SYMNAME_IN_DEBUG (sym) ? true : false;
 }
@@ -1015,6 +1565,131 @@ DEFUN (symname_in_debug_hook, (abfd, sym),
 
 #endif
 
+#ifdef RS6000COFF_C
+
+/* Handle the csect auxent of a C_EXT or C_HIDEXT symbol.  */
+
+static boolean coff_pointerize_aux_hook
+  PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
+          unsigned int, combined_entry_type *));
+
+/*ARGSUSED*/
+static boolean
+coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
+     bfd *abfd;
+     combined_entry_type *table_base;
+     combined_entry_type *symbol;
+     unsigned int indaux;
+     combined_entry_type *aux;
+{
+  int class = symbol->u.syment.n_sclass;
+
+  if ((class == C_EXT || class == C_HIDEXT)
+      && indaux + 1 == symbol->u.syment.n_numaux)
+    {
+      if (SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp) == XTY_LD)
+       {
+         aux->u.auxent.x_csect.x_scnlen.p =
+           table_base + aux->u.auxent.x_csect.x_scnlen.l;
+         aux->fix_scnlen = 1;
+       }
+
+      /* Return true to indicate that the caller should not do any
+         further work on this auxent.  */
+      return true;
+    }
+
+  /* Return false to indicate that this auxent should be handled by
+     the caller.  */
+  return false;
+}
+
+#else
+#ifdef I960
+
+/* We don't want to pointerize bal entries.  */
+
+static boolean coff_pointerize_aux_hook
+  PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
+          unsigned int, combined_entry_type *));
+
+/*ARGSUSED*/
+static boolean
+coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
+     bfd *abfd;
+     combined_entry_type *table_base;
+     combined_entry_type *symbol;
+     unsigned int indaux;
+     combined_entry_type *aux;
+{
+  /* Return true if we don't want to pointerize this aux entry, which
+     is the case for the lastfirst aux entry for a C_LEAFPROC symbol.  */
+  return (indaux == 1
+         && (symbol->u.syment.n_sclass == C_LEAFPROC
+             || symbol->u.syment.n_sclass == C_LEAFSTAT
+             || symbol->u.syment.n_sclass == C_LEAFEXT));
+}
+
+#else /* ! I960 */
+
+#define coff_pointerize_aux_hook 0
+
+#endif /* ! I960 */
+#endif /* ! RS6000COFF_C */
+
+/* Print an aux entry.  This returns true if it has printed it.  */
+
+static boolean coff_print_aux
+  PARAMS ((bfd *, FILE *, combined_entry_type *, combined_entry_type *,
+          combined_entry_type *, unsigned int));
+
+static boolean
+coff_print_aux (abfd, file, table_base, symbol, aux, indaux)
+     bfd *abfd;
+     FILE *file;
+     combined_entry_type *table_base;
+     combined_entry_type *symbol;
+     combined_entry_type *aux;
+     unsigned int indaux;
+{
+#ifdef RS6000COFF_C
+  if ((symbol->u.syment.n_sclass == C_EXT
+       || symbol->u.syment.n_sclass == C_HIDEXT)
+      && indaux + 1 == symbol->u.syment.n_numaux)
+    {
+      /* This is a csect entry.  */
+      fprintf (file, "AUX ");
+      if (SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp) != XTY_LD)
+       {
+         BFD_ASSERT (! aux->fix_scnlen);
+         fprintf (file, "val %5ld", aux->u.auxent.x_csect.x_scnlen.l);
+       }
+      else
+       {
+         fprintf (file, "indx ");
+         if (! aux->fix_scnlen)
+           fprintf (file, "%4ld", aux->u.auxent.x_csect.x_scnlen.l);
+         else
+           fprintf (file, "%4ld",
+                    (long) (aux->u.auxent.x_csect.x_scnlen.p - table_base));
+       }
+      fprintf (file,
+              " prmhsh %ld snhsh %u typ %d algn %d clss %u stb %ld snstb %u",
+              aux->u.auxent.x_csect.x_parmhash,
+              (unsigned int) aux->u.auxent.x_csect.x_snhash,
+              SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp),
+              SMTYP_ALIGN (aux->u.auxent.x_csect.x_smtyp),
+              (unsigned int) aux->u.auxent.x_csect.x_smclas,
+              aux->u.auxent.x_csect.x_stab,
+              (unsigned int) aux->u.auxent.x_csect.x_snstab);
+      return true;
+    }
+#endif
+
+  /* Return false to indicate that no special action was taken.  */
+  return false;
+}
+
 /*
 SUBSUBSECTION
        Writing relocations
@@ -1027,155 +1702,255 @@ SUBSUBSECTION
        address and the relocation offset; the type is dug directly
        from the howto field.  Then the @code{internal_reloc} is
        swapped into the shape of an @code{external_reloc} and written
-       out to disk. 
+       out to disk.
 
 */
 
-static void
-DEFUN(coff_write_relocs,(abfd),
-      bfd            *abfd)
+#ifdef TARG_AUX
+
+static int compare_arelent_ptr PARAMS ((const PTR, const PTR));
+
+/* AUX's ld wants relocations to be sorted */
+static int
+compare_arelent_ptr (x, y)
+     const PTR x;
+     const PTR y;
 {
-  asection       *s;
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next) {
-    unsigned int i;
-    struct external_reloc dst;
-
-    arelent **p = s->orelocation;
-    bfd_seek(abfd, s->rel_filepos, SEEK_SET);
-    for (i = 0; i < s->reloc_count; i++) {
-      struct internal_reloc    n;
-      arelent        *q = p[i];
-      memset((PTR)&n, 0, sizeof(n));
-
-      n.r_vaddr = q->address + s->vma;
-
-#ifdef R_IHCONST                       
-      /* The 29k const/consth reloc pair is a real kludge.  The consth
-        part doesn't have a symbol; it has an offset.  So rebuilt
-        that here.  */
-      if (q->howto->type == R_IHCONST)
-       n.r_symndx = q->addend;
-      else
+  const arelent **a = (const arelent **) x;
+  const arelent **b = (const arelent **) y;
+  bfd_size_type aadr = (*a)->address;
+  bfd_size_type badr = (*b)->address;
+
+  return (aadr < badr ? -1 : badr < aadr ? 1 : 0);
+}
+
+#endif /* TARG_AUX */
+
+static boolean
+coff_write_relocs (abfd, first_undef)
+     bfd * abfd;
+     int first_undef;
+{
+  asection *s;
+
+  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
+    {
+      unsigned int i;
+      struct external_reloc dst;
+      arelent **p;
+
+#ifndef TARG_AUX
+      p = s->orelocation;
+#else
+      /* sort relocations before we write them out */
+      p = (arelent **) bfd_malloc (s->reloc_count * sizeof (arelent *));
+      if (p == NULL && s->reloc_count > 0)
+       return false;
+      memcpy (p, s->orelocation, s->reloc_count * sizeof (arelent *));
+      qsort (p, s->reloc_count, sizeof (arelent *), compare_arelent_ptr);
 #endif
-       if (q->sym_ptr_ptr) 
-         {
-           if (q->sym_ptr_ptr == bfd_abs_section.symbol_ptr_ptr) 
-             /* This is a relocation relative to the absolute symbol.  */
-             n.r_symndx = -1;
-           else
+
+      if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0)
+       return false;
+      for (i = 0; i < s->reloc_count; i++)
+       {
+         struct internal_reloc n;
+         arelent *q = p[i];
+         memset ((PTR) & n, 0, sizeof (n));
+
+         /* Now we've renumbered the symbols we know where the
+            undefined symbols live in the table.  Check the reloc
+            entries for symbols who's output bfd isn't the right one.
+            This is because the symbol was undefined (which means
+            that all the pointers are never made to point to the same
+            place). This is a bad thing,'cause the symbols attached
+            to the output bfd are indexed, so that the relocation
+            entries know which symbol index they point to.  So we
+            have to look up the output symbol here. */
+
+         if (q->sym_ptr_ptr[0]->the_bfd != abfd)
+           {
+             int i;
+             const char *sname = q->sym_ptr_ptr[0]->name;
+             asymbol **outsyms = abfd->outsymbols;
+             for (i = first_undef; outsyms[i]; i++)
+               {
+                 const char *intable = outsyms[i]->name;
+                 if (strcmp (intable, sname) == 0) {
+                   /* got a hit, so repoint the reloc */
+                   q->sym_ptr_ptr = outsyms + i;
+                   break;
+                 }
+               }
+           }
+
+         n.r_vaddr = q->address + s->vma;
+
+#ifdef R_IHCONST
+         /* The 29k const/consth reloc pair is a real kludge.  The consth
+            part doesn't have a symbol; it has an offset.  So rebuilt
+            that here.  */
+         if (q->howto->type == R_IHCONST)
+           n.r_symndx = q->addend;
+         else
+#endif
+           if (q->sym_ptr_ptr)
              {
-               n.r_symndx = get_index((*(q->sym_ptr_ptr)));
-               /* Take notice if the symbol reloc points to a symbol
-                  we don't have in our symbol table.  What should we
-                  do for this??  */
-               if (n.r_symndx > obj_conv_table_size (abfd))
-                 abort ();
+               if (q->sym_ptr_ptr == bfd_abs_section_ptr->symbol_ptr_ptr)
+                 /* This is a relocation relative to the absolute symbol.  */
+                 n.r_symndx = -1;
+               else
+                 {
+                   n.r_symndx = get_index ((*(q->sym_ptr_ptr)));
+                   /* Take notice if the symbol reloc points to a symbol
+                      we don't have in our symbol table.  What should we
+                      do for this??  */
+                   if (n.r_symndx > obj_conv_table_size (abfd))
+                     abort ();
+                 }
              }
-         }
 
 #ifdef SWAP_OUT_RELOC_OFFSET
-      n.r_offset = q->addend;
+         n.r_offset = q->addend;
 #endif
 
 #ifdef SELECT_RELOC
-      /* Work out reloc type from what is required */
-      SELECT_RELOC(n.r_type, q->howto);
+         /* Work out reloc type from what is required */
+         SELECT_RELOC (n, q->howto);
 #else
-      n.r_type = q->howto->type;
+         n.r_type = q->howto->type;
+#endif
+         coff_swap_reloc_out (abfd, &n, &dst);
+         if (bfd_write ((PTR) & dst, 1, RELSZ, abfd) != RELSZ)
+           return false;
+       }
+
+#ifdef TARG_AUX
+      if (p != NULL)
+       free (p);
 #endif
-      coff_swap_reloc_out(abfd, &n, &dst);
-      bfd_write((PTR) &dst, 1, RELSZ, abfd);
     }
-  }
+
+  return true;
 }
 
 /* Set flags and magic number of a coff file from architecture and machine
    type.  Result is true if we can represent the arch&type, false if not.  */
 
-static          boolean
-DEFUN(coff_set_flags,(abfd, magicp, flagsp),
-      bfd            *abfd AND
-      unsigned       *magicp AND
-      unsigned short *flagsp)
+static boolean
+coff_set_flags (abfd, magicp, flagsp)
+     bfd * abfd;
+     unsigned *magicp;
+     unsigned short *flagsp;
 {
-  switch (bfd_get_arch(abfd)) {
-#ifdef Z8KMAGIC
-   case bfd_arch_z8k:
-    *magicp = Z8KMAGIC;
-    switch (bfd_get_mach(abfd)) 
+  switch (bfd_get_arch (abfd))
     {
-     case bfd_mach_z8001:
-      *flagsp = F_Z8001;
-      break;
-     case bfd_mach_z8002:
-      *flagsp = F_Z8002;
-      break;
-     default:
-      return false;
-    }
-    return true;
+#ifdef Z8KMAGIC
+    case bfd_arch_z8k:
+      *magicp = Z8KMAGIC;
+      switch (bfd_get_mach (abfd))
+       {
+       case bfd_mach_z8001:
+         *flagsp = F_Z8001;
+         break;
+       case bfd_mach_z8002:
+         *flagsp = F_Z8002;
+         break;
+       default:
+         return false;
+       }
+      return true;
 #endif
 #ifdef I960ROMAGIC
 
     case bfd_arch_i960:
 
       {
-       unsigned        flags;
+       unsigned flags;
        *magicp = I960ROMAGIC;
        /*
          ((bfd_get_file_flags(abfd) & WP_TEXT) ? I960ROMAGIC :
          I960RWMAGIC);   FIXME???
          */
-       switch (bfd_get_mach(abfd)) {
-       case bfd_mach_i960_core:
-         flags = F_I960CORE;
-         break;
-       case bfd_mach_i960_kb_sb:
-         flags = F_I960KB;
-         break;
-       case bfd_mach_i960_mc:
-         flags = F_I960MC;
-         break;
-       case bfd_mach_i960_xa:
-         flags = F_I960XA;
-         break;
-       case bfd_mach_i960_ca:
-         flags = F_I960CA;
-         break;
-       case bfd_mach_i960_ka_sa:
-         flags = F_I960KA;
-         break;
-       default:
-         return false;
-       }
+       switch (bfd_get_mach (abfd))
+         {
+         case bfd_mach_i960_core:
+           flags = F_I960CORE;
+           break;
+         case bfd_mach_i960_kb_sb:
+           flags = F_I960KB;
+           break;
+         case bfd_mach_i960_mc:
+           flags = F_I960MC;
+           break;
+         case bfd_mach_i960_xa:
+           flags = F_I960XA;
+           break;
+         case bfd_mach_i960_ca:
+           flags = F_I960CA;
+           break;
+         case bfd_mach_i960_ka_sa:
+           flags = F_I960KA;
+           break;
+         case bfd_mach_i960_jx:
+           flags = F_I960JX;
+           break;
+         case bfd_mach_i960_hx:
+           flags = F_I960HX;
+           break;
+         default:
+           return false;
+         }
        *flagsp = flags;
        return true;
       }
-    break;
+      break;
+#endif
+#ifdef ARMMAGIC
+    case bfd_arch_arm:
+      *magicp = ARMMAGIC;
+      return true;
+#endif
+#ifdef PPCMAGIC
+    case bfd_arch_powerpc:
+      *magicp = PPCMAGIC;
+      return true;
+      break;
 #endif
 #ifdef I386MAGIC
-  case bfd_arch_i386:
-    *magicp = I386MAGIC;
+    case bfd_arch_i386:
+      *magicp = I386MAGIC;
 #ifdef LYNXOS
-    /* Just overwrite the usual value if we're doing Lynx. */
-    *magicp = LYNXCOFFMAGIC;
+      /* Just overwrite the usual value if we're doing Lynx. */
+      *magicp = LYNXCOFFMAGIC;
 #endif
-    return true;
-    break;
+      return true;
+      break;
+#endif
+#ifdef I860MAGIC
+    case bfd_arch_i860:
+      *magicp = I860MAGIC;
+      return true;
+      break;
 #endif
 #ifdef MC68MAGIC
-  case bfd_arch_m68k:
+    case bfd_arch_m68k:
 #ifdef APOLLOM68KMAGIC
-    *magicp = APOLLO_COFF_VERSION_NUMBER;
+      *magicp = APOLLO_COFF_VERSION_NUMBER;
+#else
+      /* NAMES_HAVE_UNDERSCORE may be defined by coff-u68k.c.  */
+#ifdef NAMES_HAVE_UNDERSCORE
+      *magicp = MC68KBCSMAGIC;
 #else
-    *magicp = MC68MAGIC;
+      *magicp = MC68MAGIC;
+#endif
 #endif
 #ifdef LYNXOS
-    /* Just overwrite the usual value if we're doing Lynx. */
-    *magicp = LYNXCOFFMAGIC;
+      /* Just overwrite the usual value if we're doing Lynx. */
+      *magicp = LYNXCOFFMAGIC;
 #endif
-    return true;
-    break;
+      return true;
+      break;
 #endif
 
 #ifdef MC88MAGIC
@@ -1186,34 +1961,40 @@ DEFUN(coff_set_flags,(abfd, magicp, flagsp),
 #endif
 #ifdef H8300MAGIC
     case bfd_arch_h8300:
-    switch (bfd_get_mach (abfd)) 
-      {
-      case bfd_mach_h8300:
-       *magicp = H8300MAGIC;
-       return true;
-      case bfd_mach_h8300h:
-       *magicp = H8300HMAGIC;
-       return true;
-      }
+      switch (bfd_get_mach (abfd))
+       {
+       case bfd_mach_h8300:
+         *magicp = H8300MAGIC;
+         return true;
+       case bfd_mach_h8300h:
+         *magicp = H8300HMAGIC;
+         return true;
+       case bfd_mach_h8300s:
+         *magicp = H8300SMAGIC;
+         return true;
+       }
       break;
 #endif
 
-#ifdef SHMAGIC
-  case bfd_arch_sh:
-      *magicp = SHMAGIC;
+#ifdef SH_ARCH_MAGIC_BIG
+    case bfd_arch_sh:
+      if (bfd_big_endian (abfd))
+       *magicp = SH_ARCH_MAGIC_BIG;
+      else
+       *magicp = SH_ARCH_MAGIC_LITTLE;
       return true;
       break;
 #endif
 
 #ifdef SPARCMAGIC
-  case bfd_arch_sparc:
-    *magicp = SPARCMAGIC;
+    case bfd_arch_sparc:
+      *magicp = SPARCMAGIC;
 #ifdef LYNXOS
-    /* Just overwrite the usual value if we're doing Lynx. */
-    *magicp = LYNXCOFFMAGIC;
+      /* Just overwrite the usual value if we're doing Lynx. */
+      *magicp = LYNXCOFFMAGIC;
 #endif
-    return true;
-    break;
+      return true;
+      break;
 #endif
 
 #ifdef H8500MAGIC
@@ -1224,51 +2005,57 @@ DEFUN(coff_set_flags,(abfd, magicp, flagsp),
 #endif
 #ifdef A29K_MAGIC_BIG
     case bfd_arch_a29k:
-      if (abfd->xvec->byteorder_big_p)
-       *magicp = A29K_MAGIC_BIG;
+      if (bfd_big_endian (abfd))
+       *magicp = A29K_MAGIC_BIG;
       else
-       *magicp = A29K_MAGIC_LITTLE;
+       *magicp = A29K_MAGIC_LITTLE;
       return true;
       break;
 #endif
 
 #ifdef WE32KMAGIC
-  case bfd_arch_we32k:
-    *magicp = WE32KMAGIC;
-    return true;
-    break;
+    case bfd_arch_we32k:
+      *magicp = WE32KMAGIC;
+      return true;
+      break;
 #endif
 
 #ifdef U802TOCMAGIC
-  case bfd_arch_rs6000:
-    *magicp = U802TOCMAGIC;
-    return true;
-    break;
+    case bfd_arch_rs6000:
+#ifndef PPCMAGIC
+    case bfd_arch_powerpc:
+#endif
+      *magicp = U802TOCMAGIC;
+      return true;
+      break;
 #endif
 
-  default:                     /* Unknown architecture */
-    /* return false;  -- fall through to "return false" below, to avoid
+    default:                   /* Unknown architecture */
+      /* return false;  -- fall through to "return false" below, to avoid
        "statement never reached" errors on the one below. */
-    break;
-  }
+      break;
+    }
 
   return false;
 }
 
 
-static          boolean
-DEFUN(coff_set_arch_mach,(abfd, arch, machine),
-      bfd            *abfd AND
-      enum bfd_architecture arch AND
-      unsigned long   machine)
+static boolean
+coff_set_arch_mach (abfd, arch, machine)
+     bfd * abfd;
+     enum bfd_architecture arch;
+     unsigned long machine;
 {
-  unsigned        dummy1;
-  unsigned     short dummy2;
-  bfd_default_set_arch_mach(abfd, arch, machine);
+  unsigned dummy1;
+  unsigned short dummy2;
+
+  if (! bfd_default_set_arch_mach (abfd, arch, machine))
+    return false;
 
   if (arch != bfd_arch_unknown &&
-      coff_set_flags(abfd, &dummy1, &dummy2) != true)
+      coff_set_flags (abfd, &dummy1, &dummy2) != true)
     return false;              /* We can't represent this type */
+
   return true;                 /* We're easy ... */
 }
 
@@ -1276,64 +2063,185 @@ DEFUN(coff_set_arch_mach,(abfd, arch, machine),
 /* Calculate the file position for each section. */
 
 static void
-DEFUN(coff_compute_section_file_positions,(abfd),
-      bfd            *abfd)
+coff_compute_section_file_positions (abfd)
+     bfd * abfd;
 {
-  asection       *current;
-  asection     *previous = (asection *)NULL;
-  file_ptr        sofar = FILHSZ;
+  asection *current;
+  asection *previous = (asection *) NULL;
+  file_ptr sofar = FILHSZ;
+
 #ifndef I960
-  file_ptr     old_sofar;
+  file_ptr old_sofar;
 #endif
-  if (bfd_get_start_address(abfd)) 
-  {
-    /*  A start address may have been added to the original file. In this
-       case it will need an optional header to record it.  */
-    abfd->flags |= EXEC_P;
-  }
+  unsigned int count;
+
+#ifdef RS6000COFF_C
+  /* On XCOFF, if we have symbols, set up the .debug section.  */
+  if (bfd_get_symcount (abfd) > 0)
+    {
+      bfd_size_type sz;
+      bfd_size_type i, symcount;
+      asymbol **symp;
+
+      sz = 0;
+      symcount = bfd_get_symcount (abfd);
+      for (symp = abfd->outsymbols, i = 0; i < symcount; symp++, i++)
+       {
+         coff_symbol_type *cf;
+
+         cf = coff_symbol_from (abfd, *symp);
+         if (cf != NULL
+             && cf->native != NULL
+             && SYMNAME_IN_DEBUG (&cf->native->u.syment))
+           {
+             size_t len;
+
+             len = strlen (bfd_asymbol_name (*symp));
+             if (len > SYMNMLEN)
+               sz += len + 3;
+           }
+       }
+      if (sz > 0)
+       {
+         asection *dsec;
+
+         dsec = bfd_make_section_old_way (abfd, ".debug");
+         if (dsec == NULL)
+           abort ();
+         dsec->_raw_size = sz;
+         dsec->flags |= SEC_HAS_CONTENTS;
+       }
+    }
+#endif
+
+#ifdef COFF_IMAGE_WITH_PE
+  int page_size;
+  if (coff_data (abfd)->link_info) 
+    {
+      page_size = pe_data (abfd)->pe_opthdr.FileAlignment;
+    }
+  else
+    page_size = PE_DEF_FILE_ALIGNMENT;
+#else
+#ifdef COFF_PAGE_SIZE
+  int page_size = COFF_PAGE_SIZE;
+#endif
+#endif
+
+  if (bfd_get_start_address (abfd))
+    {
+      /*  A start address may have been added to the original file. In this
+         case it will need an optional header to record it.  */
+      abfd->flags |= EXEC_P;
+    }
 
   if (abfd->flags & EXEC_P)
-   sofar += AOUTSZ;
+    sofar += AOUTSZ;
+#ifdef RS6000COFF_C
+  else if (xcoff_data (abfd)->full_aouthdr)
+    sofar += AOUTSZ;
+  else
+    sofar += SMALL_AOUTSZ;
+#endif
 
   sofar += abfd->section_count * SCNHSZ;
-  for (current = abfd->sections;
-       current != (asection *)NULL;
-       current = current->next) {
+
+#ifdef RS6000COFF_C
+  /* XCOFF handles overflows in the reloc and line number count fields
+     by allocating a new section header to hold the correct counts.  */
+  for (current = abfd->sections; current != NULL; current = current->next)
+    if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
+      sofar += SCNHSZ;
+#endif
+
+  for (current = abfd->sections, count = 1;
+       current != (asection *) NULL;
+       current = current->next, ++count)
+    {
+      current->target_index = count;
 
       /* Only deal with sections which have contents */
       if (!(current->flags & SEC_HAS_CONTENTS))
-       continue;
+       continue;
 
       /* Align the sections in the file to the same boundary on
         which they are aligned in virtual memory.  I960 doesn't
         do this (FIXME) so we can stay in sync with Intel.  960
         doesn't yet page from files... */
 #ifndef I960
-    {
-      /* make sure this section is aligned on the right boundary - by
-        padding the previous section up if necessary */
+      if ((abfd->flags & EXEC_P) != 0)
+       {
+         /* make sure this section is aligned on the right boundary - by
+            padding the previous section up if necessary */
 
-      old_sofar= sofar;
-      sofar = BFD_ALIGN(sofar, 1 << current->alignment_power);
-      if (previous != (asection *)NULL) {
-         previous->_raw_size += sofar - old_sofar;
+         old_sofar = sofar;
+         sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+         if (previous != (asection *) NULL)
+           {
+             previous->_raw_size += sofar - old_sofar;
+           }
        }
-    }
 
 #endif
-      /* FIXME, in demand paged files, the low order bits of the file
-        offset must match the low order bits of the virtual address.
-        "Low order" is apparently implementation defined.  Add code
-        here to round sofar up to match the virtual address.  */
 
+      /* In demand paged files the low order bits of the file offset
+        must match the low order bits of the virtual address.  */
+#ifdef COFF_PAGE_SIZE
+      if ((abfd->flags & D_PAGED) != 0
+         && (current->flags & SEC_ALLOC) != 0)
+       sofar += (current->vma - sofar) % page_size;
+#endif
       current->filepos = sofar;
 
+#ifdef COFF_IMAGE_WITH_PE
+      /* With PE we have to pad each section to be a multiple of its
+        page size too, and remember both sizes.  */
+
+      if (coff_section_data (abfd, current) == NULL)
+       {
+         current->used_by_bfd =
+           (PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata));
+         if (current->used_by_bfd == NULL)
+           {
+             /* FIXME: Return error.  */
+             abort ();
+           }
+       }
+      if (pei_section_data (abfd, current) == NULL)
+       {
+         coff_section_data (abfd, current)->tdata =
+           (PTR) bfd_zalloc (abfd, sizeof (struct pei_section_tdata));
+         if (coff_section_data (abfd, current)->tdata == NULL)
+           {
+             /* FIXME: Return error.  */
+             abort ();
+           }
+       }
+      if (pei_section_data (abfd, current)->virt_size == 0)
+       pei_section_data (abfd, current)->virt_size = current->_raw_size;
+
+      current->_raw_size = (current->_raw_size + page_size -1) & -page_size;
+#endif
+
       sofar += current->_raw_size;
+
 #ifndef I960
       /* make sure that this section is of the right size too */
-      old_sofar =  sofar;
-      sofar = BFD_ALIGN(sofar, 1 << current->alignment_power);
-      current->_raw_size += sofar - old_sofar ;
+      if ((abfd->flags & EXEC_P) == 0)
+       {
+         bfd_size_type old_size;
+
+         old_size = current->_raw_size;
+         current->_raw_size = BFD_ALIGN (current->_raw_size,
+                                         1 << current->alignment_power);
+         sofar += current->_raw_size - old_size;
+       }
+      else
+       {
+         old_sofar = sofar;
+         sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+         current->_raw_size += sofar - old_sofar;
+       }
 #endif
 
 #ifdef _LIB
@@ -1346,13 +2254,22 @@ DEFUN(coff_compute_section_file_positions,(abfd),
 
       previous = current;
     }
-  obj_relocbase(abfd) = sofar;
+
+  obj_relocbase (abfd) = sofar;
+  abfd->output_has_begun = true;
+
 }
 
+#if 0
+
+/* This can never work, because it is called too late--after the
+   section positions have been set.  I can't figure out what it is
+   for, so I am going to disable it--Ian Taylor 20 March 1996.  */
+
 /* If .file, .text, .data, .bss symbols are missing, add them.  */
 /* @@ Should we only be adding missing symbols, or overriding the aux
    values for existing section symbols?  */
-static void
+static boolean
 coff_add_missing_symbols (abfd)
      bfd *abfd;
 {
@@ -1366,38 +2283,40 @@ coff_add_missing_symbols (abfd)
     {
       coff_symbol_type *csym = coff_symbol_from (abfd, sympp[i]);
       CONST char *name;
-      if (csym) 
-      {
-       /* only do this if there is a coff representation of the input
-          symbol */
-       if (csym->native && csym->native->u.syment.n_sclass == C_FILE)
+      if (csym)
        {
-         need_file = 0;
-         continue;
-       }
-       name = csym->symbol.name;
-       if (!name)
-        continue;
-       if (!strcmp (name, _TEXT))
-        need_text = 0;
+         /* only do this if there is a coff representation of the input
+          symbol */
+         if (csym->native && csym->native->u.syment.n_sclass == C_FILE)
+           {
+             need_file = 0;
+             continue;
+           }
+         name = csym->symbol.name;
+         if (!name)
+           continue;
+         if (!strcmp (name, _TEXT))
+           need_text = 0;
 #ifdef APOLLO_M68
-       else if (!strcmp(name, ".wtext"))
-         need_text = 0;
+         else if (!strcmp (name, ".wtext"))
+           need_text = 0;
 #endif
-       else if (!strcmp (name, _DATA))
-        need_data = 0;
-       else if (!strcmp (name, _BSS))
-        need_bss = 0;
-      }
+         else if (!strcmp (name, _DATA))
+           need_data = 0;
+         else if (!strcmp (name, _BSS))
+           need_bss = 0;
+       }
     }
   /* Now i == bfd_get_symcount (abfd).  */
   /* @@ For now, don't deal with .file symbol.  */
   need_file = 0;
 
   if (!need_text && !need_data && !need_bss && !need_file)
-    return;
+    return true;
   nsyms += need_text + need_data + need_bss + need_file;
-  sympp2 = (asymbol**) bfd_alloc_by_size_t (abfd, nsyms * sizeof (asymbol *));
+  sympp2 = (asymbol **) bfd_alloc_by_size_t (abfd, nsyms * sizeof (asymbol *));
+  if (!sympp2)
+    return false;
   memcpy (sympp2, sympp, i * sizeof (asymbol *));
   if (need_file)
     {
@@ -1412,394 +2331,756 @@ coff_add_missing_symbols (abfd)
     sympp2[i++] = coff_section_symbol (abfd, _BSS);
   BFD_ASSERT (i == nsyms);
   bfd_set_symtab (abfd, sympp2, nsyms);
+  return true;
 }
 
+#endif /* 0 */
+
 /* SUPPRESS 558 */
 /* SUPPRESS 529 */
-static          boolean
-DEFUN(coff_write_object_contents,(abfd),
-      bfd            *abfd)
+static boolean
+coff_write_object_contents (abfd)
+     bfd * abfd;
 {
-  asection       *current;
-  unsigned int count;
-  
-  boolean         hasrelocs = false;
-  boolean         haslinno = false;
-  file_ptr        reloc_base;
-  file_ptr        lineno_base;
-  file_ptr        sym_base;
-  file_ptr        scn_base;
-  file_ptr        data_base;
-  unsigned long   reloc_size = 0;
-  unsigned long   lnno_size = 0;
-  asection       *text_sec = NULL;
-  asection       *data_sec = NULL;
-  asection       *bss_sec = NULL;
-
+  asection *current;
+  boolean hasrelocs = false;
+  boolean haslinno = false;
+  file_ptr scn_base;
+  file_ptr reloc_base;
+  file_ptr lineno_base;
+  file_ptr sym_base;
+  unsigned long reloc_size = 0;
+  unsigned long lnno_size = 0;
+  boolean long_section_names;
+  asection *text_sec = NULL;
+  asection *data_sec = NULL;
+  asection *bss_sec = NULL;
   struct internal_filehdr internal_f;
   struct internal_aouthdr internal_a;
+#ifdef COFF_LONG_SECTION_NAMES
+  size_t string_size = STRING_SIZE_SIZE;
+#endif
 
-
-  bfd_error = system_call_error;
-  /* Number the output sections, starting from one on the first section
-     with a name which doesn't start with a *.
-     @@ The code doesn't make this check.  Is it supposed to be done,
-     or isn't it??  */
-  count = 1;
-  for (current = abfd->sections; current != (asection *)NULL; 
-       current = current->next) 
-  {
-      current->target_index = count;
-      count++;
-  }
-
-  if(abfd->output_has_begun == false) {
-      coff_compute_section_file_positions(abfd);
-    }
-
-  if (abfd->sections != (asection *)NULL) {
-      scn_base = abfd->sections->filepos;
-    }
-  else {
-      scn_base = 0;
-    }
-  if (bfd_seek(abfd, scn_base, SEEK_SET) != 0)
-   return false;
-  reloc_base = obj_relocbase(abfd);
+  bfd_set_error (bfd_error_system_call);
 
   /* Make a pass through the symbol table to count line number entries and
      put them into the correct asections */
 
-  lnno_size =  coff_count_linenumbers(abfd) * LINESZ;
-  data_base = scn_base;
+  lnno_size = coff_count_linenumbers (abfd) * LINESZ;
+
+  if (abfd->output_has_begun == false)
+    coff_compute_section_file_positions (abfd);
+
+  reloc_base = obj_relocbase (abfd);
 
   /* Work out the size of the reloc and linno areas */
 
   for (current = abfd->sections; current != NULL; current =
-       current->next) 
-  {
-    /* We give section headers to +ve indexes */
-    if (current->target_index > 0) 
-    {
-       
-      reloc_size += current->reloc_count * RELSZ;
-      data_base += SCNHSZ;
-    }
-      
-  }
+       current->next)
+    reloc_size += current->reloc_count * RELSZ;
 
   lineno_base = reloc_base + reloc_size;
   sym_base = lineno_base + lnno_size;
 
   /* Indicate in each section->line_filepos its actual file address */
   for (current = abfd->sections; current != NULL; current =
-       current->next) 
-  {
-    if (current->target_index > 0) 
+       current->next)
     {
-       
-      if (current->lineno_count) {
+      if (current->lineno_count)
+       {
          current->line_filepos = lineno_base;
          current->moving_line_filepos = lineno_base;
          lineno_base += current->lineno_count * LINESZ;
        }
-      else {
+      else
+       {
          current->line_filepos = 0;
        }
-      if (current->reloc_count) {
+      if (current->reloc_count)
+       {
          current->rel_filepos = reloc_base;
          reloc_base += current->reloc_count * RELSZ;
        }
-      else {
+      else
+       {
          current->rel_filepos = 0;
        }
     }
-  }    
-      
-
 
   /* Write section headers to the file.  */
   internal_f.f_nscns = 0;
-  bfd_seek(abfd,
-          (file_ptr) ((abfd->flags & EXEC_P) ?
-                      (FILHSZ + AOUTSZ) : FILHSZ),
-          SEEK_SET);
 
-{
-#if 0
-  unsigned int    pad = abfd->flags & D_PAGED ? data_base : 0;
+  if ((abfd->flags & EXEC_P) != 0)
+    scn_base = FILHSZ + AOUTSZ;
+  else
+    {
+      scn_base = FILHSZ;
+#ifdef RS6000COFF_C
+      if (xcoff_data (abfd)->full_aouthdr)
+       scn_base += AOUTSZ;
+      else
+       scn_base += SMALL_AOUTSZ;
 #endif
-  unsigned int    pad = 0;
+    }
+
+  if (bfd_seek (abfd, scn_base, SEEK_SET) != 0)
+    return false;
 
+  long_section_names = false;
   for (current = abfd->sections;
        current != NULL;
-       current = current->next) {
+       current = current->next)
+    {
       struct internal_scnhdr section;
-      if (current->target_index > 0) 
+
+#ifdef COFF_WITH_PE
+      /* If we've got a .reloc section, remember. */
+
+#ifdef COFF_IMAGE_WITH_PE
+      if (strcmp (current->name, ".reloc") == 0)
+       {
+         pe_data (abfd)->has_reloc_section = 1;
+       }
+#endif
+
+#endif
+      internal_f.f_nscns++;
+
+      strncpy (section.s_name, current->name, SCNNMLEN);
+
+#ifdef COFF_LONG_SECTION_NAMES
+      /* Handle long section names as in PE.  This must be compatible
+         with the code in coff_write_symbols.  */
       {
-       internal_f.f_nscns ++;
-       strncpy(&(section.s_name[0]), current->name, 8);
+       size_t len;
+
+       len = strlen (current->name);
+       if (len > SCNNMLEN)
+         {
+           memset (section.s_name, 0, SCNNMLEN);
+           sprintf (section.s_name, "/%lu", (unsigned long) string_size);
+           string_size += len + 1;
+           long_section_names = true;
+         }
+      }
+#endif
+
 #ifdef _LIB
-       /* Always set s_vaddr of .lib to 0.  This is right for SVR3.2
-          Ian Taylor <ian@cygnus.com>.  */
-       if (strcmp (current->name, _LIB) == 0)
-         section.s_vaddr = 0;
-       else
+      /* Always set s_vaddr of .lib to 0.  This is right for SVR3.2
+        Ian Taylor <ian@cygnus.com>.  */
+      if (strcmp (current->name, _LIB) == 0)
+       section.s_vaddr = 0;
+      else
 #endif
-       section.s_vaddr = current->lma + pad;
-       section.s_paddr = current->lma + pad;
-       section.s_size = current->_raw_size - pad;
-       /*
-         If this section has no size or is unloadable then the scnptr
-         will be 0 too
-         */
-       if (current->_raw_size - pad == 0 ||
-           (current->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0) {
-           section.s_scnptr = 0;
-         }
-       else {
-           section.s_scnptr = current->filepos;
-         }
-       section.s_relptr = current->rel_filepos;
-       section.s_lnnoptr = current->line_filepos;
-       section.s_nreloc = current->reloc_count;
-       section.s_nlnno = current->lineno_count;
-       if (current->reloc_count != 0)
-        hasrelocs = true;
-       if (current->lineno_count != 0)
-        haslinno = true;
-
-       section.s_flags = sec_to_styp_flags(current->name,current->flags);
-
-       if (!strcmp(current->name, _TEXT)) {
-           text_sec = current;
-         } else if (!strcmp(current->name, _DATA)) {
-             data_sec = current;
-#ifdef TWO_DATA_SECS
-           } else if (!strcmp(current->name, ".data2")) {
-             data_sec = current;
-#endif /* TWO_DATA_SECS */
-           } else if (!strcmp(current->name, _BSS)) {
-               bss_sec = current;
-             }
+      section.s_vaddr = current->vma;
+      section.s_paddr = current->lma;
+      section.s_size =  current->_raw_size;
+
+#ifdef COFF_WITH_PE
+      section.s_paddr = 0;
+#endif
+#ifdef COFF_IMAGE_WITH_PE
+      /* Reminder: s_paddr holds the virtual size of the section.  */
+      if (coff_section_data (abfd, current) != NULL
+         && pei_section_data (abfd, current) != NULL)
+       section.s_paddr = pei_section_data (abfd, current)->virt_size;
+      else
+       section.s_paddr = 0;
+#endif
+
+      /*
+        If this section has no size or is unloadable then the scnptr
+        will be 0 too
+        */
+      if (current->_raw_size == 0 ||
+         (current->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
+       {
+         section.s_scnptr = 0;
+       }
+      else
+       {
+         section.s_scnptr = current->filepos;
+       }
+      section.s_relptr = current->rel_filepos;
+      section.s_lnnoptr = current->line_filepos;
+      section.s_nreloc = current->reloc_count;
+      section.s_nlnno = current->lineno_count;
+      if (current->reloc_count != 0)
+       hasrelocs = true;
+      if (current->lineno_count != 0)
+       haslinno = true;
+
+#ifdef RS6000COFF_C
+      /* Indicate the use of an XCOFF overflow section header.  */
+      if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
+       {
+         section.s_nreloc = 0xffff;
+         section.s_nlnno = 0xffff;
+       }
+#endif
+
+      section.s_flags = sec_to_styp_flags (current->name, current->flags);
+
+      if (!strcmp (current->name, _TEXT))
+       {
+         text_sec = current;
+       }
+      else if (!strcmp (current->name, _DATA))
+       {
+         data_sec = current;
+       }
+      else if (!strcmp (current->name, _BSS))
+       {
+         bss_sec = current;
+       }
 
 #ifdef I960
-       section.s_align = (current->alignment_power
-                          ? 1 << current->alignment_power
-                          : 0);
+      section.s_align = (current->alignment_power
+                        ? 1 << current->alignment_power
+                        : 0);
 
 #endif
-      {
-       SCNHDR          buff;
 
-       coff_swap_scnhdr_out(abfd, &section, &buff);
-       bfd_write((PTR) (&buff), 1, SCNHSZ, abfd);
+#ifdef COFF_IMAGE_WITH_PE
+      /* suppress output of the sections if they are null.  ld includes
+        the bss and data sections even if there is no size assigned
+        to them.  NT loader doesn't like it if these section headers are
+        included if the sections themselves are not needed */
+      if (section.s_size == 0)
+       internal_f.f_nscns--;
+      else
+#endif
+       {
+         SCNHDR buff;
+         if (coff_swap_scnhdr_out (abfd, &section, &buff) == 0
+             || bfd_write ((PTR) (&buff), 1, SCNHSZ, abfd) != SCNHSZ)
+           return false;
+       }
+
+#ifdef COFF_WITH_PE
+      /* PE stores COMDAT section information in the symbol table.  If
+         this section is supposed to have some COMDAT info, track down
+         the symbol in the symbol table and modify it.  */
+      if ((current->flags & SEC_LINK_ONCE) != 0)
+       {
+         unsigned int i, count;
+         asymbol **psym;
+         coff_symbol_type *csym;
 
-      }
+         count = bfd_get_symcount (abfd);
+         for (i = 0, psym = abfd->outsymbols; i < count; i++, psym++)
+           {
+             /* Here *PSYM is the section symbol for CURRENT.  */
+
+             if (strcmp ((*psym)->name, current->name) == 0)
+               {
+                 csym = coff_symbol_from (abfd, *psym);
+                 if (csym == NULL
+                     || csym->native == NULL
+                     || csym->native->u.syment.n_numaux < 1
+                     || csym->native->u.syment.n_sclass != C_STAT
+                     || csym->native->u.syment.n_type != T_NULL)
+                   continue;
+                 break;
+               }
+           }
 
-       pad = 0;
-      }
-    }  
-}
+         /* Did we find it?
+            Note that we might not if we're converting the file from
+            some other object file format.  */
+         if (i < count)
+           {
+             combined_entry_type *aux;
+
+             /* We don't touch the x_checksum field.  The
+                x_associated field is not currently supported.  */
+
+             aux = csym->native + 1;
+             switch (current->flags & SEC_LINK_DUPLICATES)
+               {
+               case SEC_LINK_DUPLICATES_DISCARD:
+                 aux->u.auxent.x_scn.x_comdat = IMAGE_COMDAT_SELECT_ANY;
+                 break;
+
+               case SEC_LINK_DUPLICATES_ONE_ONLY:
+                 aux->u.auxent.x_scn.x_comdat =
+                   IMAGE_COMDAT_SELECT_NODUPLICATES;
+                 break;
+
+               case SEC_LINK_DUPLICATES_SAME_SIZE:
+                 aux->u.auxent.x_scn.x_comdat =
+                   IMAGE_COMDAT_SELECT_SAME_SIZE;
+                 break;
+
+               case SEC_LINK_DUPLICATES_SAME_CONTENTS:
+                 aux->u.auxent.x_scn.x_comdat =
+                   IMAGE_COMDAT_SELECT_EXACT_MATCH;
+                 break;
+               }
+           }
+       }
+#endif /* COFF_WITH_PE */
+    }
 
+#ifdef RS6000COFF_C
+  /* XCOFF handles overflows in the reloc and line number count fields
+     by creating a new section header to hold the correct values.  */
+  for (current = abfd->sections; current != NULL; current = current->next)
+    {
+      if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
+       {
+         struct internal_scnhdr scnhdr;
+         SCNHDR buff;
+
+         internal_f.f_nscns++;
+         strncpy (&(scnhdr.s_name[0]), current->name, 8);
+         scnhdr.s_paddr = current->reloc_count;
+         scnhdr.s_vaddr = current->lineno_count;
+         scnhdr.s_size = 0;
+         scnhdr.s_scnptr = 0;
+         scnhdr.s_relptr = current->rel_filepos;
+         scnhdr.s_lnnoptr = current->line_filepos;
+         scnhdr.s_nreloc = current->target_index;
+         scnhdr.s_nlnno = current->target_index;
+         scnhdr.s_flags = STYP_OVRFLO;
+         if (coff_swap_scnhdr_out (abfd, &scnhdr, &buff) == 0
+             || bfd_write ((PTR) &buff, 1, SCNHSZ, abfd) != SCNHSZ)
+           return false;
+       }
+    }
+#endif
 
   /* OK, now set up the filehdr... */
 
   /* Don't include the internal abs section in the section count */
 
   /*
-    We will NOT put a fucking timestamp in the header here. Every time you
-    put it back, I will come in and take it out again.  I'm sorry.  This
-    field does not belong here.  We fill it with a 0 so it compares the
-    same but is not a reasonable time. -- gnu@cygnus.com
-    */
+     We will NOT put a fucking timestamp in the header here. Every time you
+     put it back, I will come in and take it out again.  I'm sorry.  This
+     field does not belong here.  We fill it with a 0 so it compares the
+     same but is not a reasonable time. -- gnu@cygnus.com
+     */
   internal_f.f_timdat = 0;
 
-  if (bfd_get_symcount(abfd) != 0)
-   internal_f.f_symptr = sym_base;
-  else
-   internal_f.f_symptr = 0;
-
   internal_f.f_flags = 0;
 
   if (abfd->flags & EXEC_P)
-   internal_f.f_opthdr = AOUTSZ;
+    internal_f.f_opthdr = AOUTSZ;
   else
-   internal_f.f_opthdr = 0;
+    {
+      internal_f.f_opthdr = 0;
+#ifdef RS6000COFF_C
+      if (xcoff_data (abfd)->full_aouthdr)
+       internal_f.f_opthdr = AOUTSZ;
+      else
+       internal_f.f_opthdr = SMALL_AOUTSZ;
+#endif
+    }
 
   if (!hasrelocs)
-   internal_f.f_flags |= F_RELFLG;
+    internal_f.f_flags |= F_RELFLG;
   if (!haslinno)
-   internal_f.f_flags |= F_LNNO;
-  if (0 == bfd_get_symcount(abfd))
-   internal_f.f_flags |= F_LSYMS;
+    internal_f.f_flags |= F_LNNO;
   if (abfd->flags & EXEC_P)
-   internal_f.f_flags |= F_EXEC;
+    internal_f.f_flags |= F_EXEC;
 
-  if (!abfd->xvec->byteorder_big_p)
-   internal_f.f_flags |= F_AR32WR;
-  else 
-  internal_f.f_flags |= F_AR32W;
+  /* FIXME: this is wrong for PPC_PE! */
+  if (bfd_little_endian (abfd))
+    internal_f.f_flags |= F_AR32WR;
+  else
+    internal_f.f_flags |= F_AR32W;
 
   /*
-    FIXME, should do something about the other byte orders and
-    architectures.
-    */
+     FIXME, should do something about the other byte orders and
+     architectures.
+     */
+
+#ifdef RS6000COFF_C
+  if ((abfd->flags & DYNAMIC) != 0)
+    internal_f.f_flags |= F_SHROBJ;
+  if (bfd_get_section_by_name (abfd, _LOADER) != NULL)
+    internal_f.f_flags |= F_DYNLOAD;
+#endif
 
   memset (&internal_a, 0, sizeof internal_a);
 
   /* Set up architecture-dependent stuff */
 
-{ unsigned int   magic = 0;
-  unsigned short    flags = 0;
-  coff_set_flags(abfd, &magic, &flags);
-  internal_f.f_magic = magic;
-  internal_f.f_flags |= flags;
-  /* ...and the "opt"hdr... */
+  {
+    unsigned int magic = 0;
+    unsigned short flags = 0;
+    coff_set_flags (abfd, &magic, &flags);
+    internal_f.f_magic = magic;
+    internal_f.f_flags |= flags;
+    /* ...and the "opt"hdr... */
 
 #ifdef A29K
-# ifdef ULTRA3                 /* NYU's machine */
-  /* FIXME: This is a bogus check.  I really want to see if there
-   * is a .shbss or a .shdata section, if so then set the magic
-   * number to indicate a shared data executable.
-   */
-  if (internal_f.f_nscns >= 7)
-   internal_a.magic = SHMAGIC;         /* Shared magic */
-  else
-# endif                                /* ULTRA3 */
-   internal_a.magic = NMAGIC;  /* Assume separate i/d */
+#ifdef ULTRA3                  /* NYU's machine */
+    /* FIXME: This is a bogus check.  I really want to see if there
+     * is a .shbss or a .shdata section, if so then set the magic
+     * number to indicate a shared data executable.
+     */
+    if (internal_f.f_nscns >= 7)
+      internal_a.magic = SHMAGIC; /* Shared magic */
+    else
+#endif /* ULTRA3 */
+      internal_a.magic = NMAGIC; /* Assume separate i/d */
+#define __A_MAGIC_SET__
+#endif /* A29K */
+#ifdef TIC80
+    internal_a.magic = TIC80MAGIC;
 #define __A_MAGIC_SET__
-#endif                         /* A29K */
+#endif /* TIC80 */
+#ifdef I860
+    /* FIXME: What are the a.out magic numbers for the i860?  */
+    internal_a.magic = 0;
+#define __A_MAGIC_SET__
+#endif /* I860 */
 #ifdef I960
-  internal_a.magic = (magic == I960ROMAGIC ? NMAGIC : OMAGIC);
+    internal_a.magic = (magic == I960ROMAGIC ? NMAGIC : OMAGIC);
 #define __A_MAGIC_SET__
-#endif                         /* I960 */
+#endif /* I960 */
 #if M88
 #define __A_MAGIC_SET__
-  internal_a.magic = PAGEMAGICBCS;
-#endif                         /* M88 */
+    internal_a.magic = PAGEMAGICBCS;
+#endif /* M88 */
 
 #if APOLLO_M68
 #define __A_MAGIC_SET__
-  internal_a.magic = APOLLO_COFF_VERSION_NUMBER;
+    internal_a.magic = APOLLO_COFF_VERSION_NUMBER;
 #endif
 
-#if M68 || WE32K
+#if defined(M68) || defined(WE32K) || defined(M68K)
 #define __A_MAGIC_SET__
-  /* Never was anything here for the 68k */
-#endif                         /* M68 || WE32K */
+#if defined(LYNXOS)
+    internal_a.magic = LYNXCOFFMAGIC;
+#else
+#if defined(TARG_AUX)
+    internal_a.magic = (abfd->flags & D_PAGED ? PAGEMAGICPEXECPAGED :
+                       abfd->flags & WP_TEXT ? PAGEMAGICPEXECSWAPPED :
+                       PAGEMAGICEXECSWAPPED);
+#else
+#if defined (PAGEMAGICPEXECPAGED)
+    internal_a.magic = PAGEMAGICPEXECPAGED;
+#endif
+#endif /* TARG_AUX */
+#endif /* LYNXOS */
+#endif /* M68 || WE32K || M68K */
 
-#if I386
-# define __A_MAGIC_SET__
-  internal_a.magic = ZMAGIC;
+#if defined(ARM)
+#define __A_MAGIC_SET__
+    internal_a.magic = ZMAGIC;
+#endif 
+#if defined(PPC_PE)
+#define __A_MAGIC_SET__
+    internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
+#endif
+#if defined(I386)
+#define __A_MAGIC_SET__
+#if defined(LYNXOS)
+    internal_a.magic = LYNXCOFFMAGIC;
+#else  /* LYNXOS */
+    internal_a.magic = ZMAGIC;
+#endif /* LYNXOS */
 #endif /* I386 */
 
+#if defined(SPARC)
+#define __A_MAGIC_SET__
+#if defined(LYNXOS)
+    internal_a.magic = LYNXCOFFMAGIC;
+#endif /* LYNXOS */
+#endif /* SPARC */
+
 #if RS6000COFF_C
 #define __A_MAGIC_SET__
-  internal_a.magic = (abfd->flags & D_PAGED)? RS6K_AOUTHDR_ZMAGIC:
-  (abfd->flags & WP_TEXT)? RS6K_AOUTHDR_NMAGIC:
-  RS6K_AOUTHDR_OMAGIC;
+    internal_a.magic = (abfd->flags & D_PAGED) ? RS6K_AOUTHDR_ZMAGIC :
+    (abfd->flags & WP_TEXT) ? RS6K_AOUTHDR_NMAGIC :
+    RS6K_AOUTHDR_OMAGIC;
 #endif
 
-#ifndef __A_MAGIC_SET__
-# include "Your aouthdr magic number is not being set!"
-#else
-# undef __A_MAGIC_SET__
-#endif
-}
-  /* Now should write relocs, strings, syms */
-  obj_sym_filepos(abfd) = sym_base;
-
-  if (bfd_get_symcount(abfd) != 0) {
-      coff_add_missing_symbols (abfd);
-      coff_renumber_symbols(abfd);
-      coff_mangle_symbols(abfd);
-      coff_write_symbols(abfd);
-      coff_write_linenumbers(abfd);
-      coff_write_relocs(abfd);
-    }
-  if (text_sec) {
-      internal_a.tsize = bfd_get_section_size_before_reloc(text_sec);
+#ifndef __A_MAGIC_SET__
+#include "Your aouthdr magic number is not being set!"
+#else
+#undef __A_MAGIC_SET__
+#endif
+  }
+
+  /* FIXME: Does anybody ever set this to another value?  */
+  internal_a.vstamp = 0;
+
+  /* Now should write relocs, strings, syms */
+  obj_sym_filepos (abfd) = sym_base;
+
+  if (bfd_get_symcount (abfd) != 0)
+    {
+      int firstundef;
+#if 0
+      if (!coff_add_missing_symbols (abfd))
+       return false;
+#endif
+      if (!coff_renumber_symbols (abfd, &firstundef))
+       return false;
+      coff_mangle_symbols (abfd);
+      if (! coff_write_symbols (abfd))
+       return false;
+      if (! coff_write_linenumbers (abfd))
+       return false;
+      if (! coff_write_relocs (abfd, firstundef))
+       return false;
+    }
+#ifdef COFF_IMAGE_WITH_PE
+#ifdef PPC_PE
+  else if ((abfd->flags & EXEC_P) != 0)
+    {
+      bfd_byte b;
+
+      /* PowerPC PE appears to require that all executable files be
+         rounded up to the page size.  */
+      b = 0;
+      if (bfd_seek (abfd,
+                   BFD_ALIGN (sym_base, COFF_PAGE_SIZE) - 1,
+                   SEEK_SET) != 0
+         || bfd_write (&b, 1, 1, abfd) != 1)
+       return false;
+    }
+#endif
+#endif
+
+  /* If bfd_get_symcount (abfd) != 0, then we are not using the COFF
+     backend linker, and obj_raw_syment_count is not valid until after
+     coff_write_symbols is called.  */
+  if (obj_raw_syment_count (abfd) != 0)
+    {
+      internal_f.f_symptr = sym_base;
+#ifdef RS6000COFF_C
+      /* AIX appears to require that F_RELFLG not be set if there are
+         local symbols but no relocations.  */
+      internal_f.f_flags &=~ F_RELFLG;
+#endif
+    }
+  else
+    {
+      if (long_section_names)
+       internal_f.f_symptr = sym_base;
+      else
+       internal_f.f_symptr = 0;
+      internal_f.f_flags |= F_LSYMS;
+    }
+
+  if (text_sec)
+    {
+      internal_a.tsize = bfd_get_section_size_before_reloc (text_sec);
       internal_a.text_start = internal_a.tsize ? text_sec->vma : 0;
     }
-  if (data_sec) {
-      internal_a.dsize = bfd_get_section_size_before_reloc(data_sec);
-      internal_a.data_start = internal_a.dsize ? data_sec->vma      : 0;
+  if (data_sec)
+    {
+      internal_a.dsize = bfd_get_section_size_before_reloc (data_sec);
+      internal_a.data_start = internal_a.dsize ? data_sec->vma : 0;
     }
-  if (bss_sec) {
-      internal_a.bsize = bfd_get_section_size_before_reloc(bss_sec);
+  if (bss_sec)
+    {
+      internal_a.bsize = bfd_get_section_size_before_reloc (bss_sec);
+      if (internal_a.bsize && bss_sec->vma < internal_a.data_start)
+       internal_a.data_start = bss_sec->vma;
     }
 
-  internal_a.entry = bfd_get_start_address(abfd);
-  internal_f.f_nsyms =  bfd_get_symcount(abfd);
+  internal_a.entry = bfd_get_start_address (abfd);
+  internal_f.f_nsyms = obj_raw_syment_count (abfd);
+
+#ifdef RS6000COFF_C
+  if (xcoff_data (abfd)->full_aouthdr)
+    {
+      bfd_vma toc;
+      asection *loader_sec;
+
+      internal_a.vstamp = 1;
+
+      internal_a.o_snentry = xcoff_data (abfd)->snentry;
+      if (internal_a.o_snentry == 0)
+       internal_a.entry = (bfd_vma) -1;
+
+      if (text_sec != NULL)
+       {
+         internal_a.o_sntext = text_sec->target_index;
+         internal_a.o_algntext = bfd_get_section_alignment (abfd, text_sec);
+       }
+      else
+       {
+         internal_a.o_sntext = 0;
+         internal_a.o_algntext = 0;
+       }
+      if (data_sec != NULL)
+       {
+         internal_a.o_sndata = data_sec->target_index;
+         internal_a.o_algndata = bfd_get_section_alignment (abfd, data_sec);
+       }
+      else
+       {
+         internal_a.o_sndata = 0;
+         internal_a.o_algndata = 0;
+       }
+      loader_sec = bfd_get_section_by_name (abfd, ".loader");
+      if (loader_sec != NULL)
+       internal_a.o_snloader = loader_sec->target_index;
+      else
+       internal_a.o_snloader = 0;
+      if (bss_sec != NULL)
+       internal_a.o_snbss = bss_sec->target_index;
+      else
+       internal_a.o_snbss = 0;
+
+      toc = xcoff_data (abfd)->toc;
+      internal_a.o_toc = toc;
+      internal_a.o_sntoc = xcoff_data (abfd)->sntoc;
+
+      internal_a.o_modtype = xcoff_data (abfd)->modtype;
+      if (xcoff_data (abfd)->cputype != -1)
+       internal_a.o_cputype = xcoff_data (abfd)->cputype;
+      else
+       {
+         switch (bfd_get_arch (abfd))
+           {
+           case bfd_arch_rs6000:
+             internal_a.o_cputype = 4;
+             break;
+           case bfd_arch_powerpc:
+             if (bfd_get_mach (abfd) == 0)
+               internal_a.o_cputype = 3;
+             else
+               internal_a.o_cputype = 1;
+             break;
+           default:
+             abort ();
+           }
+       }
+      internal_a.o_maxstack = xcoff_data (abfd)->maxstack;
+      internal_a.o_maxdata = xcoff_data (abfd)->maxdata;
+    }
+#endif
 
   /* now write them */
-  if (bfd_seek(abfd, (file_ptr) 0, SEEK_SET) != 0)
-   return false;
-{
-  FILHDR buff;
-  coff_swap_filehdr_out(abfd, (PTR)&internal_f, (PTR)&buff);
-  bfd_write((PTR) &buff, 1, FILHSZ, abfd);
-}
-  if (abfd->flags & EXEC_P) {
+  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
+    return false;
+  {
+    char buff[FILHSZ];
+    coff_swap_filehdr_out (abfd, (PTR) & internal_f, (PTR) buff);
+    if (bfd_write ((PTR) buff, 1, FILHSZ, abfd) != FILHSZ)
+      return false;
+  }
+  if (abfd->flags & EXEC_P)
+    {
+      /* Note that peicode.h fills in a PEAOUTHDR, not an AOUTHDR. 
+        include/coff/pe.h sets AOUTSZ == sizeof(PEAOUTHDR)) */
+      char buff[AOUTSZ];
+      coff_swap_aouthdr_out (abfd, (PTR) & internal_a, (PTR) buff);
+      if (bfd_write ((PTR) buff, 1, AOUTSZ, abfd) != AOUTSZ)
+       return false;
+    }
+#ifdef RS6000COFF_C
+  else
+    {
       AOUTHDR buff;
-      coff_swap_aouthdr_out(abfd, (PTR)&internal_a, (PTR)&buff);
-      bfd_write((PTR) &buff, 1, AOUTSZ, abfd);
+      size_t size;
+
+      /* XCOFF seems to always write at least a small a.out header.  */
+      coff_swap_aouthdr_out (abfd, (PTR) &internal_a, (PTR) &buff);
+      if (xcoff_data (abfd)->full_aouthdr)
+       size = AOUTSZ;
+      else
+       size = SMALL_AOUTSZ;
+      if (bfd_write ((PTR) &buff, 1, size, abfd) != size)
+       return false;
     }
+#endif
+
   return true;
 }
 
-static          boolean
-DEFUN(coff_set_section_contents,(abfd, section, location, offset, count),
-      bfd            *abfd AND
-      sec_ptr         section AND
-      PTR             location AND
-      file_ptr        offset AND
-      bfd_size_type   count)
+static boolean
+coff_set_section_contents (abfd, section, location, offset, count)
+     bfd * abfd;
+     sec_ptr section;
+     PTR location;
+     file_ptr offset;
+     bfd_size_type count;
 {
-    if (abfd->output_has_begun == false)       /* set by bfd.c handler */
-       coff_compute_section_file_positions(abfd);
+  if (abfd->output_has_begun == false) /* set by bfd.c handler */
+    coff_compute_section_file_positions (abfd);
+
+#if defined(_LIB) && !defined(TARG_AUX)
+
+   /* The physical address field of a .lib section is used to hold the
+      number of shared libraries in the section.  This code counts the
+      number of sections being written, and increments the lma field
+      with the number.
+
+      I have found no documentation on the contents of this section.
+      Experimentation indicates that the section contains zero or more
+      records, each of which has the following structure:
+
+      - a (four byte) word holding the length of this record, in words,
+      - a word that always seems to be set to "2",
+      - the path to a shared library, null-terminated and then padded
+        to a whole word boundary.
+
+      bfd_assert calls have been added to alert if an attempt is made
+      to write a section which doesn't follow these assumptions.  The
+      code has been tested on ISC 4.1 by me, and on SCO by Robert Lipe
+      <robertl@arnet.com> (Thanks!).
+  
+      Gvran Uddeborg <gvran@uddeborg.pp.se> */
 
-#ifdef _LIB
-    /* If this is a .lib section, bump the vma address so that it
-       winds up being the number of .lib sections output.  This is
-       right for SVR3.2.  Shared libraries should probably get more
-       generic support.  Ian Taylor <ian@cygnus.com>.  */
     if (strcmp (section->name, _LIB) == 0)
-      ++section->lma;
+      {
+       bfd_byte *rec, *recend;
+
+       rec = (bfd_byte *) location;
+       recend = rec + count;
+       while (rec < recend)
+         {
+           ++section->lma;
+           rec += bfd_get_32 (abfd, rec) * 4;
+         }
+
+       BFD_ASSERT (rec == recend);
+      }
+
 #endif
 
-    /* Don't write out bss sections - one way to do this is to 
-       see if the filepos has not been set. */ 
-    if (section->filepos == 0)
-      return true;
+  /* Don't write out bss sections - one way to do this is to
+       see if the filepos has not been set. */
+  if (section->filepos == 0)
+    return true;
 
-    bfd_seek(abfd, (file_ptr) (section->filepos + offset), SEEK_SET);
+  if (bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) != 0)
+    return false;
 
-    if (count != 0) {
-       return (bfd_write(location, 1, count, abfd) == count) ? true : false;
+  if (count != 0)
+    {
+      return (bfd_write (location, 1, count, abfd) == count) ? true : false;
     }
-    return true;
+  return true;
 }
 #if 0
-static          boolean
-coff_close_and_cleanup(abfd)
-    bfd            *abfd;
+static boolean
+coff_close_and_cleanup (abfd)
+     bfd *abfd;
 {
-  if (!bfd_read_p(abfd))
-    switch (abfd->format) {
-    case bfd_archive:
-      if (!_bfd_write_archive_contents(abfd))
-       return false;
-      break;
-    case bfd_object:
-      if (!coff_write_object_contents(abfd))
+  if (!bfd_read_p (abfd))
+    switch (abfd->format)
+      {
+      case bfd_archive:
+       if (!_bfd_write_archive_contents (abfd))
+         return false;
+       break;
+      case bfd_object:
+       if (!coff_write_object_contents (abfd))
+         return false;
+       break;
+      default:
+       bfd_set_error (bfd_error_invalid_operation);
        return false;
-      break;
-    default:
-      bfd_error = invalid_operation;
-      return false;
-    }
+      }
 
   /* We depend on bfd_close to free all the memory on the obstack.  */
   /* FIXME if bfd_release is not using obstacks! */
@@ -1809,27 +3090,23 @@ coff_close_and_cleanup(abfd)
 #endif
 
 static PTR
-buy_and_read(abfd, where, seek_direction, size)
-    bfd            *abfd;
-    file_ptr        where;
-    int             seek_direction;
-    size_t          size;
+buy_and_read (abfd, where, seek_direction, size)
+     bfd *abfd;
+     file_ptr where;
+     int seek_direction;
+     size_t size;
 {
-    PTR             area = (PTR) bfd_alloc(abfd, size);
-    if (!area) {
-       bfd_error = no_memory;
-       return (NULL);
-    }
-    bfd_seek(abfd, where, seek_direction);
-    if (bfd_read(area, 1, size, abfd) != size) {
-       bfd_error = system_call_error;
-       return (NULL);
-    }                          /* on error */
-    return (area);
+  PTR area = (PTR) bfd_alloc (abfd, size);
+  if (!area)
+    return (NULL);
+  if (bfd_seek (abfd, where, seek_direction) != 0
+      || bfd_read (area, 1, size, abfd) != size)
+    return (NULL);
+  return (area);
 }                              /* buy_and_read() */
 
 /*
-SUBSUBSECTION 
+SUBSUBSECTION
        Reading linenumbers
 
        Creating the linenumber table is done by reading in the entire
@@ -1839,7 +3116,7 @@ SUBSUBSECTION
        is marked as having a line number of 0. Each line within the
        function is an offset from the first line in the function. The
        base of the line number information for the table is stored in
-       the symbol associated with the function. 
+       the symbol associated with the function.
 
        The information is copied from the external to the internal
        table, and each symbol which marks a function is marked by
@@ -1850,52 +3127,72 @@ SUBSUBSECTION
 */
 
 static boolean
-coff_slurp_line_table(abfd, asect)
+coff_slurp_line_table (abfd, asect)
      bfd *abfd;
      asection *asect;
 {
-  LINENO  *native_lineno;
+  LINENO *native_lineno;
   alent *lineno_cache;
 
-  BFD_ASSERT(asect->lineno == (alent *) NULL);
+  BFD_ASSERT (asect->lineno == (alent *) NULL);
 
-  native_lineno = (LINENO *) buy_and_read(abfd,
-                                         asect->line_filepos,
-                                         SEEK_SET,
-                                         (size_t) (LINESZ *
-                                                   asect->lineno_count));
+  native_lineno = (LINENO *) buy_and_read (abfd,
+                                          asect->line_filepos,
+                                          SEEK_SET,
+                                          (size_t) (LINESZ *
+                                                    asect->lineno_count));
   lineno_cache =
-    (alent *) bfd_alloc(abfd, (size_t) ((asect->lineno_count + 1) * sizeof(alent)));
+    (alent *) bfd_alloc (abfd, (size_t) ((asect->lineno_count + 1) * sizeof (alent)));
   if (lineno_cache == NULL)
-    {
-      bfd_error = no_memory;
-      return false;
-    }
+    return false;
   else
     {
-      unsigned int    counter = 0;
-      alent          *cache_ptr = lineno_cache;
-      LINENO  *src = native_lineno;
+      unsigned int counter = 0;
+      alent *cache_ptr = lineno_cache;
+      LINENO *src = native_lineno;
 
       while (counter < asect->lineno_count)
        {
          struct internal_lineno dst;
-         coff_swap_lineno_in(abfd, src, &dst);
+         coff_swap_lineno_in (abfd, src, &dst);
          cache_ptr->line_number = dst.l_lnno;
 
          if (cache_ptr->line_number == 0)
            {
-             coff_symbol_type *sym =
-               (coff_symbol_type *) (dst.l_addr.l_symndx
-                                     + obj_raw_syments(abfd))->u.syment._n._n_n._n_zeroes;
+             boolean warned;
+             long symndx;
+             coff_symbol_type *sym;
+
+             warned = false;
+             symndx = dst.l_addr.l_symndx;
+             if (symndx < 0 || symndx >= obj_raw_syment_count (abfd))
+               {
+                 (*_bfd_error_handler)
+                   ("%s: warning: illegal symbol index %ld in line numbers",
+                    bfd_get_filename (abfd), dst.l_addr.l_symndx);
+                 symndx = 0;
+                 warned = true;
+               }
+             /* FIXME: We should not be casting between ints and
+                 pointers like this.  */
+             sym = ((coff_symbol_type *)
+                    ((symndx + obj_raw_syments (abfd))
+                     ->u.syment._n._n_n._n_zeroes));
              cache_ptr->u.sym = (asymbol *) sym;
+             if (sym->lineno != NULL && ! warned)
+               {
+                 (*_bfd_error_handler)
+                   ("%s: warning: duplicate line number information for `%s'",
+                    bfd_get_filename (abfd),
+                    bfd_asymbol_name (&sym->symbol));
+               }
              sym->lineno = cache_ptr;
            }
          else
            {
              cache_ptr->u.offset = dst.l_addr.l_paddr
-               - bfd_section_vma(abfd, asect);
-           } /* If no linenumber expect a symbol index */
+               - bfd_section_vma (abfd, asect);
+           }                   /* If no linenumber expect a symbol index */
 
          cache_ptr++;
          src++;
@@ -1910,229 +3207,334 @@ coff_slurp_line_table(abfd, asect)
 }
 
 static boolean
-DEFUN(coff_slurp_symbol_table,(abfd),
-      bfd            *abfd)
+coff_slurp_symbol_table (abfd)
+     bfd * abfd;
 {
-  combined_entry_type         *native_symbols;
+  combined_entry_type *native_symbols;
   coff_symbol_type *cached_area;
-  unsigned int   *table_ptr;
+  unsigned int *table_ptr;
 
-  unsigned int    number_of_symbols = 0;
-  if (obj_symbols(abfd))
+  unsigned int number_of_symbols = 0;
+
+  if (obj_symbols (abfd))
     return true;
-  bfd_seek(abfd, obj_sym_filepos(abfd), SEEK_SET);
 
   /* Read in the symbol table */
-  if ((native_symbols = coff_get_normalized_symtab(abfd)) == NULL) {
-    return (false);
-  }                            /* on error */
+  if ((native_symbols = coff_get_normalized_symtab (abfd)) == NULL)
+    {
+      return (false);
+    }                          /* on error */
 
   /* Allocate enough room for all the symbols in cached form */
-  cached_area =
-    (coff_symbol_type *)
-      bfd_alloc(abfd, (size_t) (bfd_get_symcount(abfd) * sizeof(coff_symbol_type)));
+  cached_area = ((coff_symbol_type *)
+                bfd_alloc (abfd,
+                           (obj_raw_syment_count (abfd)
+                            * sizeof (coff_symbol_type))));
 
-  if (cached_area == NULL) {
-    bfd_error = no_memory;
+  if (cached_area == NULL)
     return false;
-  }                            /* on error */
-  table_ptr =
-    (unsigned int *)
-      bfd_alloc(abfd, (size_t) (bfd_get_symcount(abfd) * sizeof(unsigned int)));
+  table_ptr = ((unsigned int *)
+              bfd_alloc (abfd,
+                         (obj_raw_syment_count (abfd)
+                          * sizeof (unsigned int))));
 
-  if (table_ptr == NULL) {
-    bfd_error = no_memory;
+  if (table_ptr == NULL)
     return false;
-  } 
-  else 
-  {
-    coff_symbol_type *dst = cached_area;
-    unsigned int    last_native_index = bfd_get_symcount(abfd);
-    unsigned int    this_index = 0;
-    while (this_index < last_native_index) {
-      combined_entry_type         *src = native_symbols + this_index;
-      table_ptr[this_index] = number_of_symbols;
-      dst->symbol.the_bfd = abfd;
-
-      dst->symbol.name = (char *)(src->u.syment._n._n_n._n_offset);
-      /* We use the native name field to point to the cached field.  */
-      src->u.syment._n._n_n._n_zeroes = (long) dst;
-      dst->symbol.section = coff_section_from_bfd_index(abfd,
-                                                       src->u.syment.n_scnum);
-      dst->symbol.flags = 0;
-      dst->done_lineno = false;
-      
-      switch (src->u.syment.n_sclass) {
+  else
+    {
+      coff_symbol_type *dst = cached_area;
+      unsigned int last_native_index = obj_raw_syment_count (abfd);
+      unsigned int this_index = 0;
+      while (this_index < last_native_index)
+       {
+         combined_entry_type *src = native_symbols + this_index;
+         table_ptr[this_index] = number_of_symbols;
+         dst->symbol.the_bfd = abfd;
+
+         dst->symbol.name = (char *) (src->u.syment._n._n_n._n_offset);
+         /* We use the native name field to point to the cached field.  */
+         src->u.syment._n._n_n._n_zeroes = (long) dst;
+         dst->symbol.section = coff_section_from_bfd_index (abfd,
+                                                    src->u.syment.n_scnum);
+         dst->symbol.flags = 0;
+         dst->done_lineno = false;
+
+         switch (src->u.syment.n_sclass)
+           {
 #ifdef I960
-      case C_LEAFEXT:
+           case C_LEAFEXT:
 #if 0
-       dst->symbol.value = src->u.syment.n_value - dst->symbol.section->vma;
-       dst->symbol.flags = BSF_EXPORT | BSF_GLOBAL;
-       dst->symbol.flags |= BSF_NOT_AT_END;
+             dst->symbol.value = src->u.syment.n_value - dst->symbol.section->vma;
+             dst->symbol.flags = BSF_EXPORT | BSF_GLOBAL;
+             dst->symbol.flags |= BSF_NOT_AT_END | BSF_FUNCTION;
 #endif
-       /* Fall through to next case */
+             /* Fall through to next case */
 
 #endif
 
-      case C_EXT:
+           case C_EXT:
 #ifdef RS6000COFF_C
-      case C_HIDEXT:
+           case C_HIDEXT:
+#endif
+#ifdef COFF_WITH_PE
+            /* PE uses storage class 0x68 to denote a section symbol */
+            case C_SECTION:
+           /* PE uses storage class 0x67 for a weak external symbol.  */
+           case C_NT_WEAK:
+#endif
+             if ((src->u.syment.n_scnum) == 0)
+               {
+                 if ((src->u.syment.n_value) == 0)
+                   {
+                     dst->symbol.section = bfd_und_section_ptr;
+                     dst->symbol.value = 0;
+                   }
+                 else
+                   {
+                     dst->symbol.section = bfd_com_section_ptr;
+                     dst->symbol.value = (src->u.syment.n_value);
+                   }
+               }
+             else
+               {
+                 /* Base the value as an index from the base of the
+                    section */
+
+                 dst->symbol.flags = BSF_EXPORT | BSF_GLOBAL;
+                 dst->symbol.value = (src->u.syment.n_value
+                                      - dst->symbol.section->vma);
+
+                 if (ISFCN ((src->u.syment.n_type)))
+                   {
+                     /* A function ext does not go at the end of a
+                        file.  */
+                     dst->symbol.flags |= BSF_NOT_AT_END | BSF_FUNCTION;
+                   }
+               }
+
+#ifdef RS6000COFF_C
+             /* A C_HIDEXT symbol is not global.  */
+             if (src->u.syment.n_sclass == C_HIDEXT)
+               dst->symbol.flags = BSF_LOCAL;
+             /* A symbol with a csect entry should not go at the end.  */
+             if (src->u.syment.n_numaux > 0)
+               dst->symbol.flags |= BSF_NOT_AT_END;
 #endif
-       if ((src->u.syment.n_scnum) == 0) {
-         if ((src->u.syment.n_value) == 0) {
-           dst->symbol.section = &bfd_und_section;
-           dst->symbol.value= 0;
-         }
-         else {
-           dst->symbol.section = &bfd_com_section;
-           dst->symbol.value = (src->u.syment.n_value);
-         }
-       }
-       else {
-         /*
-           Base the value as an index from the base of the
-           section
-           */
-
-           dst->symbol.flags = BSF_EXPORT | BSF_GLOBAL;
-           dst->symbol.value = src->u.syment.n_value - dst->symbol.section->vma;
-
-         if (ISFCN((src->u.syment.n_type))) {
-           /*
-             A function ext does not go at the end of a file
-             */
-           dst->symbol.flags |= BSF_NOT_AT_END;
-         }
-       }
 
+#ifdef COFF_WITH_PE
+             if (src->u.syment.n_sclass == C_NT_WEAK)
+               dst->symbol.flags = BSF_WEAK;
+#endif
 
-       break;
+             break;
 
-      case C_STAT:             /* static                        */
+           case C_STAT:        /* static                        */
 #ifdef I960
-      case C_LEAFSTAT:         /* static leaf procedure        */
-#endif
-      case C_LABEL:            /* label                         */
-       if (src->u.syment.n_scnum == -2)
-         dst->symbol.flags = BSF_DEBUGGING;
-       else
-         dst->symbol.flags = BSF_LOCAL;
-       /*
-         Base the value as an index from the base of the section, if
-         there is one
-         */
-       if (dst->symbol.section)
-         dst->symbol.value = (src->u.syment.n_value) -
-           dst->symbol.section->vma;
-       else
-         dst->symbol.value = (src->u.syment.n_value) ;
-       break;
-
-      case C_MOS:              /* member of structure   */
-      case C_EOS:              /* end of structure              */
-#ifdef NOTDEF  /* C_AUTOARG has the same value */
+           case C_LEAFSTAT:    /* static leaf procedure        */
+#endif
+           case C_LABEL:       /* label                         */
+             if (src->u.syment.n_scnum == -2)
+               dst->symbol.flags = BSF_DEBUGGING;
+             else
+               dst->symbol.flags = BSF_LOCAL;
+
+             /* Base the value as an index from the base of the
+                section, if there is one.  */
+             if (dst->symbol.section)
+               dst->symbol.value = (src->u.syment.n_value
+                                    - dst->symbol.section->vma);
+             else
+               dst->symbol.value = src->u.syment.n_value;
+             break;
+
+           case C_MOS: /* member of structure   */
+           case C_EOS: /* end of structure              */
+#ifdef NOTDEF                  /* C_AUTOARG has the same value */
 #ifdef C_GLBLREG
-      case C_GLBLREG:          /* A29k-specific storage class */
+           case C_GLBLREG:     /* A29k-specific storage class */
 #endif
 #endif
-      case C_REGPARM:          /* register parameter            */
-      case C_REG:              /* register variable             */
+           case C_REGPARM:     /* register parameter            */
+           case C_REG: /* register variable             */
 #ifdef C_AUTOARG
-      case C_AUTOARG:          /* 960-specific storage class */
-#endif
-      case C_TPDEF:            /* type definition               */
-      case C_ARG:
-      case C_AUTO:             /* automatic variable */
-      case C_FIELD:            /* bit field */
-      case C_ENTAG:            /* enumeration tag               */
-      case C_MOE:              /* member of enumeration         */
-      case C_MOU:              /* member of union               */
-      case C_UNTAG:            /* union tag                     */
-       dst->symbol.flags = BSF_DEBUGGING;
-       dst->symbol.value = (src->u.syment.n_value);
-       break;
-
-      case C_FILE:             /* file name                     */
-      case C_STRTAG:           /* structure tag                 */
+           case C_AUTOARG:     /* 960-specific storage class */
+#endif
+           case C_TPDEF:       /* type definition               */
+           case C_ARG:
+           case C_AUTO:        /* automatic variable */
+           case C_FIELD:       /* bit field */
+           case C_ENTAG:       /* enumeration tag               */
+           case C_MOE: /* member of enumeration         */
+           case C_MOU: /* member of union               */
+           case C_UNTAG:       /* union tag                     */
+             dst->symbol.flags = BSF_DEBUGGING;
+             dst->symbol.value = (src->u.syment.n_value);
+             break;
+
+           case C_FILE:        /* file name                     */
+           case C_STRTAG:      /* structure tag                 */
 #ifdef RS6000COFF_C
-      case C_BINCL:            /* beginning of include file     */
-      case C_EINCL:            /* ending of include file        */
-      case C_GSYM:
-      case C_LSYM:
-      case C_PSYM:
-      case C_RSYM:
-      case C_RPSYM:
-      case C_STSYM:
-      case C_DECL:
-      case C_ENTRY:
-      case C_FUN:
-      case C_BSTAT:
-      case C_ESTAT:
-#endif
-       dst->symbol.flags = BSF_DEBUGGING;
-       dst->symbol.value = (src->u.syment.n_value);
-       break;
-
-      case C_BLOCK:            /* ".bb" or ".eb"                */
-      case C_FCN:              /* ".bf" or ".ef"                */
-      case C_EFCN:             /* physical end of function      */
-       dst->symbol.flags = BSF_LOCAL;
-       /*
-         Base the value as an index from the base of the section
-         */
-       dst->symbol.value = (src->u.syment.n_value) - dst->symbol.section->vma;
-       break;
-
-      case C_NULL:
-      case C_EXTDEF:           /* external definition           */
-      case C_ULABEL:           /* undefined label               */
-      case C_USTATIC:          /* undefined static              */
-      case C_LINE:             /* line # reformatted as symbol table entry */
-      case C_ALIAS:            /* duplicate tag                 */
-      case C_HIDDEN:           /* ext symbol in dmert public lib */
-      default:
+           case C_GSYM:
+           case C_LSYM:
+           case C_PSYM:
+           case C_RSYM:
+           case C_RPSYM:
+           case C_STSYM:
+           case C_BCOMM:
+           case C_ECOMM:
+           case C_DECL:
+           case C_ENTRY:
+           case C_FUN:
+           case C_ESTAT:
+#endif
+             dst->symbol.flags = BSF_DEBUGGING;
+             dst->symbol.value = (src->u.syment.n_value);
+             break;
 
-       fprintf(stderr,"Unrecognized storage class %d (assuming debugging)\n  for %s symbol `%s'\n",
-               src->u.syment.n_sclass, dst->symbol.section->name,
-               dst->symbol.name);
-/*     abort();*/
-       dst->symbol.flags = BSF_DEBUGGING;
-       dst->symbol.value = (src->u.syment.n_value);
-       break;
-      }
+#ifdef RS6000COFF_C
+           case C_BINCL:       /* beginning of include file     */
+           case C_EINCL:       /* ending of include file        */
+             /* The value is actually a pointer into the line numbers
+                 of the file.  We locate the line number entry, and
+                 set the section to the section which contains it, and
+                 the value to the index in that section.  */
+             {
+               asection *sec;
+
+               dst->symbol.flags = BSF_DEBUGGING;
+               for (sec = abfd->sections; sec != NULL; sec = sec->next)
+                 if (sec->line_filepos <= (file_ptr) src->u.syment.n_value
+                     && ((file_ptr) (sec->line_filepos
+                                     + sec->lineno_count * LINESZ)
+                         > (file_ptr) src->u.syment.n_value))
+                   break;
+               if (sec == NULL)
+                 dst->symbol.value = 0;
+               else
+                 {
+                   dst->symbol.section = sec;
+                   dst->symbol.value = ((src->u.syment.n_value
+                                         - sec->line_filepos)
+                                        / LINESZ);
+                   src->fix_line = 1;
+                 }
+             }
+             break;
+
+           case C_BSTAT:
+             dst->symbol.flags = BSF_DEBUGGING;
+
+             /* The value is actually a symbol index.  Save a pointer
+                to the symbol instead of the index.  FIXME: This
+                should use a union.  */
+             src->u.syment.n_value =
+               (long) (native_symbols + src->u.syment.n_value);
+             dst->symbol.value = src->u.syment.n_value;
+             src->fix_value = 1;
+             break;
+#endif
+
+           case C_BLOCK:       /* ".bb" or ".eb"                */
+           case C_FCN:         /* ".bf" or ".ef"                */
+           case C_EFCN:        /* physical end of function      */
+             dst->symbol.flags = BSF_LOCAL;
+             /* Base the value as an index from the base of the
+                section.  */
+             dst->symbol.value = (src->u.syment.n_value
+                                  - dst->symbol.section->vma);
+             break;
+
+           case C_NULL:
+           case C_EXTDEF:      /* external definition           */
+           case C_ULABEL:      /* undefined label               */
+           case C_USTATIC:     /* undefined static              */
+#ifndef COFF_WITH_PE
+            /* C_LINE in regular coff is 0x68.  NT has taken over this storage
+               class to represent a section symbol */
+           case C_LINE:        /* line # reformatted as symbol table entry */
+             /* NT uses 0x67 for a weak symbol, not C_ALIAS.  */
+           case C_ALIAS:       /* duplicate tag                 */
+#endif
+           case C_HIDDEN:      /* ext symbol in dmert public lib */
+           default:
+             (*_bfd_error_handler)
+               ("%s: Unrecognized storage class %d for %s symbol `%s'",
+                bfd_get_filename (abfd), src->u.syment.n_sclass,
+                dst->symbol.section->name, dst->symbol.name);
+             dst->symbol.flags = BSF_DEBUGGING;
+             dst->symbol.value = (src->u.syment.n_value);
+             break;
+           }
 
 /*      BFD_ASSERT(dst->symbol.flags != 0);*/
 
-      dst->native = src;
+         dst->native = src;
 
-      dst->symbol.udata = 0;
-      dst->lineno = (alent *) NULL;
-      this_index += (src->u.syment.n_numaux) + 1;
-      dst++;
-      number_of_symbols++;
-    }                          /* walk the native symtab */
-  }                            /* bfdize the native symtab */
+         dst->symbol.udata.i = 0;
+         dst->lineno = (alent *) NULL;
+         this_index += (src->u.syment.n_numaux) + 1;
+         dst++;
+         number_of_symbols++;
+       }                       /* walk the native symtab */
+    }                          /* bfdize the native symtab */
 
-  obj_symbols(abfd) = cached_area;
-  obj_raw_syments(abfd) = native_symbols;
+  obj_symbols (abfd) = cached_area;
+  obj_raw_syments (abfd) = native_symbols;
 
-  obj_conv_table_size (abfd) = bfd_get_symcount (abfd);
-  bfd_get_symcount(abfd) = number_of_symbols;
-  obj_convert(abfd) = table_ptr;
+  bfd_get_symcount (abfd) = number_of_symbols;
+  obj_convert (abfd) = table_ptr;
   /* Slurp the line tables for each section too */
-    {
-      asection       *p;
-      p = abfd->sections;
-      while (p) {
-       coff_slurp_line_table(abfd, p);
+  {
+    asection *p;
+    p = abfd->sections;
+    while (p)
+      {
+       coff_slurp_line_table (abfd, p);
        p = p->next;
       }
-    }
+  }
   return true;
 }                              /* coff_slurp_symbol_table() */
 
+/* Check whether a symbol is globally visible.  This is used by the
+   COFF backend linker code in cofflink.c, since a couple of targets
+   have globally visible symbols which are not class C_EXT.  This
+   function need not handle the case of n_class == C_EXT.  */
+
+#undef OTHER_GLOBAL_CLASS
+
+#ifdef I960
+#define OTHER_GLOBAL_CLASS C_LEAFEXT
+#endif
+
+#ifdef COFF_WITH_PE
+#define OTHER_GLOBAL_CLASS C_SECTION
+#endif
+
+#ifdef OTHER_GLOBAL_CLASS
+
+static boolean
+coff_sym_is_global (abfd, syment)
+     bfd *abfd;
+     struct internal_syment *syment;
+{
+  if (syment->n_sclass == OTHER_GLOBAL_CLASS)
+    return true;
+  return false;
+}
+
+#undef OTHER_GLOBAL_CLASS
+
+#else /* ! defined (OTHER_GLOBAL_CLASS) */
+
+/* sym_is_global should not be defined if it has nothing to do.  */
+
+#define coff_sym_is_global 0
+
+#endif /* ! defined (OTHER_GLOBAL_CLASS) */
+
 /*
-SUBSUBSECTION 
+SUBSUBSECTION
        Reading relocations
 
        Coff relocations are easily transformed into the internal BFD form
@@ -2161,88 +3563,102 @@ SUBSUBSECTION
 */
 
 #ifndef CALC_ADDEND
-#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)       \
-           if (ptr && bfd_asymbol_bfd(ptr) == abfd     \
-               && !bfd_is_com_section(ptr->section)    \
-               && !(ptr->flags & BSF_OLD_COMMON))      \
-           {                                           \
-               cache_ptr->addend = -(ptr->section->vma + ptr->value);  \
-           }                                           \
-           else {                                      \
-               cache_ptr->addend = 0;                  \
-           }                   
-#endif
-
-static          boolean
-DEFUN(coff_slurp_reloc_table,(abfd, asect, symbols),
-      bfd            *abfd AND
-      sec_ptr         asect AND
-      asymbol       **symbols)
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)                \
+  {                                                             \
+    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;      \
+    if (ptr && bfd_asymbol_bfd (ptr) != abfd)                   \
+      coffsym = (obj_symbols (abfd)                             \
+                 + (cache_ptr->sym_ptr_ptr - symbols));         \
+    else if (ptr)                                               \
+      coffsym = coff_symbol_from (abfd, ptr);                   \
+    if (coffsym != (coff_symbol_type *) NULL                    \
+        && coffsym->native->u.syment.n_scnum == 0)              \
+      cache_ptr->addend = 0;                                    \
+    else if (ptr && bfd_asymbol_bfd (ptr) == abfd               \
+             && ptr->section != (asection *) NULL)              \
+      cache_ptr->addend = - (ptr->section->vma + ptr->value);   \
+    else                                                        \
+      cache_ptr->addend = 0;                                    \
+  }
+#endif
+
+static boolean
+coff_slurp_reloc_table (abfd, asect, symbols)
+     bfd * abfd;
+     sec_ptr asect;
+     asymbol ** symbols;
 {
-  RELOC   *native_relocs;
-  arelent        *reloc_cache;
-  arelent        *cache_ptr;
+  RELOC *native_relocs;
+  arelent *reloc_cache;
+  arelent *cache_ptr;
 
   unsigned int idx;
-  
+
   if (asect->relocation)
-   return true;
+    return true;
   if (asect->reloc_count == 0)
-   return true;
+    return true;
   if (asect->flags & SEC_CONSTRUCTOR)
-   return true;
-  if (!coff_slurp_symbol_table(abfd))
-   return false;
+    return true;
+  if (!coff_slurp_symbol_table (abfd))
+    return false;
   native_relocs =
-   (RELOC *) buy_and_read(abfd,
-                         asect->rel_filepos,
-                         SEEK_SET,
-                         (size_t) (RELSZ *
-                                   asect->reloc_count));
+    (RELOC *) buy_and_read (abfd,
+                           asect->rel_filepos,
+                           SEEK_SET,
+                           (size_t) (RELSZ *
+                                     asect->reloc_count));
   reloc_cache = (arelent *)
-   bfd_alloc(abfd, (size_t) (asect->reloc_count * sizeof(arelent)));
+    bfd_alloc (abfd, (size_t) (asect->reloc_count * sizeof (arelent)));
 
-  if (reloc_cache == NULL) {
-      bfd_error = no_memory;
-      return false;
-    } 
+  if (reloc_cache == NULL)
+    return false;
 
-  
-  for (idx = 0; idx < asect->reloc_count; idx ++) 
-  {
+
+  for (idx = 0; idx < asect->reloc_count; idx++)
+    {
 #ifdef RELOC_PROCESSING
       struct internal_reloc dst;
-      struct external_reloc  *src;
+      struct external_reloc *src;
 
       cache_ptr = reloc_cache + idx;
       src = native_relocs + idx;
-      bfd_swap_reloc_in(abfd, src, &dst);
+      coff_swap_reloc_in (abfd, src, &dst);
 
-      RELOC_PROCESSING(cache_ptr, &dst, symbols, abfd, asect);
+      RELOC_PROCESSING (cache_ptr, &dst, symbols, abfd, asect);
 #else
       struct internal_reloc dst;
-      asymbol        *ptr;
-      struct external_reloc  *src;
+      asymbol *ptr;
+      struct external_reloc *src;
 
       cache_ptr = reloc_cache + idx;
       src = native_relocs + idx;
 
-      bfd_swap_reloc_in(abfd, src, &dst);
+      coff_swap_reloc_in (abfd, src, &dst);
 
 
       cache_ptr->address = dst.r_vaddr;
 
-      if (dst.r_symndx != -1) 
+      if (dst.r_symndx != -1)
        {
-         /* @@ Should never be greater than count of symbols!  */
-         if (dst.r_symndx >= obj_conv_table_size (abfd))
-           abort ();
-         cache_ptr->sym_ptr_ptr = symbols + obj_convert(abfd)[dst.r_symndx];
-         ptr = *(cache_ptr->sym_ptr_ptr);
+         if (dst.r_symndx < 0 || dst.r_symndx >= obj_conv_table_size (abfd))
+           {
+             (*_bfd_error_handler)
+               ("%s: warning: illegal symbol index %ld in relocs",
+                bfd_get_filename (abfd), dst.r_symndx);
+             cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+             ptr = 0;
+           }
+         else
+           {
+             cache_ptr->sym_ptr_ptr = (symbols
+                                       + obj_convert (abfd)[dst.r_symndx]);
+             ptr = *(cache_ptr->sym_ptr_ptr);
+           }
        }
-      else 
+      else
        {
-         cache_ptr->sym_ptr_ptr= bfd_abs_section.symbol_ptr_ptr;
+         cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
          ptr = 0;
        }
 
@@ -2254,81 +3670,123 @@ DEFUN(coff_slurp_reloc_table,(abfd, asect, symbols),
         Note that symbols which used to be common must be left alone */
 
       /* Calculate any reloc addend by looking at the symbol */
-      CALC_ADDEND(abfd, ptr, dst, cache_ptr);
+      CALC_ADDEND (abfd, ptr, dst, cache_ptr);
 
       cache_ptr->address -= asect->vma;
 /* !!     cache_ptr->section = (asection *) NULL;*/
 
       /* Fill in the cache_ptr->howto field from dst.r_type */
-      RTYPE2HOWTO(cache_ptr, &dst);
+      RTYPE2HOWTO (cache_ptr, &dst);
 #endif
 
-  }
+      if (cache_ptr->howto == NULL)
+       {
+         (*_bfd_error_handler)
+           ("%s: illegal relocation type %d at address 0x%lx",
+            bfd_get_filename (abfd), dst.r_type, (long) dst.r_vaddr);
+         bfd_set_error (bfd_error_bad_value);
+         return false;
+       }
+    }
 
   asect->relocation = reloc_cache;
   return true;
 }
 
+#ifndef coff_rtype_to_howto
+#ifdef RTYPE2HOWTO
+
+/* Get the howto structure for a reloc.  This is only used if the file
+   including this one defines coff_relocate_section to be
+   _bfd_coff_generic_relocate_section, so it is OK if it does not
+   always work.  It is the responsibility of the including file to
+   make sure it is reasonable if it is needed.  */
+
+static reloc_howto_type *coff_rtype_to_howto
+  PARAMS ((bfd *, asection *, struct internal_reloc *,
+          struct coff_link_hash_entry *, struct internal_syment *,
+          bfd_vma *));
+
+/*ARGSUSED*/
+static reloc_howto_type *
+coff_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
+     bfd *abfd;
+     asection *sec;
+     struct internal_reloc *rel;
+     struct coff_link_hash_entry *h;
+     struct internal_syment *sym;
+     bfd_vma *addendp;
+{
+  arelent genrel;
+
+  RTYPE2HOWTO (&genrel, rel);
+  return genrel.howto;
+}
+
+#else /* ! defined (RTYPE2HOWTO) */
+
+#define coff_rtype_to_howto NULL
+
+#endif /* ! defined (RTYPE2HOWTO) */
+#endif /* ! defined (coff_rtype_to_howto) */
 
 /* This is stupid.  This function should be a boolean predicate.  */
-static unsigned int
-DEFUN(coff_canonicalize_reloc, (abfd, section, relptr, symbols),
-bfd            *abfd AND
-sec_ptr         section AND
-arelent       **relptr AND
-asymbol       **symbols)
+static long
+coff_canonicalize_reloc (abfd, section, relptr, symbols)
+     bfd * abfd;
+     sec_ptr section;
+     arelent ** relptr;
+     asymbol ** symbols;
 {
-  arelent        *tblptr = section->relocation;
-  unsigned int    count = 0;
+  arelent *tblptr = section->relocation;
+  unsigned int count = 0;
 
 
-  if (section->flags & SEC_CONSTRUCTOR) 
-  {
-    /* this section has relocs made up by us, they are not in the
+  if (section->flags & SEC_CONSTRUCTOR)
+    {
+      /* this section has relocs made up by us, they are not in the
        file, so take them out of their chain and place them into
        the data area provided */
-    arelent_chain *chain = section->constructor_chain;
-    for (count = 0; count < section->reloc_count; count ++) 
-    {
-      *relptr ++ = &chain->relent;
-      chain = chain->next;
-    }
-
-  }
-  else 
-  { 
-    coff_slurp_reloc_table(abfd, section, symbols);
+      arelent_chain *chain = section->constructor_chain;
+      for (count = 0; count < section->reloc_count; count++)
+       {
+         *relptr++ = &chain->relent;
+         chain = chain->next;
+       }
 
+    }
+  else
+    {
+      if (! coff_slurp_reloc_table (abfd, section, symbols))
+       return -1;
 
-    tblptr = section->relocation;
-    if (!tblptr)
-     return 0;
+      tblptr = section->relocation;
 
-    for (; count++ < section->reloc_count;)
-     *relptr++ = tblptr++;
+      for (; count++ < section->reloc_count;)
+       *relptr++ = tblptr++;
 
 
-  }
+    }
   *relptr = 0;
   return section->reloc_count;
 }
 
 #ifdef GNU960
 file_ptr
-coff_sym_filepos(abfd)
-bfd *abfd;
-  {
-    return obj_sym_filepos(abfd);
-  }
+coff_sym_filepos (abfd)
+     bfd *abfd;
+{
+  return obj_sym_filepos (abfd);
+}
 #endif
 
 #ifndef coff_reloc16_estimate
 #define coff_reloc16_estimate dummy_reloc16_estimate
 
 static int
-dummy_reloc16_estimate (input_section, symbols, reloc, shrink, link_info)
+dummy_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
+     bfd *abfd;
      asection *input_section;
-     asymbol **symbols;
      arelent *reloc;
      unsigned int shrink;
      struct bfd_link_info *link_info;
@@ -2352,51 +3810,117 @@ dummy_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
      unsigned int *src_ptr;
      unsigned int *dst_ptr;
 {
-  fprintf(stderr, "%s\n", reloc->howto->name);
   abort ();
 }
 #endif
 
-static CONST bfd_coff_backend_data bfd_coff_std_swap_table = {
- coff_swap_aux_in, coff_swap_sym_in, coff_swap_lineno_in,
- coff_swap_aux_out, coff_swap_sym_out,
- coff_swap_lineno_out, coff_swap_reloc_out,
- coff_swap_filehdr_out, coff_swap_aouthdr_out,
- coff_swap_scnhdr_out,
- FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, LINESZ,
+/* If coff_relocate_section is defined, we can use the optimized COFF
+   backend linker.  Otherwise we must continue to use the old linker.  */
+#ifdef coff_relocate_section
+#ifndef coff_bfd_link_hash_table_create
+#define coff_bfd_link_hash_table_create _bfd_coff_link_hash_table_create
+#endif
+#ifndef coff_bfd_link_add_symbols
+#define coff_bfd_link_add_symbols _bfd_coff_link_add_symbols
+#endif
+#ifndef coff_bfd_final_link
+#define coff_bfd_final_link _bfd_coff_final_link
+#endif
+#else /* ! defined (coff_relocate_section) */
+#define coff_relocate_section NULL
+#ifndef coff_bfd_link_hash_table_create
+#define coff_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#endif
+#ifndef coff_bfd_link_add_symbols
+#define coff_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#endif
+#define coff_bfd_final_link _bfd_generic_final_link
+#endif /* ! defined (coff_relocate_section) */
+#define coff_bfd_link_split_section  _bfd_generic_link_split_section
+
+#ifndef coff_start_final_link
+#define coff_start_final_link NULL
+#endif
+
+#ifndef coff_adjust_symndx
+#define coff_adjust_symndx NULL
+#endif
+
+#ifndef coff_link_add_one_symbol
+#define coff_link_add_one_symbol _bfd_generic_link_add_one_symbol
+#endif
+
+static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
+{
+  coff_swap_aux_in, coff_swap_sym_in, coff_swap_lineno_in,
+  coff_swap_aux_out, coff_swap_sym_out,
+  coff_swap_lineno_out, coff_swap_reloc_out,
+  coff_swap_filehdr_out, coff_swap_aouthdr_out,
+  coff_swap_scnhdr_out,
+  FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, RELSZ, LINESZ,
 #ifdef COFF_LONG_FILENAMES
- true,
 true,
 #else
- false,
 false,
 #endif
- coff_swap_filehdr_in, coff_swap_aouthdr_in, coff_swap_scnhdr_in,
- coff_bad_format_hook, coff_set_arch_mach_hook, coff_mkobject_hook,
- styp_to_sec_flags, coff_make_section_hook, coff_set_alignment_hook,
- coff_slurp_symbol_table, symname_in_debug_hook, 
- coff_reloc16_extra_cases, coff_reloc16_estimate
+#ifdef COFF_LONG_SECTION_NAMES
+  true,
+#else
+  false,
+#endif
+  coff_swap_filehdr_in, coff_swap_aouthdr_in, coff_swap_scnhdr_in,
+  coff_swap_reloc_in, coff_bad_format_hook, coff_set_arch_mach_hook,
+  coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
+  coff_slurp_symbol_table, symname_in_debug_hook, coff_pointerize_aux_hook,
+  coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
+  coff_sym_is_global, coff_compute_section_file_positions,
+  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
+  coff_adjust_symndx, coff_link_add_one_symbol
 };
 
-#define coff_core_file_failing_command _bfd_dummy_core_file_failing_command
-#define coff_core_file_failing_signal  _bfd_dummy_core_file_failing_signal
-#define coff_core_file_matches_executable_p    _bfd_dummy_core_file_matches_executable_p
-#define coff_slurp_armap               bfd_slurp_coff_armap
-#define coff_slurp_extended_name_table _bfd_slurp_extended_name_table
-#define coff_truncate_arname           bfd_dont_truncate_arname
-#define coff_openr_next_archived_file  bfd_generic_openr_next_archived_file
-#define coff_generic_stat_arch_elt     bfd_generic_stat_arch_elt
-#define        coff_get_section_contents       bfd_generic_get_section_contents
-#define        coff_close_and_cleanup          bfd_generic_close_and_cleanup
-
-#define coff_bfd_debug_info_start      bfd_void
-#define coff_bfd_debug_info_end                bfd_void
-#define coff_bfd_debug_info_accumulate \
-                       (void (*) PARAMS ((bfd *, struct sec *))) bfd_void
-#define coff_bfd_get_relocated_section_contents  bfd_generic_get_relocated_section_contents
-#define coff_bfd_relax_section         bfd_generic_relax_section
+#define        coff_close_and_cleanup _bfd_generic_close_and_cleanup
+#define coff_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
+#define        coff_get_section_contents _bfd_generic_get_section_contents
+
+#ifndef coff_bfd_copy_private_symbol_data
+#define coff_bfd_copy_private_symbol_data  _bfd_generic_bfd_copy_private_symbol_data
+#endif
+
+#ifndef coff_bfd_copy_private_section_data
+#define coff_bfd_copy_private_section_data  _bfd_generic_bfd_copy_private_section_data
+#endif
+
+#ifndef coff_bfd_copy_private_bfd_data 
+#define coff_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
+#endif
+
+#define coff_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
+#define coff_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
+
+#ifndef coff_bfd_print_private_bfd_data 
+#define coff_bfd_print_private_bfd_data  _bfd_generic_bfd_print_private_bfd_data
+#endif
+
+#ifndef coff_bfd_is_local_label
+#define coff_bfd_is_local_label bfd_generic_is_local_label
+#endif
+#ifndef coff_read_minisymbols
+#define coff_read_minisymbols _bfd_generic_read_minisymbols
+#endif
+#ifndef coff_minisymbol_to_symbol
+#define coff_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
+#endif
+
+/* The reloc lookup routine must be supplied by each individual COFF
+   backend.  */
 #ifndef coff_bfd_reloc_type_lookup
-#define coff_bfd_reloc_type_lookup \
-  ((CONST struct reloc_howto_struct *(*) PARAMS ((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr)
+#define coff_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
+#endif
+
+#ifndef coff_bfd_get_relocated_section_contents
+#define coff_bfd_get_relocated_section_contents \
+  bfd_generic_get_relocated_section_contents
+#endif
+#ifndef coff_bfd_relax_section
+#define coff_bfd_relax_section bfd_generic_relax_section
 #endif
-#define coff_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define coff_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define coff_bfd_final_link _bfd_generic_final_link
This page took 0.072251 seconds and 4 git commands to generate.