Thu Nov 19 16:02:46 1998 Dave Brolley <brolley@cygnus.com>
[deliverable/binutils-gdb.git] / bfd / coffcode.h
index feca75850f3c8fe1cd4b9024908504c151d7dd49..99bf9e521a09ffdb4c3025f05d68400f7f726750 100644 (file)
@@ -1,5 +1,6 @@
 /* Support for the generic parts of most COFF variants, for BFD.
-   Copyright 1990, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
+   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
+   Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -16,7 +17,7 @@ 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,
@@ -265,9 +266,14 @@ CODE_FRAGMENT
 .unsigned int fix_end : 1;
 .
 .       {* Should the x_csect.x_scnlen field be renumbered.
-.          Created by coff_slurp_symbol_table. *}
+.          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. *}
 .
@@ -298,7 +304,37 @@ CODE_FRAGMENT
 
 */
 
+#ifdef COFF_WITH_PE
+#include "peicode.h"
+#else
 #include "coffswap.h"
+#endif
+
+#define STRING_SIZE_SIZE (4)
+
+static long sec_to_styp_flags PARAMS ((const char *, flagword));
+static flagword styp_to_sec_flags PARAMS ((bfd *, PTR, const char *));
+static boolean coff_bad_format_hook PARAMS ((bfd *, PTR));
+static boolean coff_new_section_hook PARAMS ((bfd *, asection *));
+static boolean coff_set_arch_mach_hook PARAMS ((bfd *, PTR));
+static boolean coff_write_relocs PARAMS ((bfd *, int));
+static boolean coff_set_flags
+  PARAMS ((bfd *, unsigned int *, unsigned short *));
+static boolean coff_set_arch_mach
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
+static boolean coff_compute_section_file_positions PARAMS ((bfd *));
+static boolean coff_write_object_contents PARAMS ((bfd *));
+static boolean coff_set_section_contents
+  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
+static PTR buy_and_read PARAMS ((bfd *, file_ptr, int, size_t));
+static boolean coff_slurp_line_table PARAMS ((bfd *, asection *));
+static boolean coff_slurp_symbol_table PARAMS ((bfd *));
+static boolean coff_slurp_reloc_table PARAMS ((bfd *, asection *, asymbol **));
+static long coff_canonicalize_reloc
+  PARAMS ((bfd *, asection *, arelent **, asymbol **));
+#ifndef coff_mkobject_hook
+static PTR coff_mkobject_hook PARAMS ((bfd *, PTR,  PTR));
+#endif
 \f
 /* void warning(); */
 
@@ -322,12 +358,6 @@ sec_to_styp_flags (sec_name, sec_flags)
   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))
     {
@@ -359,11 +389,26 @@ sec_to_styp_flags (sec_name, sec_flags)
       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)
     {
@@ -395,6 +440,11 @@ sec_to_styp_flags (sec_name, sec_flags)
     styp_flags |= STYP_NOLOAD;
 #endif
 
+#ifdef COFF_WITH_PE
+  if (sec_flags & SEC_LINK_ONCE)
+    styp_flags |= IMAGE_SCN_LNK_COMDAT;
+#endif
+
   return (styp_flags);
 }
 /*
@@ -454,10 +504,14 @@ styp_to_sec_flags (abfd, hdr, name)
         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
+#if defined (COFF_PAGE_SIZE) && !defined (COFF_ALIGN_IN_S_FLAGS)
       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)
@@ -465,11 +519,7 @@ styp_to_sec_flags (abfd, hdr, name)
       else
        sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
     }
-  else if (strcmp (name, _DATA) == 0
-#ifdef TWO_DATA_SECS
-          || strcmp (name, ".data2") == 0
-#endif
-          )
+  else if (strcmp (name, _DATA) == 0)
     {
       if (sec_flags & SEC_NEVER_LOAD)
        sec_flags |= SEC_DATA | SEC_COFF_SHARED_LIBRARY;
@@ -489,8 +539,7 @@ styp_to_sec_flags (abfd, hdr, name)
 #ifdef _COMMENT
           || strcmp (name, _COMMENT) == 0
 #endif
-          || strcmp (name, ".stab") == 0
-          || strcmp (name, ".stabstr") == 0)
+          || strncmp (name, ".stab", 5) == 0)
     {
 #ifdef COFF_PAGE_SIZE
       sec_flags |= SEC_DEBUGGING;
@@ -524,6 +573,97 @@ styp_to_sec_flags (abfd, hdr, name)
     }
 #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);
+
+             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);
 }
 
@@ -611,6 +751,8 @@ dependent COFF routines:
 . unsigned int _bfd_relsz;
 . unsigned int _bfd_linesz;
 . boolean _bfd_coff_long_filenames;
+. boolean _bfd_coff_long_section_names;
+. unsigned int _bfd_coff_default_section_alignment_power;
 . void (*_bfd_coff_swap_filehdr_in) PARAMS ((
 .       bfd     *abfd,
 .       PTR     ext,
@@ -641,9 +783,6 @@ dependent COFF routines:
 .       bfd     *abfd,
 .       PTR     internal_scnhdr,
 .       const char *name));
-. asection *(*_bfd_make_section_hook) PARAMS ((
-.       bfd     *abfd,
-.       char    *name));
 . void (*_bfd_set_alignment_hook) PARAMS ((
 .       bfd     *abfd,
 .       asection *sec,
@@ -653,6 +792,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,
@@ -670,8 +822,11 @@ dependent COFF routines:
 . boolean (*_bfd_coff_sym_is_global) PARAMS ((
 .       bfd *abfd,
 .       struct internal_syment *));
-. void (*_bfd_coff_compute_section_file_positions) PARAMS ((
+. boolean (*_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,
@@ -695,6 +850,24 @@ dependent COFF routines:
 .       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));
+.
+. boolean (*_bfd_coff_link_output_has_begun) PARAMS ((
+.      bfd * abfd,
+.       struct coff_final_link_info * pfinfo));
+. boolean (*_bfd_coff_final_link_postscript) PARAMS ((
+.      bfd * abfd,
+.      struct coff_final_link_info * pfinfo));
 .
 .} bfd_coff_backend_data;
 .
@@ -738,6 +911,10 @@ dependent COFF routines:
 .#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_default_section_alignment_power(abfd) \
+.       (coff_backend_info (abfd)->_bfd_coff_default_section_alignment_power)
 .#define bfd_coff_swap_filehdr_in(abfd, i,o) \
 .        ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_in) (abfd, i, o))
 .
@@ -761,9 +938,6 @@ dependent COFF routines:
 .#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_make_section_hook(abfd, name)\
-.        ((coff_backend_info (abfd)->_bfd_make_section_hook) (abfd, name))
-.
 .#define bfd_coff_set_alignment_hook(abfd, sec, scnhdr)\
 .        ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr))
 .
@@ -773,6 +947,10 @@ 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))
@@ -789,6 +967,9 @@ dependent COFF routines:
 .        ((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))
@@ -798,6 +979,14 @@ dependent COFF routines:
 .#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))
+.
+.#define bfd_coff_link_output_has_begun(a,p) \
+.        ((coff_backend_info (a)->_bfd_coff_link_output_has_begun) (a,p))
+.#define bfd_coff_final_link_postscript(a,p) \
+.        ((coff_backend_info (a)->_bfd_coff_final_link_postscript) (a,p))
 .
 */
 
@@ -830,22 +1019,6 @@ coff_bad_format_hook (abfd, filehdr)
   return true;
 }
 
-static asection *
-coff_make_section_hook (abfd, name)
-     bfd * abfd;
-     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
@@ -856,34 +1029,66 @@ coff_new_section_hook (abfd, section)
      bfd * abfd;
      asection * section;
 {
+  combined_entry_type *native;
+
   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!  */
-  coffsymbol (section->symbol)->native =
-    (combined_entry_type *) bfd_zalloc (abfd,
-                                       sizeof (combined_entry_type) * 10);
+     @@ The 10 is a guess at a plausible maximum number of aux entries
+     (but shouldn't be a constant).  */
+  native = ((combined_entry_type *)
+           bfd_zalloc (abfd, sizeof (combined_entry_type) * 10));
+  if (native == NULL)
+    return false;
+
+  /* We don't need to set up n_name, n_value, or n_scnum in the native
+     symbol information, since they'll be overriden by the BFD symbol
+     anyhow.  However, we do need to set the type and storage class,
+     in case this symbol winds up getting written out.  The value 0
+     for n_numaux is already correct.  */
+
+  native->u.syment.n_type = T_NULL;
+  native->u.syment.n_sclass = C_STAT;
+
+  coffsymbol (section->symbol)->native = native;
 
   /* 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 also align the
-     .stabstr section this way for backward compatibility, although I
-     believe it would work anyhow.  */
+     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
-      && (strcmp (section->name, ".stab") == 0
-         || strcmp (section->name, ".stabstr") == 0))
+      && (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
+#ifdef COFF_ALIGN_IN_SECTION_HEADER
 
 /* Set the alignment of a BFD section.  */
 
+static void coff_set_alignment_hook PARAMS ((bfd *, asection *, PTR));
+
 static void
 coff_set_alignment_hook (abfd, section, scnhdr)
      bfd * abfd;
@@ -893,18 +1098,171 @@ coff_set_alignment_hook (abfd, section, scnhdr)
   struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
   unsigned int i;
 
+#ifdef I960
+  /* Extract ALIGN from 2**ALIGN stored in section header */
   for (i = 0; i < 32; i++)
     if ((1 << i) >= hdr->s_align)
       break;
+#endif
+/* start-sanitize-tic80 */
+#ifdef TIC80COFF
+  /* TI tools hijack bits 8-11 for the alignment */
+  i = (hdr->s_flags >> 8) & 0xF ;
+#endif
+/* end-sanitize-tic80 */
   section->alignment_power = i;
 }
 
-#else /* ! I960 */
+#else /* ! COFF_ALIGN_IN_SECTION_HEADER */
+#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 PARAMS ((bfd *, asection *, PTR));
+
+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 PARAMS ((bfd *, asection *, PTR));
+
+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 /* ! I960 */
+#endif /* ! RS6000COFF_C */
+#endif /* ! COFF_WITH_PE */
+#endif /* ! COFF_ALIGN_IN_SECTION_HEADER */
+
+#ifndef coff_mkobject
+
+static boolean coff_mkobject PARAMS ((bfd *));
 
 static boolean
 coff_mkobject (abfd)
@@ -914,21 +1272,22 @@ coff_mkobject (abfd)
 
   abfd->tdata.coff_obj_data = (struct coff_tdata *) bfd_zalloc (abfd, sizeof (coff_data_type));
   if (abfd->tdata.coff_obj_data == 0)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    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->relocbase = 0;
+  coff->local_toc_sym_map = 0;
+
 /*  make_abs_section(abfd);*/
+
   return true;
 }
+#endif
 
 /* Create the COFF backend specific information.  */
-
+#ifndef coff_mkobject_hook
 static PTR
 coff_mkobject_hook (abfd, filehdr, aouthdr)
      bfd * abfd;
@@ -960,8 +1319,38 @@ coff_mkobject_hook (abfd, filehdr, aouthdr)
     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
+
+#ifdef ARM 
+  /* Set the flags field from the COFF header read in */
+  if (! _bfd_coff_arm_set_private_flags (abfd, internal_f->f_flags))
+    coff->flags = 0;
+#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
@@ -982,6 +1371,12 @@ coff_set_arch_mach_hook (abfd, filehdr)
   machine = 0;
   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:
@@ -991,7 +1386,6 @@ coff_set_arch_mach_hook (abfd, filehdr)
       machine = 0;
       break;
 #endif
-
 #ifdef A29K_MAGIC_BIG
     case A29K_MAGIC_BIG:
     case A29K_MAGIC_LITTLE:
@@ -999,7 +1393,21 @@ coff_set_arch_mach_hook (abfd, filehdr)
       machine = 0;
       break;
 #endif
-
+#ifdef ARMMAGIC
+    case ARMMAGIC:
+      arch = bfd_arch_arm;
+      switch (internal_f->f_flags & F_ARM_ARCHITECTURE_MASK)
+       {
+       case F_ARM_2:  machine = bfd_mach_arm_2;  break;
+       case F_ARM_2a: machine = bfd_mach_arm_2a; break;
+       case F_ARM_3:  machine = bfd_mach_arm_3;  break;
+       default:
+       case F_ARM_3M: machine = bfd_mach_arm_3M; break;
+       case F_ARM_4:  machine = bfd_mach_arm_4;  break;
+       case F_ARM_4T: machine = bfd_mach_arm_4T; break;
+       }
+      break;
+#endif
 #ifdef MC68MAGIC
     case MC68MAGIC:
     case M68MAGIC:
@@ -1013,7 +1421,7 @@ coff_set_arch_mach_hook (abfd, filehdr)
     case LYNXCOFFMAGIC:
 #endif
       arch = bfd_arch_m68k;
-      machine = 68020;
+      machine = bfd_mach_m68020;
       break;
 #endif
 #ifdef MC88MAGIC
@@ -1040,6 +1448,11 @@ coff_set_arch_mach_hook (abfd, filehdr)
        }
       break;
 #endif
+#ifdef I860
+    case I860MAGIC:
+      arch = bfd_arch_i860;
+      break;
+#endif
 #ifdef I960
 #ifdef I960ROMAGIC
     case I960ROMAGIC:
@@ -1066,22 +1479,85 @@ coff_set_arch_mach_hook (abfd, filehdr)
        case F_I960KA:
          machine = bfd_mach_i960_ka_sa;
          break;
-         /* start-sanitize-i960xl */
-       case F_I960XL:
-         machine = bfd_mach_i960_xl;
+       case F_I960JX:
+         machine = bfd_mach_i960_jx;
+         break;
+       case F_I960HX:
+         machine = bfd_mach_i960_hx;
          break;
-         /* end-sanitize-i960xl */
        }
       break;
 #endif
 #endif
 
-#ifdef U802ROMAGIC
+#ifdef RS6000COFF_C
     case U802ROMAGIC:
     case U802WRMAGIC:
     case U802TOCMAGIC:
-      arch = bfd_arch_rs6000;
-      machine = 6000;
+      {
+       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
 
@@ -1110,6 +1586,15 @@ coff_set_arch_mach_hook (abfd, filehdr)
       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 SH_ARCH_MAGIC_BIG
     case SH_ARCH_MAGIC_BIG:
     case SH_ARCH_MAGIC_LITTLE:
@@ -1135,6 +1620,20 @@ coff_set_arch_mach_hook (abfd, filehdr)
       break;
 #endif
 
+#ifdef TIC30MAGIC
+    case TIC30MAGIC:
+      arch = bfd_arch_tic30;
+      break;
+#endif
+
+/* start-sanitize-tic80 */
+#ifdef TIC80_ARCH_MAGIC
+    case TIC80_ARCH_MAGIC:
+      arch = bfd_arch_tic80;
+      break;
+#endif
+/* end-sanitize-tic80 */
+
     default:                   /* Unreadable input file type */
       arch = bfd_arch_obscure;
       break;
@@ -1146,6 +1645,9 @@ coff_set_arch_mach_hook (abfd, filehdr)
 
 #ifdef SYMNAME_IN_DEBUG
 
+static boolean symname_in_debug_hook
+  PARAMS ((bfd *, struct internal_syment *));
+
 static boolean
 symname_in_debug_hook (abfd, sym)
      bfd * abfd;
@@ -1161,67 +1663,251 @@ symname_in_debug_hook (abfd, sym)
 
 #endif
 
-/*
-SUBSUBSECTION
-       Writing relocations
+#ifdef RS6000COFF_C
 
-       To write relocations, the back end steps though the
-       canonical relocation table and create an
-       @code{internal_reloc}. The symbol index to use is removed from
-       the @code{offset} field in the symbol table supplied.  The
-       address comes directly from the sum of the section base
-       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.
+/* 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_write_relocs (abfd)
-     bfd * abfd;
+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;
 {
-  asection *s;
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      unsigned int i;
-      struct external_reloc dst;
+  int class = symbol->u.syment.n_sclass;
 
-      arelent **p = s->orelocation;
-      if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0)
-       return false;
-      for (i = 0; i < s->reloc_count; i++)
+  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)
        {
-         struct internal_reloc n;
-         arelent *q = p[i];
-         memset ((PTR) & n, 0, sizeof (n));
+         aux->u.auxent.x_csect.x_scnlen.p =
+           table_base + aux->u.auxent.x_csect.x_scnlen.l;
+         aux->fix_scnlen = 1;
+       }
 
-         n.r_vaddr = q->address + s->vma;
+      /* Return true to indicate that the caller should not do any
+         further work on this auxent.  */
+      return true;
+    }
 
-#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)
-           {
-             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 ();
+  /* 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
+
+       To write relocations, the back end steps though the
+       canonical relocation table and create an
+       @code{internal_reloc}. The symbol index to use is removed from
+       the @code{offset} field in the symbol table supplied.  The
+       address comes directly from the sum of the section base
+       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.
+
+*/
+
+#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;
+{
+  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 (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)
+             {
+               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;
 #endif
@@ -1236,6 +1922,11 @@ coff_write_relocs (abfd)
          if (bfd_write ((PTR) & dst, 1, RELSZ, abfd) != RELSZ)
            return false;
        }
+
+#ifdef TARG_AUX
+      if (p != NULL)
+       free (p);
+#endif
     }
 
   return true;
@@ -1247,7 +1938,7 @@ coff_write_relocs (abfd)
 static boolean
 coff_set_flags (abfd, magicp, flagsp)
      bfd * abfd;
-     unsigned *magicp;
+     unsigned int *magicp;
      unsigned short *flagsp;
 {
   switch (bfd_get_arch (abfd))
@@ -1299,11 +1990,12 @@ coff_set_flags (abfd, magicp, flagsp)
          case bfd_mach_i960_ka_sa:
            flags = F_I960KA;
            break;
-           /* start-sanitize-i960xl */
-         case bfd_mach_i960_xl:
-           flags = F_I960XL;
+         case bfd_mach_i960_jx:
+           flags = F_I960JX;
+           break;
+         case bfd_mach_i960_hx:
+           flags = F_I960HX;
            break;
-           /* end-sanitize-i960xl */
          default:
            return false;
          }
@@ -1312,6 +2004,53 @@ coff_set_flags (abfd, magicp, flagsp)
       }
       break;
 #endif
+
+#ifdef TIC30MAGIC
+    case bfd_arch_tic30:
+      *magicp = TIC30MAGIC;
+      return true;
+#endif
+/* start-sanitize-tic80 */
+#ifdef TIC80_ARCH_MAGIC
+    case bfd_arch_tic80:
+      *magicp = TIC80_ARCH_MAGIC;
+      return true;
+#endif
+/* end-sanitize-tic80 */
+#ifdef ARMMAGIC
+    case bfd_arch_arm:
+      * magicp = ARMMAGIC;
+      * flagsp = 0;
+      if (APCS_SET (abfd))
+       {
+         if (APCS_26_FLAG (abfd))
+           * flagsp |= F_APCS26;
+         
+         if (APCS_FLOAT_FLAG (abfd))
+           * flagsp |= F_APCS_FLOAT;
+         
+         if (PIC_FLAG (abfd))
+           * flagsp |= F_PIC;
+       }
+      if (INTERWORK_SET (abfd) && INTERWORK_FLAG (abfd))
+       * flagsp |= F_INTERWORK;
+      switch (bfd_get_mach (abfd))
+       {
+       case bfd_mach_arm_2:  * flagsp |= F_ARM_2;  break;
+       case bfd_mach_arm_2a: * flagsp |= F_ARM_2a; break;
+       case bfd_mach_arm_3:  * flagsp |= F_ARM_3;  break;
+       case bfd_mach_arm_3M: * flagsp |= F_ARM_3M; break;
+       case bfd_mach_arm_4:  * flagsp |= F_ARM_4;  break;
+       case bfd_mach_arm_4T: * flagsp |= F_ARM_4T; break;
+       }
+      return true;
+#endif
+#ifdef PPCMAGIC
+    case bfd_arch_powerpc:
+      *magicp = PPCMAGIC;
+      return true;
+      break;
+#endif
 #ifdef I386MAGIC
     case bfd_arch_i386:
       *magicp = I386MAGIC;
@@ -1322,13 +2061,24 @@ coff_set_flags (abfd, magicp, flagsp)
       return true;
       break;
 #endif
+#ifdef I860MAGIC
+    case bfd_arch_i860:
+      *magicp = I860MAGIC;
+      return true;
+      break;
+#endif
 #ifdef MC68MAGIC
     case bfd_arch_m68k:
 #ifdef APOLLOM68KMAGIC
       *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;
 #endif
+#endif
 #ifdef LYNXOS
       /* Just overwrite the usual value if we're doing Lynx. */
       *magicp = LYNXCOFFMAGIC;
@@ -1353,13 +2103,16 @@ coff_set_flags (abfd, magicp, flagsp)
        case bfd_mach_h8300h:
          *magicp = H8300HMAGIC;
          return true;
+       case bfd_mach_h8300s:
+         *magicp = H8300SMAGIC;
+         return true;
        }
       break;
 #endif
 
 #ifdef SH_ARCH_MAGIC_BIG
     case bfd_arch_sh:
-      if (abfd->xvec->byteorder_big_p)
+      if (bfd_big_endian (abfd))
        *magicp = SH_ARCH_MAGIC_BIG;
       else
        *magicp = SH_ARCH_MAGIC_LITTLE;
@@ -1386,7 +2139,7 @@ coff_set_flags (abfd, magicp, flagsp)
 #endif
 #ifdef A29K_MAGIC_BIG
     case bfd_arch_a29k:
-      if (abfd->xvec->byteorder_big_p)
+      if (bfd_big_endian (abfd))
        *magicp = A29K_MAGIC_BIG;
       else
        *magicp = A29K_MAGIC_LITTLE;
@@ -1403,7 +2156,9 @@ coff_set_flags (abfd, magicp, flagsp)
 
 #ifdef U802TOCMAGIC
     case bfd_arch_rs6000:
+#ifndef PPCMAGIC
     case bfd_arch_powerpc:
+#endif
       *magicp = U802TOCMAGIC;
       return true;
       break;
@@ -1441,33 +2196,125 @@ coff_set_arch_mach (abfd, arch, machine)
 
 /* Calculate the file position for each section. */
 
-static void
+#ifndef I960
+#define ALIGN_SECTIONS_IN_FILE
+#endif
+/* start-sanitize-tic80 */
+#ifdef TIC80COFF
+#undef ALIGN_SECTIONS_IN_FILE
+#endif
+/* end-sanitize-tic80 */
+
+static boolean
 coff_compute_section_file_positions (abfd)
      bfd * abfd;
 {
   asection *current;
   asection *previous = (asection *) NULL;
   file_ptr sofar = FILHSZ;
-#ifndef I960
+  boolean align_adjust;
+  unsigned int count;
+#ifdef ALIGN_SECTIONS_IN_FILE
   file_ptr old_sofar;
 #endif
-  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.  */
+         case it will need an optional header to record it.  */
       abfd->flags |= EXEC_P;
     }
 
   if (abfd->flags & EXEC_P)
     sofar += AOUTSZ;
+#ifdef RS6000COFF_C
+  else if (xcoff_data (abfd)->full_aouthdr)
+    sofar += AOUTSZ;
+  else
+    sofar += SMALL_AOUTSZ;
+#endif
 
   sofar += abfd->section_count * SCNHSZ;
+
+#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
+
+  align_adjust = false;
   for (current = abfd->sections, count = 1;
        current != (asection *) NULL;
        current = current->next, ++count)
     {
+#ifdef COFF_IMAGE_WITH_PE
+      /* The NT loader does not want empty section headers, so we omit
+         them.  We don't actually remove the section from the BFD,
+         although we probably should.  This matches code in
+         coff_write_object_contents.  */
+      if (current->_raw_size == 0)
+       {
+         current->target_index = -1;
+         --count;
+         continue;
+       }
+#endif
+
       current->target_index = count;
 
       /* Only deal with sections which have contents */
@@ -1478,37 +2325,84 @@ coff_compute_section_file_positions (abfd)
         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 */
+#ifdef ALIGN_SECTIONS_IN_FILE
+      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
 
-#ifdef COFF_PAGE_SIZE
       /* 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) % COFF_PAGE_SIZE;
+       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)
+           return false;
+       }
+      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)
+           return false;
+       }
+      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
+
+#ifdef ALIGN_SECTIONS_IN_FILE
       /* 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);
+         align_adjust = current->_raw_size != old_size;
+         sofar += current->_raw_size - old_size;
+       }
+      else
+       {
+         old_sofar = sofar;
+         sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+         align_adjust = sofar != old_sofar;
+         current->_raw_size += sofar - old_sofar;
+       }
+#endif
+
+#ifdef COFF_IMAGE_WITH_PE
+      /* For PE we need to make sure we pad out to the aligned
+         _raw_size, in case the caller only writes out data to the
+         unaligned _raw_size.  */
+      if (pei_section_data (abfd, current)->virt_size < current->_raw_size)
+       align_adjust = true;
 #endif
 
 #ifdef _LIB
@@ -1521,11 +2415,38 @@ coff_compute_section_file_positions (abfd)
 
       previous = current;
     }
+
+  /* It is now safe to write to the output file.  If we needed an
+     alignment adjustment for the last section, then make sure that
+     there is a byte at offset sofar.  If there are no symbols and no
+     relocs, then nothing follows the last section.  If we don't force
+     the last byte out, then the file may appear to be truncated.  */
+  if (align_adjust)
+    {
+      bfd_byte b;
+
+      b = 0;
+      if (bfd_seek (abfd, sofar - 1, SEEK_SET) != 0
+         || bfd_write (&b, 1, 1, abfd) != 1)
+       return false;
+    }
+
+  /* Make sure the relocations are aligned.  We don't need to make
+     sure that this byte exists, because it will only matter if there
+     really are relocs.  */
+  sofar = BFD_ALIGN (sofar, 1 << COFF_DEFAULT_SECTION_ALIGNMENT_POWER);
+
   obj_relocbase (abfd) = sofar;
   abfd->output_has_begun = true;
+
+  return true;
 }
 
-#ifndef RS6000COFF_C
+#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
@@ -1575,12 +2496,9 @@ coff_add_missing_symbols (abfd)
   if (!need_text && !need_data && !need_bss && !need_file)
     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 (abfd, nsyms * sizeof (asymbol *));
   if (!sympp2)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
   memcpy (sympp2, sympp, i * sizeof (asymbol *));
   if (need_file)
     {
@@ -1598,7 +2516,7 @@ coff_add_missing_symbols (abfd)
   return true;
 }
 
-#endif /* ! defined (RS6000COFF_C) */
+#endif /* 0 */
 
 /* SUPPRESS 558 */
 /* SUPPRESS 529 */
@@ -1609,31 +2527,37 @@ coff_write_object_contents (abfd)
   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_set_error (bfd_error_system_call);
 
-  if (abfd->output_has_begun == false)
-    coff_compute_section_file_positions (abfd);
-
-  reloc_base = obj_relocbase (abfd);
-
   /* 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;
 
+  if (abfd->output_has_begun == false)
+    {
+      if (! coff_compute_section_file_positions (abfd))
+       return false;
+    }
+
+  reloc_base = obj_relocbase (abfd);
+
   /* Work out the size of the reloc and linno areas */
 
   for (current = abfd->sections; current != NULL; current =
@@ -1670,103 +2594,292 @@ coff_write_object_contents (abfd)
 
   /* Write section headers to the file.  */
   internal_f.f_nscns = 0;
-  if (bfd_seek (abfd,
-               (file_ptr) ((abfd->flags & EXEC_P) ?
-                           (FILHSZ + AOUTSZ) : FILHSZ),
-               SEEK_SET)
-      != 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
+    }
+
+  if (bfd_seek (abfd, scn_base, SEEK_SET) != 0)
     return false;
 
-  {
-    for (current = abfd->sections;
-        current != NULL;
-        current = current->next)
-      {
-       struct internal_scnhdr section;
+  long_section_names = false;
+  for (current = abfd->sections;
+       current != NULL;
+       current = current->next)
+    {
+      struct internal_scnhdr section;
 
-       internal_f.f_nscns++;
-       strncpy (&(section.s_name[0]), current->name, 8);
-#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
+#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
-         section.s_vaddr = current->lma;
-       section.s_paddr = current->lma;
-       section.s_size = current->_raw_size;
-       /*
-          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;
-
-       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))
+
+#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.  */
+      {
+       size_t len;
+
+       len = strlen (current->name);
+       if (len > SCNNMLEN)
          {
-           bss_sec = current;
+           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
+#endif
+      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);
+/* start-sanitize-tic80 */
+#else
+#ifdef TIC80COFF
+      section.s_flags |= (current->alignment_power & 0xF) << 8;
+#endif
+/* end-sanitize-tic80 */
+#endif
 
+#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;
-
-         coff_swap_scnhdr_out (abfd, &section, &buff);
-         if (bfd_write ((PTR) (&buff), 1, SCNHSZ, abfd) != SCNHSZ)
+         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 = NULL;
+         asymbol **psymsec;
+
+         psymsec = NULL;
+         count = bfd_get_symcount (abfd);
+         for (i = 0, psym = abfd->outsymbols; i < count; i++, psym++)
+           {
+             if ((*psym)->section != current)
+               continue;
+
+             /* Remember the location of the first symbol in this
+                 section.  */
+             if (psymsec == NULL)
+               psymsec = psym;
+
+             /* See if this is the section symbol.  */
+             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;
+
+                 /* Here *PSYM is the section symbol for CURRENT.  */
+
+                 break;
+               }
+           }
+
+         /* 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;
+               }
+
+             /* The COMDAT symbol must be the first symbol from this
+                 section in the symbol table.  In order to make this
+                 work, we move the COMDAT symbol before the first
+                 symbol we found in the search above.  It's OK to
+                 rearrange the symbol table at this point, because
+                 coff_renumber_symbols is going to rearrange it
+                 further and fix up all the aux entries.  */
+             if (psym != psymsec)
+               {
+                 asymbol *hold;
+                 asymbol **pcopy;
+
+                 hold = *psym;
+                 for (pcopy = psym; pcopy > psymsec; pcopy--)
+                   pcopy[0] = pcopy[-1];
+                 *psymsec = hold;
+               }
+           }
        }
-      }
-  }
+#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;
 
   internal_f.f_flags = 0;
@@ -1774,7 +2887,15 @@ coff_write_object_contents (abfd)
   if (abfd->flags & EXEC_P)
     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;
@@ -1783,15 +2904,29 @@ coff_write_object_contents (abfd)
   if (abfd->flags & EXEC_P)
     internal_f.f_flags |= F_EXEC;
 
-  if (!abfd->xvec->byteorder_big_p)
+  /* 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.
-    */
+/* start-sanitize-tic80 */
+#ifdef TIC80_TARGET_ID
+  internal_f.f_target_id = TIC80_TARGET_ID;
+#endif
+/* end-sanitize-tic80 */
+
+  /*
+     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);
 
@@ -1808,16 +2943,27 @@ coff_write_object_contents (abfd)
 #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.
-   */
+     * 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 */
+      internal_a.magic = SHMAGIC; /* Shared magic */
     else
 #endif /* ULTRA3 */
-      internal_a.magic = NMAGIC;/* Assume separate i/d */
+      internal_a.magic = NMAGIC; /* Assume separate i/d */
 #define __A_MAGIC_SET__
 #endif /* A29K */
+/* start-sanitize-tic80 */
+#ifdef TIC80COFF
+    internal_a.magic = TIC80_ARCH_MAGIC;
+#define __A_MAGIC_SET__
+#endif /* TIC80 */
+/* end-sanitize-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);
 #define __A_MAGIC_SET__
@@ -1836,14 +2982,34 @@ coff_write_object_contents (abfd)
 #define __A_MAGIC_SET__
 #if defined(LYNXOS)
     internal_a.magic = LYNXCOFFMAGIC;
-#endif                         /* LYNXOS */
-#endif                         /* M68 || WE32K || M68K */
+#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 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 */
+#else  /* LYNXOS */
     internal_a.magic = ZMAGIC;
 #endif /* LYNXOS */
 #endif /* I386 */
@@ -1851,15 +3017,15 @@ coff_write_object_contents (abfd)
 #if defined(SPARC)
 #define __A_MAGIC_SET__
 #if defined(LYNXOS)
-  internal_a.magic = LYNXCOFFMAGIC;
-#endif                         /* LYNXOS */
-#endif                         /* SPARC */
+    internal_a.magic = LYNXCOFFMAGIC;
+#endif /* LYNXOS */
+#endif /* SPARC */
 
-#if RS6000COFF_C
+#ifdef 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;
+    (abfd->flags & WP_TEXT) ? RS6K_AOUTHDR_NMAGIC :
+    RS6K_AOUTHDR_OMAGIC;
 #endif
 
 #ifndef __A_MAGIC_SET__
@@ -1868,34 +3034,66 @@ coff_write_object_contents (abfd)
 #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)
     {
-#ifndef RS6000COFF_C
+      int firstundef;
+#if 0
       if (!coff_add_missing_symbols (abfd))
        return false;
 #endif
-      if (!coff_renumber_symbols (abfd))
+      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))
+      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;
+    {
+      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
     {
-      internal_f.f_symptr = 0;
+      if (long_section_names)
+       internal_f.f_symptr = sym_base;
+      else
+       internal_f.f_symptr = 0;
       internal_f.f_flags |= F_LSYMS;
     }
 
@@ -1912,27 +3110,119 @@ coff_write_object_contents (abfd)
   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 = 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);
-    if (bfd_write ((PTR) buff, 1, FILHSZ, abfd) != FILHSZ)
+    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);
-      if (bfd_write ((PTR) & buff, 1, AOUTSZ, abfd) != AOUTSZ)
+      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;
 }
 
@@ -1945,15 +3235,49 @@ coff_set_section_contents (abfd, section, location, offset, count)
      bfd_size_type count;
 {
   if (abfd->output_has_begun == false) /* set by bfd.c handler */
-    coff_compute_section_file_positions (abfd);
+    {
+      if (! coff_compute_section_file_positions (abfd))
+       return false;
+    }
+
+#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> */
+
+    if (strcmp (section->name, _LIB) == 0)
+      {
+       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);
+      }
 
-#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;
 #endif
 
   /* Don't write out bss sections - one way to do this is to
@@ -1991,8 +3315,7 @@ coff_close_and_cleanup (abfd)
        return false;
       }
 
-  /* We depend on bfd_close to free all the memory on the obstack.  */
-  /* FIXME if bfd_release is not using obstacks! */
+  /* We depend on bfd_close to free all the memory on the objalloc.  */
   return true;
 }
 
@@ -2007,10 +3330,7 @@ buy_and_read (abfd, where, seek_direction, size)
 {
   PTR area = (PTR) bfd_alloc (abfd, size);
   if (!area)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return (NULL);
-    }
+    return (NULL);
   if (bfd_seek (abfd, where, seek_direction) != 0
       || bfd_read (area, 1, size, abfd) != size)
     return (NULL);
@@ -2056,10 +3376,7 @@ coff_slurp_line_table (abfd, asect)
   lineno_cache =
     (alent *) bfd_alloc (abfd, (size_t) ((asect->lineno_count + 1) * sizeof (alent)));
   if (lineno_cache == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
   else
     {
       unsigned int counter = 0;
@@ -2074,10 +3391,34 @@ coff_slurp_line_table (abfd, asect)
 
          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
+                 || (unsigned long) 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
@@ -2107,10 +3448,9 @@ coff_slurp_symbol_table (abfd)
   unsigned int *table_ptr;
 
   unsigned int number_of_symbols = 0;
+
   if (obj_symbols (abfd))
     return true;
-  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
-    return false;
 
   /* Read in the symbol table */
   if ((native_symbols = coff_get_normalized_symtab (abfd)) == NULL)
@@ -2125,20 +3465,14 @@ coff_slurp_symbol_table (abfd)
                             * sizeof (coff_symbol_type))));
 
   if (cached_area == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }                          /* on error */
+    return false;
   table_ptr = ((unsigned int *)
               bfd_alloc (abfd,
                          (obj_raw_syment_count (abfd)
                           * sizeof (unsigned int))));
 
   if (table_ptr == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
   else
     {
       coff_symbol_type *dst = cached_area;
@@ -2165,15 +3499,28 @@ coff_slurp_symbol_table (abfd)
 #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.flags |= BSF_NOT_AT_END | BSF_FUNCTION;
 #endif
              /* Fall through to next case */
 
 #endif
 
            case C_EXT:
+#if defined ARM
+            case C_THUMBEXT:
+            case C_THUMBEXTFUNC:
+#endif
 #ifdef RS6000COFF_C
            case C_HIDEXT:
+#endif
+#ifdef C_SYSTEM
+           case C_SYSTEM:      /* System Wide variable */
+#endif
+#ifdef COFF_WITH_PE
+            /* PE uses storage class 0x68 to denote a section symbol */
+            case C_SECTION:
+           /* PE uses storage class 0x69 for a weak external symbol.  */
+           case C_NT_WEAK:
 #endif
              if ((src->u.syment.n_scnum) == 0)
                {
@@ -2190,39 +3537,40 @@ coff_slurp_symbol_table (abfd)
                }
              else
                {
-                 /*
-           Base the value as an index from the base of the
-           section
-           */
+                 /* 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 defined COFF_WITH_PE
+                 /* PE sets the symbol to a value relative to the
+                     start of the section.  */
+                 dst->symbol.value = src->u.syment.n_value;
+#else
+                 dst->symbol.value = (src->u.syment.n_value
+                                      - dst->symbol.section->vma);
+#endif
 
                  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;
+                     /* A function ext does not go at the end of a
+                        file.  */
+                     dst->symbol.flags |= BSF_NOT_AT_END | BSF_FUNCTION;
                    }
                }
 
 #ifdef RS6000COFF_C
-             /* If this symbol has a csect aux of type LD, the scnlen field
-          is actually the index of the containing csect symbol.  We
-          need to pointerize it.  */
+             /* 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)
-               {
-                 combined_entry_type *aux;
+               dst->symbol.flags |= BSF_NOT_AT_END;
+#endif
 
-                 aux = src + src->u.syment.n_numaux - 1;
-                 if (SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp) == XTY_LD)
-                   {
-                     aux->u.auxent.x_csect.x_scnlen.p =
-                       native_symbols + aux->u.auxent.x_csect.x_scnlen.l;
-                     aux->fix_scnlen = 1;
-                   }
-               }
+#ifdef COFF_WITH_PE
+             if (src->u.syment.n_sclass == C_NT_WEAK)
+               dst->symbol.flags = BSF_WEAK;
 #endif
 
              break;
@@ -2230,21 +3578,33 @@ coff_slurp_symbol_table (abfd)
            case C_STAT:        /* static                        */
 #ifdef I960
            case C_LEAFSTAT:    /* static leaf procedure        */
+#endif
+#if defined ARM 
+            case C_THUMBSTAT:   /* Thumb static                  */
+            case C_THUMBLABEL:  /* Thumb label                   */
+            case C_THUMBSTATFUNC:/* Thumb static function        */
 #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
-         */
+
+             /* 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;
+               {
+#if defined COFF_WITH_PE
+                 /* PE sets the symbol to a value relative to the
+                     start of the section.  */
+                 dst->symbol.value = src->u.syment.n_value;
+#else
+                 dst->symbol.value = (src->u.syment.n_value
+                                      - dst->symbol.section->vma);
+#endif
+               }
              else
-               dst->symbol.value = (src->u.syment.n_value);
+               dst->symbol.value = src->u.syment.n_value;
              break;
 
            case C_MOS: /* member of structure   */
@@ -2256,9 +3616,15 @@ coff_slurp_symbol_table (abfd)
 #endif
            case C_REGPARM:     /* register parameter            */
            case C_REG: /* register variable             */
+/* start-sanitize-tic80 */
+#ifndef TIC80COFF
+/* end-sanitize-tic80 */
 #ifdef C_AUTOARG
            case C_AUTOARG:     /* 960-specific storage class */
 #endif
+/* start-sanitize-tic80 */
+#endif
+/* end-sanitize-tic80 */
            case C_TPDEF:       /* type definition               */
            case C_ARG:
            case C_AUTO:        /* automatic variable */
@@ -2274,14 +3640,14 @@ coff_slurp_symbol_table (abfd)
            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_BCOMM:
+           case C_ECOMM:
            case C_DECL:
            case C_ENTRY:
            case C_FUN:
@@ -2292,42 +3658,89 @@ coff_slurp_symbol_table (abfd)
              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;
-             dst->symbol.value = src->u.syment.n_value;
 
-             /* The value is actually a symbol index.  Save a pointer to
-          the symbol instead of the index.  FIXME: This should use a
-          union.  */
+             /* 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_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;
+#if defined COFF_WITH_PE
+             /* PE sets the symbol to a value relative to the start
+                of the section.  */
+             dst->symbol.value = src->u.syment.n_value;
+#else
+             /* Base the value as an index from the base of the
+                section.  */
+             dst->symbol.value = (src->u.syment.n_value
+                                  - dst->symbol.section->vma);
+#endif
              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
+/* start-sanitize-tic80 */
+             /* New storage classes for TIc80 */
+#ifdef TIC80COFF
+           case C_UEXT:        /* Tentative external definition */
+#endif
+           case C_STATLAB:     /* Static load time label */
+           case C_EXTLAB:      /* External load time label */
+/* end-sanitize-tic80 */
            case C_HIDDEN:      /* ext symbol in dmert public lib */
            default:
-
-             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();*/
+             (*_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;
@@ -2374,20 +3787,24 @@ coff_slurp_symbol_table (abfd)
 #define OTHER_GLOBAL_CLASS C_LEAFEXT
 #endif
 
-#ifdef RS6000COFF_C
-#define OTHER_GLOBAL_CLASS C_HIDEXT
+#ifdef COFFARM
+#define OTHER_GLOBAL_CLASS C_THUMBEXT || syment->n_sclass == C_THUMBEXTFUNC
+#else
+#ifdef COFF_WITH_PE
+#define OTHER_GLOBAL_CLASS C_SECTION
+#endif
 #endif
 
 #ifdef OTHER_GLOBAL_CLASS
 
+static boolean coff_sym_is_global PARAMS ((bfd *, struct internal_syment *));
+
 static boolean
 coff_sym_is_global (abfd, syment)
-     bfd *abfd;
-     struct internal_syment *syment;
+     bfd * abfd;
+     struct internal_syment * syment;
 {
-  if (syment->n_sclass == OTHER_GLOBAL_CLASS)
-    return true;
-  return false;
+  return (syment->n_sclass == OTHER_GLOBAL_CLASS);
 }
 
 #undef OTHER_GLOBAL_CLASS
@@ -2479,48 +3896,48 @@ coff_slurp_reloc_table (abfd, asect, symbols)
     bfd_alloc (abfd, (size_t) (asect->reloc_count * sizeof (arelent)));
 
   if (reloc_cache == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
 
 
   for (idx = 0; idx < asect->reloc_count; idx++)
     {
-#ifdef RELOC_PROCESSING
       struct internal_reloc dst;
       struct external_reloc *src;
-
-      cache_ptr = reloc_cache + idx;
-      src = native_relocs + idx;
-      coff_swap_reloc_in (abfd, src, &dst);
-
-      RELOC_PROCESSING (cache_ptr, &dst, symbols, abfd, asect);
-#else
-      struct internal_reloc dst;
+#ifndef RELOC_PROCESSING
       asymbol *ptr;
-      struct external_reloc *src;
+#endif
 
       cache_ptr = reloc_cache + idx;
       src = native_relocs + idx;
 
       coff_swap_reloc_in (abfd, src, &dst);
 
-
+#ifdef RELOC_PROCESSING
+      RELOC_PROCESSING (cache_ptr, &dst, symbols, abfd, asect);
+#else
       cache_ptr->address = dst.r_vaddr;
 
       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 = NULL;
+           }
+         else
+           {
+             cache_ptr->sym_ptr_ptr = (symbols
+                                       + obj_convert (abfd)[dst.r_symndx]);
+             ptr = *(cache_ptr->sym_ptr_ptr);
+           }
        }
       else
        {
          cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-         ptr = 0;
+         ptr = NULL;
        }
 
       /* The symbols definitions that we have read in have been
@@ -2538,8 +3955,16 @@ coff_slurp_reloc_table (abfd, asect, symbols)
 
       /* Fill in the cache_ptr->howto field from dst.r_type */
       RTYPE2HOWTO (cache_ptr, &dst);
-#endif
+#endif /* RELOC_PROCESSING */
 
+      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;
@@ -2636,6 +4061,10 @@ coff_sym_filepos (abfd)
 #ifndef coff_reloc16_estimate
 #define coff_reloc16_estimate dummy_reloc16_estimate
 
+static int dummy_reloc16_estimate
+  PARAMS ((bfd *, asection *, arelent *, unsigned int,
+          struct bfd_link_info *));
+
 static int
 dummy_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
      bfd *abfd;
@@ -2650,8 +4079,15 @@ dummy_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
 #endif
 
 #ifndef coff_reloc16_extra_cases
+
 #define coff_reloc16_extra_cases dummy_reloc16_extra_cases
+
 /* This works even if abort is not declared in any header file.  */
+
+static void dummy_reloc16_extra_cases
+  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
+          bfd_byte *, unsigned int *, unsigned int *));
+
 static void
 dummy_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
                           dst_ptr)
@@ -2663,7 +4099,6 @@ 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
@@ -2682,55 +4117,189 @@ dummy_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 #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
+
+#ifndef coff_link_output_has_begun
+#define coff_link_output_has_begun _coff_link_output_has_begun
+static boolean
+_coff_link_output_has_begun (abfd, info)
+     bfd * abfd;
+     struct bfd_link_info * info;
+{
+  return abfd->output_has_begun;
+}
+#endif
+
+#ifndef coff_final_link_postscript
+#define coff_final_link_postscript _coff_final_link_postscript
+static boolean
+_coff_final_link_postscript (abfd, pfinfo)
+     bfd * abfd;
+     struct coff_final_link_info * pfinfo;
+{
+  return true;
+}
+#endif
+
+#ifndef coff_SWAP_aux_in
+#define coff_SWAP_aux_in coff_swap_aux_in
+#endif
+#ifndef coff_SWAP_sym_in
+#define coff_SWAP_sym_in coff_swap_sym_in
+#endif
+#ifndef coff_SWAP_lineno_in
+#define coff_SWAP_lineno_in coff_swap_lineno_in
+#endif
+#ifndef coff_SWAP_aux_out
+#define coff_SWAP_aux_out coff_swap_aux_out
+#endif
+#ifndef coff_SWAP_sym_out
+#define coff_SWAP_sym_out coff_swap_sym_out
+#endif
+#ifndef coff_SWAP_lineno_out
+#define coff_SWAP_lineno_out coff_swap_lineno_out
+#endif
+#ifndef coff_SWAP_reloc_out
+#define coff_SWAP_reloc_out coff_swap_reloc_out
+#endif
+#ifndef coff_SWAP_filehdr_out
+#define coff_SWAP_filehdr_out coff_swap_filehdr_out
+#endif
+#ifndef coff_SWAP_aouthdr_out
+#define coff_SWAP_aouthdr_out coff_swap_aouthdr_out
+#endif
+#ifndef coff_SWAP_scnhdr_out
+#define coff_SWAP_scnhdr_out coff_swap_scnhdr_out
+#endif
+#ifndef coff_SWAP_reloc_in
+#define coff_SWAP_reloc_in coff_swap_reloc_in
+#endif
+#ifndef coff_SWAP_filehdr_in
+#define coff_SWAP_filehdr_in coff_swap_filehdr_in
+#endif
+#ifndef coff_SWAP_aouthdr_in
+#define coff_SWAP_aouthdr_in coff_swap_aouthdr_in
+#endif
+#ifndef coff_SWAP_scnhdr_in
+#define coff_SWAP_scnhdr_in coff_swap_scnhdr_in
+#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,
+  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,
 #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_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_DEFAULT_SECTION_ALIGNMENT_POWER,
+  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_relocate_section, coff_rtype_to_howto, coff_adjust_symndx
+  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
+  coff_adjust_symndx, coff_link_add_one_symbol,
+  coff_link_output_has_begun, coff_final_link_postscript
 };
 
-#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_close_and_cleanup
+#define        coff_close_and_cleanup              _bfd_generic_close_and_cleanup
+#endif
+
+#ifndef coff_bfd_free_cached_info
+#define coff_bfd_free_cached_info           _bfd_generic_bfd_free_cached_info
+#endif
+
+#ifndef coff_get_section_contents
+#define        coff_get_section_contents           _bfd_generic_get_section_contents
+#endif
+
+#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
+
+#ifndef coff_bfd_merge_private_bfd_data
+#define coff_bfd_merge_private_bfd_data     _bfd_generic_bfd_merge_private_bfd_data
+#endif
+
+#ifndef coff_bfd_set_private_flags
+#define coff_bfd_set_private_flags          _bfd_generic_bfd_set_private_flags
+#endif
+
+#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_name
+#define coff_bfd_is_local_label_name       _bfd_coff_is_local_label_name
+#endif
 
-#define coff_bfd_copy_private_section_data \
-  _bfd_generic_bfd_copy_private_section_data
-#define coff_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
+#ifndef coff_read_minisymbols
+#define coff_read_minisymbols              _bfd_generic_read_minisymbols
+#endif
 
-#ifndef coff_bfd_is_local_label
-#define coff_bfd_is_local_label bfd_generic_is_local_label
+#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 _bfd_norelocs_bfd_reloc_type_lookup
+#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
-#define coff_bfd_relax_section bfd_generic_relax_section
+#endif
+
+#ifndef coff_bfd_relax_section
+#define coff_bfd_relax_section             bfd_generic_relax_section
+#endif
+
+#ifndef coff_bfd_gc_sections
+#define coff_bfd_gc_sections               bfd_generic_gc_sections
+#endif
This page took 0.055864 seconds and 4 git commands to generate.