Special handling of AIX xcoff text alignment fix.
[deliverable/binutils-gdb.git] / bfd / coffcode.h
index 1f393946dcb8965135a463e6fb1f9222094a020d..b5bd4429c779b8726c93bf99a138aac41f9a2f9e 100644 (file)
@@ -1,5 +1,6 @@
 /* Support for the generic parts of most COFF variants, for BFD.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001
    Free Software Foundation, Inc.
    Written by Cygnus Support.
 
@@ -131,7 +132,7 @@ SUBSUBSECTION
        moment. To port BFD, that person will have to add more @code{#defines}.
        Three of the bit twiddling routines are exported to
        @code{gdb}; @code{coff_swap_aux_in}, @code{coff_swap_sym_in}
-       and @code{coff_swap_linno_in}. @code{GDB} reads the symbol
+       and @code{coff_swap_lineno_in}. @code{GDB} reads the symbol
        table on its own, but uses BFD to fix things up.  More of the
        bit twiddlers are exported for @code{gas};
        @code{coff_swap_aux_out}, @code{coff_swap_sym_out},
@@ -175,7 +176,6 @@ SUBSUBSECTION
        the file in the string  table. This pass moves all strings
        into memory and replaces them with pointers to the strings.
 
-
        The symbol table is massaged once again, this time to create
        the canonical table used by the BFD application. Each symbol
        is inspected in turn, and a decision made (using the
@@ -248,39 +248,37 @@ CODE_FRAGMENT
 .
 .typedef struct coff_ptr_struct
 .{
+.  {* Remembers the offset from the first symbol in the file for
+.     this symbol. Generated by coff_renumber_symbols. *}
+.  unsigned int offset;
 .
-.       {* Remembers the offset from the first symbol in the file for
-.          this symbol. Generated by coff_renumber_symbols. *}
-.unsigned int offset;
-.
-.       {* Should the value of this symbol be renumbered.  Used for
-.          XCOFF C_BSTAT symbols.  Set by coff_slurp_symbol_table.  *}
-.unsigned int fix_value : 1;
-.
-.       {* Should the tag field of this symbol be renumbered.
-.          Created by coff_pointerize_aux. *}
-.unsigned int fix_tag : 1;
+.  {* Should the value of this symbol be renumbered.  Used for
+.     XCOFF C_BSTAT symbols.  Set by coff_slurp_symbol_table.  *}
+.  unsigned int fix_value : 1;
 .
-.       {* Should the endidx field of this symbol be renumbered.
-.          Created by coff_pointerize_aux. *}
-.unsigned int fix_end : 1;
+.  {* Should the tag field of this symbol be renumbered.
+.     Created by coff_pointerize_aux. *}
+.  unsigned int fix_tag : 1;
 .
-.       {* Should the x_csect.x_scnlen field be renumbered.
-.          Created by coff_pointerize_aux. *}
-.unsigned int fix_scnlen : 1;
+.  {* Should the endidx field of this symbol be renumbered.
+.     Created by coff_pointerize_aux. *}
+.  unsigned int fix_end : 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;
+.  {* Should the x_csect.x_scnlen field be renumbered.
+.     Created by coff_pointerize_aux. *}
+.  unsigned int fix_scnlen : 1;
 .
-.       {* The container for the symbol structure as read and translated
-.           from the file. *}
+.  {* 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;
 .
-.union {
-.   union internal_auxent auxent;
-.   struct internal_syment syment;
-. } u;
+.  {* The container for the symbol structure as read and translated
+.     from the file. *}
+.  union
+.  {
+.    union internal_auxent auxent;
+.    struct internal_syment syment;
+.  } u;
 .} combined_entry_type;
 .
 .
@@ -288,20 +286,19 @@ CODE_FRAGMENT
 .
 .typedef struct coff_symbol_struct
 .{
-.   {* The actual symbol which the rest of BFD works with *}
-.asymbol symbol;
+.  {* The actual symbol which the rest of BFD works with *}
+.  asymbol symbol;
 .
-.   {* A pointer to the hidden information for this symbol *}
-.combined_entry_type *native;
+.  {* A pointer to the hidden information for this symbol *}
+.  combined_entry_type *native;
 .
-.   {* A pointer to the linenumber information for this symbol *}
-.struct lineno_cache_entry *lineno;
+.  {* A pointer to the linenumber information for this symbol *}
+.  struct lineno_cache_entry *lineno;
 .
-.   {* Have the line numbers been relocated yet ? *}
-.boolean done_lineno;
+.  {* Have the line numbers been relocated yet ? *}
+.  boolean done_lineno;
 .} coff_symbol_type;
 
-
 */
 
 #ifdef COFF_WITH_PE
@@ -313,23 +310,24 @@ CODE_FRAGMENT
 #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 styp_to_sec_flags
+  PARAMS ((bfd *, PTR, const char *, asection *, flagword *));
 static boolean coff_bad_format_hook PARAMS ((bfd *, PTR));
 static void coff_set_custom_section_alignment
   PARAMS ((bfd *, asection *, const struct coff_section_alignment_entry *,
-          unsigned int));
+          const unsigned int));
 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));
+  PARAMS ((bfd *, enum bfd_architecture, unsigned long)) ATTRIBUTE_UNUSED;
 static boolean coff_compute_section_file_positions PARAMS ((bfd *));
-static boolean coff_write_object_contents PARAMS ((bfd *));
+static boolean coff_write_object_contents PARAMS ((bfd *)) ATTRIBUTE_UNUSED;
 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 PTR buy_and_read PARAMS ((bfd *, file_ptr, bfd_size_type));
 static boolean coff_slurp_line_table PARAMS ((bfd *, asection *));
 static boolean coff_slurp_symbol_table PARAMS ((bfd *));
 static enum coff_symbol_classification coff_classify_symbol
@@ -340,18 +338,35 @@ static long coff_canonicalize_reloc
 #ifndef coff_mkobject_hook
 static PTR coff_mkobject_hook PARAMS ((bfd *, PTR,  PTR));
 #endif
+#ifdef COFF_WITH_PE
+static flagword handle_COMDAT PARAMS ((bfd *, flagword, PTR, const char *, asection *));
+#endif
 \f
 /* void warning(); */
 
-/*
- * Return a word with STYP_* (scnhdr.s_flags) flags set to represent the
- * incoming SEC_* flags.  The inverse of this function is styp_to_sec_flags().
- * NOTE: If you add to/change this routine, you should mirror the changes
- *     in styp_to_sec_flags().
- */
+/* Return a word with STYP_* (scnhdr.s_flags) flags set to represent
+   the incoming SEC_* flags.  The inverse of this function is
+   styp_to_sec_flags().  NOTE: If you add to/change this routine, you
+   should probably mirror the changes in styp_to_sec_flags().  */
+
+#ifndef COFF_WITH_PE
+
+/* Macros for setting debugging flags.  */
+#ifdef STYP_DEBUG
+#define STYP_XCOFF_DEBUG STYP_DEBUG
+#else
+#define STYP_XCOFF_DEBUG STYP_INFO
+#endif
+
+#ifdef COFF_ALIGN_IN_S_FLAGS
+#define STYP_DEBUG_INFO STYP_DSECT
+#else
+#define STYP_DEBUG_INFO STYP_INFO
+#endif
+
 static long
 sec_to_styp_flags (sec_name, sec_flags)
-     CONST char *sec_name;
+     const char *sec_name;
      flagword sec_flags;
 {
   long styp_flags = 0;
@@ -386,22 +401,22 @@ sec_to_styp_flags (sec_name, sec_flags)
       styp_flags = STYP_LIT;
 #endif /* _LIT */
     }
-  else if (!strcmp (sec_name, ".debug"))
+  else if (!strncmp (sec_name, ".debug", 6))
     {
-#ifdef STYP_DEBUG
-      styp_flags = STYP_DEBUG;
-#else
-      styp_flags = STYP_INFO;
-#endif
+      /* Handle the XCOFF debug section and DWARF2 debug sections.  */
+      if (!sec_name[6])
+        styp_flags = STYP_XCOFF_DEBUG;
+      else
+        styp_flags = STYP_DEBUG_INFO;
     }
   else if (!strncmp (sec_name, ".stab", 5))
     {
-      styp_flags = STYP_INFO;
+      styp_flags = STYP_DEBUG_INFO;
     }
-#ifdef COFF_WITH_PE
-  else if (!strcmp (sec_name, ".edata"))
+#ifdef COFF_LONG_SECTION_NAMES
+  else if (!strncmp (sec_name, ".gnu.linkonce.wi.", 17))
     {
-      styp_flags = STYP_DATA;
+      styp_flags = STYP_DEBUG_INFO;
     }
 #endif
 #ifdef RS6000COFF_C
@@ -413,6 +428,14 @@ sec_to_styp_flags (sec_name, sec_flags)
     {
       styp_flags = STYP_LOADER;
     }
+  else if (!strcmp (sec_name, _EXCEPT))
+    {
+      styp_flags = STYP_EXCEPT;
+    }
+  else if (!strcmp (sec_name, _TYPCHK))
+    {
+      styp_flags = STYP_TYPCHK;
+    }
 #endif
   /* Try and figure out what it should be */
   else if (sec_flags & SEC_CODE)
@@ -440,42 +463,127 @@ sec_to_styp_flags (sec_name, sec_flags)
       styp_flags = STYP_BSS;
     }
 
+#ifdef STYP_CLINK
+  if (sec_flags & SEC_CLINK)
+    styp_flags |= STYP_CLINK;
+#endif
+
+#ifdef STYP_BLOCK
+  if (sec_flags & SEC_BLOCK)
+    styp_flags |= STYP_BLOCK;
+#endif
+
 #ifdef STYP_NOLOAD
   if ((sec_flags & (SEC_NEVER_LOAD | SEC_COFF_SHARED_LIBRARY)) != 0)
     styp_flags |= STYP_NOLOAD;
 #endif
 
-#ifdef COFF_WITH_PE
+  return styp_flags;
+}
+
+#else /* COFF_WITH_PE */
+
+/* The PE version; see above for the general comments.  The non-PE
+   case seems to be more guessing, and breaks PE format; specifically,
+   .rdata is readonly, but it sure ain't text.  Really, all this
+   should be set up properly in gas (or whatever assembler is in use),
+   and honor whatever objcopy/strip, etc. sent us as input.  */
+
+static long
+sec_to_styp_flags (sec_name, sec_flags)
+     const char *sec_name ATTRIBUTE_UNUSED;
+     flagword sec_flags;
+{
+  long styp_flags = 0;
+
+  /* caution: there are at least three groups of symbols that have
+     very similar bits and meanings: IMAGE_SCN*, SEC_*, and STYP_*.
+     SEC_* are the BFD internal flags, used for generic BFD
+     information.  STYP_* are the COFF section flags which appear in
+     COFF files.  IMAGE_SCN_* are the PE section flags which appear in
+     PE files.  The STYP_* flags and the IMAGE_SCN_* flags overlap,
+     but there are more IMAGE_SCN_* flags.  */
+
+  /* skip LOAD */
+  /* READONLY later */
+  /* skip RELOC */
+  if ((sec_flags & SEC_CODE) != 0)
+    styp_flags |= IMAGE_SCN_CNT_CODE;
+  if ((sec_flags & SEC_DATA) != 0)
+    styp_flags |= IMAGE_SCN_CNT_INITIALIZED_DATA;
+  if ((sec_flags & SEC_ALLOC) != 0 && (sec_flags & SEC_LOAD) == 0)
+    styp_flags |= IMAGE_SCN_CNT_UNINITIALIZED_DATA;  /* ==STYP_BSS */
+  /* skip ROM */
+  /* skip constRUCTOR */
+  /* skip CONTENTS */
+#ifdef STYP_NOLOAD
+  if ((sec_flags & (SEC_NEVER_LOAD | SEC_COFF_SHARED_LIBRARY)) != 0)
+    styp_flags |= STYP_NOLOAD;
+#endif
+  if ((sec_flags & SEC_IS_COMMON) != 0)
+    styp_flags |= IMAGE_SCN_LNK_COMDAT;
+  if ((sec_flags & SEC_DEBUGGING) != 0)
+    styp_flags |= IMAGE_SCN_MEM_DISCARDABLE;
+  if ((sec_flags & SEC_EXCLUDE) != 0)
+    styp_flags |= IMAGE_SCN_LNK_REMOVE;
+  if ((sec_flags & SEC_NEVER_LOAD) != 0)
+    styp_flags |= IMAGE_SCN_LNK_REMOVE;
+  /* skip IN_MEMORY */
+  /* skip SORT */
   if (sec_flags & SEC_LINK_ONCE)
     styp_flags |= IMAGE_SCN_LNK_COMDAT;
+  /* skip LINK_DUPLICATES */
+  /* skip LINKER_CREATED */
+
+  /* For now, the read/write bits are mapped onto SEC_READONLY, even
+     though the semantics don't quite match.  The bits from the input
+     are retained in pei_section_data(abfd, section)->pe_flags */
+
+  styp_flags |= IMAGE_SCN_MEM_READ;       /* always readable.  */
+  if ((sec_flags & SEC_READONLY) == 0)
+    styp_flags |= IMAGE_SCN_MEM_WRITE;    /* Invert READONLY for write */
+  if (sec_flags & SEC_CODE)
+    styp_flags |= IMAGE_SCN_MEM_EXECUTE;  /* CODE->EXECUTE */
   if (sec_flags & SEC_SHARED)
-    styp_flags |= IMAGE_SCN_MEM_SHARED;
-#endif
+    styp_flags |= IMAGE_SCN_MEM_SHARED;   /* Shared remains meaningful */
 
-  return (styp_flags);
+  return styp_flags;
 }
-/*
- * Return a word with SEC_* flags set to represent the incoming
- * STYP_* flags (from scnhdr.s_flags).   The inverse of this
- * function is sec_to_styp_flags().
- * NOTE: If you add to/change this routine, you should mirror the changes
- *      in sec_to_styp_flags().
- */
-static flagword
-styp_to_sec_flags (abfd, hdr, name)
+
+#endif /* COFF_WITH_PE */
+
+/* Return a word with SEC_* flags set to represent the incoming STYP_*
+   flags (from scnhdr.s_flags).  The inverse of this function is
+   sec_to_styp_flags().  NOTE: If you add to/change this routine, you
+   should probably mirror the changes in sec_to_styp_flags().  */
+
+#ifndef COFF_WITH_PE
+
+static boolean
+styp_to_sec_flags (abfd, hdr, name, section, flags_ptr)
      bfd *abfd ATTRIBUTE_UNUSED;
      PTR hdr;
      const char *name;
+     asection *section ATTRIBUTE_UNUSED;
+     flagword *flags_ptr;
 {
   struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
   long styp_flags = internal_s->s_flags;
   flagword sec_flags = 0;
 
+#ifdef STYP_BLOCK
+  if (styp_flags & STYP_BLOCK)
+    sec_flags |= SEC_BLOCK;
+#endif
+
+#ifdef STYP_CLINK
+  if (styp_flags & STYP_CLINK)
+    sec_flags |= SEC_CLINK;
+#endif
+
 #ifdef STYP_NOLOAD
   if (styp_flags & STYP_NOLOAD)
-    {
-      sec_flags |= SEC_NEVER_LOAD;
-    }
+    sec_flags |= SEC_NEVER_LOAD;
 #endif /* STYP_NOLOAD */
 
   /* For 386 COFF, at least, an unloadable text or data section is
@@ -516,9 +624,7 @@ styp_to_sec_flags (abfd, hdr, name)
 #endif
     }
   else if (styp_flags & STYP_PAD)
-    {
-      sec_flags = 0;
-    }
+    sec_flags = 0;
   else if (strcmp (name, _TEXT) == 0)
     {
       if (sec_flags & SEC_NEVER_LOAD)
@@ -542,9 +648,12 @@ styp_to_sec_flags (abfd, hdr, name)
 #endif
        sec_flags |= SEC_ALLOC;
     }
-  else if (strcmp (name, ".debug") == 0
+  else if (strncmp (name, ".debug", 6) == 0
 #ifdef _COMMENT
           || strcmp (name, _COMMENT) == 0
+#endif
+#ifdef COFF_LONG_SECTION_NAMES
+          || strncmp (name, ".gnu.linkonce.wi.", 17) == 0
 #endif
           || strncmp (name, ".stab", 5) == 0)
     {
@@ -558,144 +667,422 @@ styp_to_sec_flags (abfd, hdr, name)
 #endif
 #ifdef _LIT
   else if (strcmp (name, _LIT) == 0)
-    {
-      sec_flags = SEC_LOAD | SEC_ALLOC | SEC_READONLY;
-    }
+    sec_flags = SEC_LOAD | SEC_ALLOC | SEC_READONLY;
 #endif
   else
-    {
-      sec_flags |= SEC_ALLOC | SEC_LOAD;
-    }
+    sec_flags |= SEC_ALLOC | SEC_LOAD;
 
 #ifdef STYP_LIT                        /* A29k readonly text/data section type */
   if ((styp_flags & STYP_LIT) == STYP_LIT)
-    {
-      sec_flags = (SEC_LOAD | SEC_ALLOC | SEC_READONLY);
-    }
+    sec_flags = (SEC_LOAD | SEC_ALLOC | SEC_READONLY);
 #endif /* STYP_LIT */
+
 #ifdef STYP_OTHER_LOAD         /* Other loaded sections */
   if (styp_flags & STYP_OTHER_LOAD)
-    {
-      sec_flags = (SEC_LOAD | SEC_ALLOC);
-    }
+    sec_flags = (SEC_LOAD | SEC_ALLOC);
 #endif /* STYP_SDATA */
 
-#ifdef COFF_WITH_PE
-  if (styp_flags & IMAGE_SCN_LNK_REMOVE)
-    sec_flags |= SEC_EXCLUDE;
+#if defined (COFF_LONG_SECTION_NAMES) && defined (COFF_SUPPORT_GNU_LINKONCE)
+  /* As a GNU extension, if the name begins with .gnu.linkonce, we
+     only link a single copy of the section.  This is used to support
+     g++.  g++ will emit each template expansion in its own section.
+     The symbols will be defined as weak, so that multiple definitions
+     are permitted.  The GNU linker extension is to actually discard
+     all but one of the sections.  */
+  if (strncmp (name, ".gnu.linkonce", sizeof ".gnu.linkonce" - 1) == 0)
+    sec_flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
+#endif
 
-  if (styp_flags & IMAGE_SCN_MEM_SHARED)
-    sec_flags |= SEC_SHARED;
+  if (flags_ptr == NULL)
+    return false;
 
-  if (styp_flags & IMAGE_SCN_LNK_COMDAT)
+  * flags_ptr = sec_flags;
+  return true;
+}
+
+#else /* COFF_WITH_PE */
+
+static flagword
+handle_COMDAT (abfd, sec_flags, hdr, name, section)
+     bfd * abfd;
+     flagword sec_flags;
+     PTR hdr;
+     const char *name;
+     asection *section;
+{
+  struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
+  bfd_byte *esymstart, *esym, *esymend;
+  int seen_state = 0;
+  char *target_name = NULL;
+
+  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.  */
+
+  /* COMDAT sections are special.  The first symbol is the section
+     symbol, which tells what kind of COMDAT section it is.  The
+     second symbol is the "comdat symbol" - the one with the
+     unique name.  GNU uses the section symbol for the unique
+     name; MS uses ".text" for every comdat section.  Sigh.  - DJ */
+
+  /* This is not mirrored in sec_to_styp_flags(), but there
+     doesn't seem to be a need to, either, and it would at best be
+     rather messy.  */
+
+  if (! _bfd_coff_get_external_symbols (abfd))
+    return sec_flags;
+
+  esymstart = esym = (bfd_byte *) obj_coff_external_syms (abfd);
+  esymend = esym + obj_raw_syment_count (abfd) * bfd_coff_symesz (abfd);
+
+  while (esym < esymend)
     {
-      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.  */
-
-      /* COMDAT sections are special.  The first symbol is the section
-        symbol, which tells what kind of COMDAT section it is.  The
-        *second* symbol is the "comdat symbol" - the one with the
-        unique name.  GNU uses the section symbol for the unique
-        name; MS uses ".text" for every comdat section.  Sigh.  - DJ */
-
-      if (_bfd_coff_get_external_symbols (abfd))
+      struct internal_syment isym;
+      char buf[SYMNMLEN + 1];
+      const char *symname;
+
+      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &isym);
+
+      if (sizeof (internal_s->s_name) > SYMNMLEN)
        {
-         bfd_byte *esym, *esymend;
+         /* This case implies that the matching
+            symbol name will be in the string table.  */
+         abort ();
+       }
 
-         esym = (bfd_byte *) obj_coff_external_syms (abfd);
-         esymend = esym + obj_raw_syment_count (abfd) * SYMESZ;
+      if (isym.n_scnum == section->target_index)
+       {
+         /* According to the MSVC documentation, the first
+            TWO entries with the section # are both of
+            interest to us.  The first one is the "section
+            symbol" (section name).  The second is the comdat
+            symbol name.  Here, we've found the first
+            qualifying entry; we distinguish it from the
+            second with a state flag.
+
+            In the case of gas-generated (at least until that
+            is fixed) .o files, it isn't necessarily the
+            second one.  It may be some other later symbol.
+
+            Since gas also doesn't follow MS conventions and
+            emits the section similar to .text$<name>, where
+            <something> is the name we're looking for, we
+            distinguish the two as follows:
+
+            If the section name is simply a section name (no
+            $) we presume it's MS-generated, and look at
+            precisely the second symbol for the comdat name.
+            If the section name has a $, we assume it's
+            gas-generated, and look for <something> (whatever
+            follows the $) as the comdat symbol.  */
+
+         /* All 3 branches use this */
+         symname = _bfd_coff_internal_syment_name (abfd, &isym, buf);
+
+         if (symname == NULL)
+           abort ();
 
-         while (esym < esymend)
+         switch (seen_state)
            {
-             struct internal_syment isym;
+           case 0:
+             {
+               /* The first time we've seen the symbol.  */
+               union internal_auxent aux;
+
+               seen_state = 1;
+
+               /* If it isn't the stuff we're expecting, die;
+                  The MS documentation is vague, but it
+                  appears that the second entry serves BOTH
+                  as the comdat symbol and the defining
+                  symbol record (either C_STAT or C_EXT,
+                  possibly with an aux entry with debug
+                  information if it's a function.)  It
+                  appears the only way to find the second one
+                  is to count.  (On Intel, they appear to be
+                  adjacent, but on Alpha, they have been
+                  found separated.)
+
+                  Here, we think we've found the first one,
+                  but there's some checking we can do to be
+                  sure.  */
+
+               if (! (isym.n_sclass == C_STAT
+                      && isym.n_type == T_NULL
+                      && isym.n_value == 0))
+                 abort ();
 
-             bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &isym);
+               /* FIXME LATER: MSVC generates section names
+                  like .text for comdats.  Gas generates
+                  names like .text$foo__Fv (in the case of a
+                  function).  See comment above for more.  */
 
-             if (sizeof (internal_s->s_name) > SYMNMLEN)
-               {
-                 /* This case implies that the matching symbol name
-                     will be in the string table.  */
+               if (strcmp (name, symname) != 0)
                  abort ();
-               }
 
-             if (isym.n_sclass == C_STAT
-                 && isym.n_type == T_NULL
-                 && isym.n_numaux == 1)
-               {
-                 char buf[SYMNMLEN + 1];
-                 const char *symname;
+               /* This is the section symbol.  */
+               bfd_coff_swap_aux_in (abfd, (PTR) (esym + bfd_coff_symesz (abfd)),
+                                     isym.n_type, isym.n_sclass,
+                                     0, isym.n_numaux, (PTR) &aux);
 
-                 symname = _bfd_coff_internal_syment_name (abfd, &isym, buf);
-                 if (symname == NULL)
-                   abort ();
+               target_name = strchr (name, '$');
+               if (target_name != NULL)
+                 {
+                   /* Gas mode.  */
+                   seen_state = 2;
+                   /* Skip the `$'.  */
+                   target_name += 1;
+                 }
 
-                 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);
-
-                     /* FIXME: Microsoft uses NODUPLICATES and
-                        ASSOCIATIVE, but gnu uses ANY and SAME_SIZE.
-                        Unfortunately, gnu doesn't do the comdat
-                        symbols right.  So, until we can fix it to do
-                        the right thing, we are temporarily disabling
-                        comdats for the MS types (they're used in
-                        DLLs and C++, but we don't support *their*
-                        C++ libraries anyway - DJ */
-
-                     switch (aux.x_scn.x_comdat)
-                       {
-                       case IMAGE_COMDAT_SELECT_NODUPLICATES:
-#if 0
-                         sec_flags |= SEC_LINK_DUPLICATES_ONE_ONLY;
+               /* FIXME: Microsoft uses NODUPLICATES and
+                  ASSOCIATIVE, but gnu uses ANY and
+                  SAME_SIZE.  Unfortunately, gnu doesn't do
+                  the comdat symbols right.  So, until we can
+                  fix it to do the right thing, we are
+                  temporarily disabling comdats for the MS
+                  types (they're used in DLLs and C++, but we
+                  don't support *their* C++ libraries anyway
+                  - DJ.  */
+
+               /* Cygwin does not follow the MS style, and
+                  uses ANY and SAME_SIZE where NODUPLICATES
+                  and ASSOCIATIVE should be used.  For
+                  Interix, we just do the right thing up
+                  front.  */
+
+               switch (aux.x_scn.x_comdat)
+                 {
+                 case IMAGE_COMDAT_SELECT_NODUPLICATES:
+#ifdef STRICT_PE_FORMAT
+                   sec_flags |= SEC_LINK_DUPLICATES_ONE_ONLY;
 #else
-                         sec_flags &= ~SEC_LINK_ONCE;
+                   sec_flags &= ~SEC_LINK_ONCE;
 #endif
-                         break;
+                   break;
 
-                       default:
-                       case IMAGE_COMDAT_SELECT_ANY:
-                         sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
-                         break;
+                 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_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_EXACT_MATCH:
+                   /* Not yet fully implemented ??? */
+                   sec_flags |= SEC_LINK_DUPLICATES_SAME_CONTENTS;
+                   break;
 
-                       case IMAGE_COMDAT_SELECT_ASSOCIATIVE:
-#if 0
-                         /* FIXME: This is not currently implemented.  */
-                         sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
+                   /* debug$S gets this case; other
+                      implications ??? */
+
+                   /* There may be no symbol... we'll search
+                      the whole table... Is this the right
+                      place to play this game? Or should we do
+                      it when reading it in.  */
+                 case IMAGE_COMDAT_SELECT_ASSOCIATIVE:
+#ifdef STRICT_PE_FORMAT
+                   /* FIXME: This is not currently implemented.  */
+                   sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
 #else
-                         sec_flags &= ~SEC_LINK_ONCE;
+                   sec_flags &= ~SEC_LINK_ONCE;
 #endif
-                         break;
-                       }
+                   break;
 
-                     break;
-                   }
+                 default:  /* 0 means "no symbol" */
+                   /* debug$F gets this case; other
+                      implications ??? */
+                   sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
+                   break;
+                 }
+             }
+             break;
+
+           case 2:
+             /* Gas mode: the first matching on partial name.  */
+
+#ifndef TARGET_UNDERSCORE
+#define TARGET_UNDERSCORE 0
+#endif
+             /* Is this the name we're looking for? */
+             if (strcmp (target_name,
+                         symname + (TARGET_UNDERSCORE ? 1 : 0)) != 0)
+               {
+                 /* Not the name we're looking for */
+                 esym += (isym.n_numaux + 1) * bfd_coff_symesz (abfd);
+                 continue;
                }
+             /* Fall through.  */
+           case 1:
+             /* MSVC mode: the lexically second symbol (or
+                drop through from the above).  */
+             {
+               char *newname;
+               bfd_size_type amt;
+
+               /* This must the second symbol with the
+                  section #.  It is the actual symbol name.
+                  Intel puts the two adjacent, but Alpha (at
+                  least) spreads them out.  */
 
-             esym += (isym.n_numaux + 1) * SYMESZ;
+               amt = sizeof (struct bfd_comdat_info);
+               section->comdat = bfd_alloc (abfd, amt);
+               if (section->comdat == NULL)
+                 abort ();
+
+               section->comdat->symbol =
+                 (esym - esymstart) / bfd_coff_symesz (abfd);
+
+               amt = strlen (symname) + 1;
+               newname = bfd_alloc (abfd, amt);
+               if (newname == NULL)
+                 abort ();
+
+               strcpy (newname, symname);
+               section->comdat->name = newname;
+             }
+
+             goto breakloop;
            }
        }
+
+      esym += (isym.n_numaux + 1) * bfd_coff_symesz (abfd);
     }
+
+ breakloop:
+  return sec_flags;
+}
+
+
+/* The PE version; see above for the general comments.
+
+   Since to set the SEC_LINK_ONCE and associated flags, we have to
+   look at the symbol table anyway, we return the symbol table index
+   of the symbol being used as the COMDAT symbol.  This is admittedly
+   ugly, but there's really nowhere else that we have access to the
+   required information.  FIXME: Is the COMDAT symbol index used for
+   any purpose other than objdump?  */
+
+static boolean
+styp_to_sec_flags (abfd, hdr, name, section, flags_ptr)
+     bfd *abfd;
+     PTR hdr;
+     const char *name;
+     asection *section;
+     flagword *flags_ptr;
+{
+  struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
+  long styp_flags = internal_s->s_flags;
+  flagword sec_flags;
+  boolean result = true;
+
+  /* Assume read only unless IMAGE_SCN_MEM_WRITE is specified.  */
+  sec_flags = SEC_READONLY;
+
+  /* Process each flag bit in styp_flags in turn.  */
+  while (styp_flags)
+    {
+      long flag = styp_flags & - styp_flags;
+      char * unhandled = NULL;
+
+      styp_flags &= ~ flag;
+
+      /* We infer from the distinct read/write/execute bits the settings
+        of some of the bfd flags; the actual values, should we need them,
+        are also in pei_section_data (abfd, section)->pe_flags.  */
+
+      switch (flag)
+       {
+       case STYP_DSECT:
+         unhandled = "STYP_DSECT";
+         break;
+       case STYP_GROUP:
+         unhandled = "STYP_GROUP";
+         break;
+       case STYP_COPY:
+         unhandled = "STYP_COPY";
+         break;
+       case STYP_OVER:
+         unhandled = "STYP_OVER";
+         break;
+#ifdef SEC_NEVER_LOAD
+       case STYP_NOLOAD:
+         sec_flags |= SEC_NEVER_LOAD;
+         break;
 #endif
+       case IMAGE_SCN_MEM_READ:
+         /* Ignored, assume it always to be true.  */
+         break;
+       case IMAGE_SCN_TYPE_NO_PAD:
+         /* Skip.  */
+         break;
+       case IMAGE_SCN_LNK_OTHER:
+         unhandled = "IMAGE_SCN_LNK_OTHER";
+         break;
+       case IMAGE_SCN_MEM_NOT_CACHED:
+         unhandled = "IMAGE_SCN_MEM_NOT_CACHED";
+         break;
+       case IMAGE_SCN_MEM_NOT_PAGED:
+         unhandled = "IMAGE_SCN_MEM_NOT_PAGED";
+         break;
+       case IMAGE_SCN_MEM_EXECUTE:
+         sec_flags |= SEC_CODE;
+         break;
+       case IMAGE_SCN_MEM_WRITE:
+         sec_flags &= ~ SEC_READONLY;
+         break;
+       case IMAGE_SCN_MEM_DISCARDABLE:
+         sec_flags |= SEC_DEBUGGING;
+         break;
+       case IMAGE_SCN_MEM_SHARED:
+         sec_flags |= SEC_SHARED;
+         break;
+       case IMAGE_SCN_LNK_REMOVE:
+         sec_flags |= SEC_EXCLUDE;
+         break;
+       case IMAGE_SCN_CNT_CODE:
+         sec_flags |= SEC_CODE | SEC_ALLOC | SEC_LOAD;
+         break;
+       case IMAGE_SCN_CNT_INITIALIZED_DATA:
+         sec_flags |= SEC_DATA | SEC_ALLOC | SEC_LOAD;
+         break;
+       case IMAGE_SCN_CNT_UNINITIALIZED_DATA:
+         sec_flags |= SEC_ALLOC;
+         break;
+       case IMAGE_SCN_LNK_INFO:
+         /* We mark these as SEC_DEBUGGING, but only if COFF_PAGE_SIZE is
+            defined.  coff_compute_section_file_positions uses
+            COFF_PAGE_SIZE to ensure that the low order bits of the
+            section VMA and the file offset match.  If we don't know
+            COFF_PAGE_SIZE, we can't ensure the correct correspondence,
+            and demand page loading of the file will fail.  */
+#ifdef COFF_PAGE_SIZE
+         sec_flags |= SEC_DEBUGGING;
+#endif
+         break;
+       case IMAGE_SCN_LNK_COMDAT:
+         /* COMDAT gets very special treatment.  */
+         sec_flags = handle_COMDAT (abfd, sec_flags, hdr, name, section);
+         break;
+       default:
+         /* Silently ignore for now.  */
+         break;
+       }
+
+      /* If the section flag was not handled, report it here.  */
+      if (unhandled != NULL)
+       {
+         (*_bfd_error_handler)
+           (_("%s (%s): Section flag %s (0x%x) ignored"),
+            bfd_archive_filename (abfd), name, unhandled, flag);
+         result = false;
+       }
+    }
 
 #if defined (COFF_LONG_SECTION_NAMES) && defined (COFF_SUPPORT_GNU_LINKONCE)
   /* As a GNU extension, if the name begins with .gnu.linkonce, we
@@ -708,9 +1095,14 @@ styp_to_sec_flags (abfd, hdr, name)
     sec_flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
 #endif
 
-  return (sec_flags);
+  if (flags_ptr)
+    * flags_ptr = sec_flags;
+
+  return result;
 }
 
+#endif /* COFF_WITH_PE */
+
 #define        get_index(symbol)       ((symbol)->udata.i)
 
 /*
@@ -738,230 +1130,166 @@ CODE_FRAGMENT
 Special entry points for gdb to swap in coff symbol table parts:
 .typedef struct
 .{
-.  void (*_bfd_coff_swap_aux_in) PARAMS ((
-.       bfd            *abfd,
-.       PTR             ext,
-.       int             type,
-.       int             class,
-.       int             indaux,
-.       int             numaux,
-.       PTR             in));
+.  void (*_bfd_coff_swap_aux_in)
+.    PARAMS ((bfd *, PTR, int, int, int, int, PTR));
 .
-.  void (*_bfd_coff_swap_sym_in) PARAMS ((
-.       bfd            *abfd ,
-.       PTR             ext,
-.       PTR             in));
+.  void (*_bfd_coff_swap_sym_in)
+.    PARAMS ((bfd *, PTR, PTR));
 .
-.  void (*_bfd_coff_swap_lineno_in) PARAMS ((
-.       bfd            *abfd,
-.       PTR            ext,
-.       PTR             in));
+.  void (*_bfd_coff_swap_lineno_in)
+.    PARAMS ((bfd *, PTR, PTR));
 .
-
-Special entry points for gas to swap out coff parts:
-
-. unsigned int (*_bfd_coff_swap_aux_out) PARAMS ((
-.       bfd    *abfd,
-.       PTR    in,
-.       int            type,
-.       int            class,
-.       int     indaux,
-.       int     numaux,
-.       PTR            ext));
+.  unsigned int (*_bfd_coff_swap_aux_out)
+.    PARAMS ((bfd *, PTR, int, int, int, int, PTR));
 .
-. unsigned int (*_bfd_coff_swap_sym_out) PARAMS ((
-.      bfd      *abfd,
-.      PTR     in,
-.      PTR     ext));
+.  unsigned int (*_bfd_coff_swap_sym_out)
+.    PARAMS ((bfd *, PTR, PTR));
 .
-. unsigned int (*_bfd_coff_swap_lineno_out) PARAMS ((
-.              bfd     *abfd,
-.              PTR     in,
-.      PTR     ext));
+.  unsigned int (*_bfd_coff_swap_lineno_out)
+.    PARAMS ((bfd *, PTR, PTR));
 .
-. unsigned int (*_bfd_coff_swap_reloc_out) PARAMS ((
-.              bfd     *abfd,
-.      PTR     src,
-.      PTR     dst));
+.  unsigned int (*_bfd_coff_swap_reloc_out)
+.    PARAMS ((bfd *, PTR, PTR));
 .
-. unsigned int (*_bfd_coff_swap_filehdr_out) PARAMS ((
-.              bfd     *abfd,
-.      PTR     in,
-.      PTR     out));
+.  unsigned int (*_bfd_coff_swap_filehdr_out)
+.    PARAMS ((bfd *, PTR, PTR));
 .
-. unsigned int (*_bfd_coff_swap_aouthdr_out) PARAMS ((
-.              bfd     *abfd,
-.      PTR     in,
-.      PTR     out));
+.  unsigned int (*_bfd_coff_swap_aouthdr_out)
+.    PARAMS ((bfd *, PTR, PTR));
 .
-. unsigned int (*_bfd_coff_swap_scnhdr_out) PARAMS ((
-.              bfd     *abfd,
-.              PTR     in,
-.      PTR     out));
+.  unsigned int (*_bfd_coff_swap_scnhdr_out)
+.    PARAMS ((bfd *, PTR, PTR));
 .
-
-Special entry points for generic COFF routines to call target
-dependent COFF routines:
-
-. unsigned int _bfd_filhsz;
-. unsigned int _bfd_aoutsz;
-. unsigned int _bfd_scnhsz;
-. unsigned int _bfd_symesz;
-. unsigned int _bfd_auxesz;
-. unsigned int _bfd_relsz;
-. unsigned int _bfd_linesz;
-. boolean _bfd_coff_long_filenames;
-. boolean _bfd_coff_long_section_names;
-. unsigned int _bfd_coff_default_section_alignment_power;
-. void (*_bfd_coff_swap_filehdr_in) PARAMS ((
-.       bfd     *abfd,
-.       PTR     ext,
-.       PTR     in));
-. void (*_bfd_coff_swap_aouthdr_in) PARAMS ((
-.       bfd     *abfd,
-.       PTR     ext,
-.       PTR     in));
-. void (*_bfd_coff_swap_scnhdr_in) PARAMS ((
-.       bfd     *abfd,
-.       PTR     ext,
-.       PTR     in));
-. void (*_bfd_coff_swap_reloc_in) PARAMS ((
-.       bfd     *abfd,
-.       PTR     ext,
-.       PTR     in));
-. boolean (*_bfd_coff_bad_format_hook) PARAMS ((
-.       bfd     *abfd,
-.       PTR     internal_filehdr));
-. boolean (*_bfd_coff_set_arch_mach_hook) PARAMS ((
-.       bfd     *abfd,
-.       PTR     internal_filehdr));
-. PTR (*_bfd_coff_mkobject_hook) PARAMS ((
-.       bfd     *abfd,
-.       PTR     internal_filehdr,
-.       PTR     internal_aouthdr));
-. flagword (*_bfd_styp_to_sec_flags_hook) PARAMS ((
-.       bfd     *abfd,
-.       PTR     internal_scnhdr,
-.       const char *name));
-. void (*_bfd_set_alignment_hook) PARAMS ((
-.       bfd     *abfd,
-.       asection *sec,
-.       PTR     internal_scnhdr));
-. boolean (*_bfd_coff_slurp_symbol_table) PARAMS ((
-.       bfd     *abfd));
-. 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,
-.       struct bfd_link_order *link_order,
-.       arelent *reloc,
-.       bfd_byte *data,
-.       unsigned int *src_ptr,
-.       unsigned int *dst_ptr));
-. int (*_bfd_coff_reloc16_estimate) PARAMS ((
-.       bfd *abfd,
-.       asection *input_section,
-.       arelent *r,
-.       unsigned int shrink,
-.       struct bfd_link_info *link_info));
-. enum coff_symbol_classification (*_bfd_coff_classify_symbol) PARAMS ((
-.       bfd *abfd,
-.       struct internal_syment *));
-. 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,
-.       bfd *input_bfd,
-.       asection *input_section,
-.       bfd_byte *contents,
-.       struct internal_reloc *relocs,
-.       struct internal_syment *syms,
-.       asection **sections));
-. reloc_howto_type *(*_bfd_coff_rtype_to_howto) PARAMS ((
-.       bfd *abfd,
-.       asection *sec,
-.       struct internal_reloc *rel,
-.       struct coff_link_hash_entry *h,
-.       struct internal_syment *sym,
-.       bfd_vma *addendp));
-. boolean (*_bfd_coff_adjust_symndx) PARAMS ((
-.       bfd *obfd,
-.       struct bfd_link_info *info,
-.       bfd *ibfd,
-.       asection *sec,
-.       struct internal_reloc *reloc,
-.       boolean *adjustedp));
-. boolean (*_bfd_coff_link_add_one_symbol) PARAMS ((
-.       struct bfd_link_info *info,
-.       bfd *abfd,
-.       const char *name,
-.       flagword flags, 
-.       asection *section,
-.       bfd_vma value,
-.       const char *string,
-.       boolean copy,
-.       boolean collect, 
-.       struct bfd_link_hash_entry **hashp));
+.  unsigned int _bfd_filhsz;
+.  unsigned int _bfd_aoutsz;
+.  unsigned int _bfd_scnhsz;
+.  unsigned int _bfd_symesz;
+.  unsigned int _bfd_auxesz;
+.  unsigned int _bfd_relsz;
+.  unsigned int _bfd_linesz;
+.  unsigned int _bfd_filnmlen;
+.  boolean _bfd_coff_long_filenames;
+.  boolean _bfd_coff_long_section_names;
+.  unsigned int _bfd_coff_default_section_alignment_power;
+.  boolean _bfd_coff_force_symnames_in_strings;
+.  unsigned int _bfd_coff_debug_string_prefix_length;
+.
+.  void (*_bfd_coff_swap_filehdr_in)
+.    PARAMS ((bfd *, PTR, PTR));
+.
+.  void (*_bfd_coff_swap_aouthdr_in)
+.    PARAMS ((bfd *, PTR, PTR));
+.
+.  void (*_bfd_coff_swap_scnhdr_in)
+.    PARAMS ((bfd *, PTR, PTR));
+.
+.  void (*_bfd_coff_swap_reloc_in)
+.    PARAMS ((bfd *abfd, PTR, PTR));
+.
+.  boolean (*_bfd_coff_bad_format_hook)
+.    PARAMS ((bfd *, PTR));
+.
+.  boolean (*_bfd_coff_set_arch_mach_hook)
+.    PARAMS ((bfd *, PTR));
+.
+.  PTR (*_bfd_coff_mkobject_hook)
+.    PARAMS ((bfd *, PTR, PTR));
+.
+.  boolean (*_bfd_styp_to_sec_flags_hook)
+.    PARAMS ((bfd *, PTR, const char *, asection *, flagword *));
+.
+.  void (*_bfd_set_alignment_hook)
+.    PARAMS ((bfd *, asection *, PTR));
+.
+.  boolean (*_bfd_coff_slurp_symbol_table)
+.    PARAMS ((bfd *));
 .
-. 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));
+.  boolean (*_bfd_coff_symname_in_debug)
+.    PARAMS ((bfd *, struct internal_syment *));
+.
+.  boolean (*_bfd_coff_pointerize_aux_hook)
+.    PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
+.           unsigned int, combined_entry_type *));
+.
+.  boolean (*_bfd_coff_print_aux)
+.    PARAMS ((bfd *, FILE *, combined_entry_type *, combined_entry_type *,
+.           combined_entry_type *, unsigned int));
+.
+.  void (*_bfd_coff_reloc16_extra_cases)
+.    PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
+.          bfd_byte *, unsigned int *, unsigned int *));
+.
+.  int (*_bfd_coff_reloc16_estimate)
+.    PARAMS ((bfd *, asection *, arelent *, unsigned int,
+.           struct bfd_link_info *));
+.
+.  enum coff_symbol_classification (*_bfd_coff_classify_symbol)
+.    PARAMS ((bfd *, struct internal_syment *));
+.
+.  boolean (*_bfd_coff_compute_section_file_positions)
+.    PARAMS ((bfd *));
+.
+.  boolean (*_bfd_coff_start_final_link)
+.    PARAMS ((bfd *, struct bfd_link_info *));
+.
+.  boolean (*_bfd_coff_relocate_section)
+.    PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
+.           struct internal_reloc *, struct internal_syment *, asection **));
+.
+.  reloc_howto_type *(*_bfd_coff_rtype_to_howto)
+.    PARAMS ((bfd *, asection *, struct internal_reloc *,
+.           struct coff_link_hash_entry *, struct internal_syment *,
+.           bfd_vma *));
+.
+.  boolean (*_bfd_coff_adjust_symndx)\
+.    PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
+.           struct internal_reloc *, boolean *));
+.
+.  boolean (*_bfd_coff_link_add_one_symbol)
+.    PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword,
+.           asection *, bfd_vma, const char *, boolean, boolean,
+.           struct bfd_link_hash_entry **));
+.
+.  boolean (*_bfd_coff_link_output_has_begun)
+.    PARAMS ((bfd *, struct coff_final_link_info *));
+.
+.  boolean (*_bfd_coff_final_link_postscript)
+.    PARAMS ((bfd *, struct coff_final_link_info *));
 .
 .} bfd_coff_backend_data;
 .
-.#define coff_backend_info(abfd) ((bfd_coff_backend_data *) (abfd)->xvec->backend_data)
+.#define coff_backend_info(abfd) \
+.  ((bfd_coff_backend_data *) (abfd)->xvec->backend_data)
 .
 .#define bfd_coff_swap_aux_in(a,e,t,c,ind,num,i) \
-.        ((coff_backend_info (a)->_bfd_coff_swap_aux_in) (a,e,t,c,ind,num,i))
+.  ((coff_backend_info (a)->_bfd_coff_swap_aux_in) (a,e,t,c,ind,num,i))
 .
 .#define bfd_coff_swap_sym_in(a,e,i) \
-.        ((coff_backend_info (a)->_bfd_coff_swap_sym_in) (a,e,i))
+.  ((coff_backend_info (a)->_bfd_coff_swap_sym_in) (a,e,i))
 .
 .#define bfd_coff_swap_lineno_in(a,e,i) \
-.        ((coff_backend_info ( a)->_bfd_coff_swap_lineno_in) (a,e,i))
+.  ((coff_backend_info ( a)->_bfd_coff_swap_lineno_in) (a,e,i))
 .
 .#define bfd_coff_swap_reloc_out(abfd, i, o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_out) (abfd, i, o))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_out) (abfd, i, o))
 .
 .#define bfd_coff_swap_lineno_out(abfd, i, o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_lineno_out) (abfd, i, o))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_lineno_out) (abfd, i, o))
 .
 .#define bfd_coff_swap_aux_out(a,i,t,c,ind,num,o) \
-.        ((coff_backend_info (a)->_bfd_coff_swap_aux_out) (a,i,t,c,ind,num,o))
+.  ((coff_backend_info (a)->_bfd_coff_swap_aux_out) (a,i,t,c,ind,num,o))
 .
 .#define bfd_coff_swap_sym_out(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_sym_out) (abfd, i, o))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_sym_out) (abfd, i, o))
 .
 .#define bfd_coff_swap_scnhdr_out(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_out) (abfd, i, o))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_out) (abfd, i, o))
 .
 .#define bfd_coff_swap_filehdr_out(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_out) (abfd, i, o))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_out) (abfd, i, o))
 .
 .#define bfd_coff_swap_aouthdr_out(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_out) (abfd, i, o))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_out) (abfd, i, o))
 .
 .#define bfd_coff_filhsz(abfd) (coff_backend_info (abfd)->_bfd_filhsz)
 .#define bfd_coff_aoutsz(abfd) (coff_backend_info (abfd)->_bfd_aoutsz)
@@ -970,83 +1298,92 @@ dependent COFF routines:
 .#define bfd_coff_auxesz(abfd) (coff_backend_info (abfd)->_bfd_auxesz)
 .#define bfd_coff_relsz(abfd)  (coff_backend_info (abfd)->_bfd_relsz)
 .#define bfd_coff_linesz(abfd) (coff_backend_info (abfd)->_bfd_linesz)
-.#define bfd_coff_long_filenames(abfd) (coff_backend_info (abfd)->_bfd_coff_long_filenames)
+.#define bfd_coff_filnmlen(abfd) (coff_backend_info (abfd)->_bfd_filnmlen)
+.#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)
+.  (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)
+.  (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))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_in) (abfd, i, o))
 .
 .#define bfd_coff_swap_aouthdr_in(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_in) (abfd, i, o))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_in) (abfd, i, o))
 .
 .#define bfd_coff_swap_scnhdr_in(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_in) (abfd, i, o))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_in) (abfd, i, o))
 .
 .#define bfd_coff_swap_reloc_in(abfd, i, o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_in) (abfd, i, o))
+.  ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_in) (abfd, i, o))
 .
 .#define bfd_coff_bad_format_hook(abfd, filehdr) \
-.        ((coff_backend_info (abfd)->_bfd_coff_bad_format_hook) (abfd, filehdr))
+.  ((coff_backend_info (abfd)->_bfd_coff_bad_format_hook) (abfd, filehdr))
 .
 .#define bfd_coff_set_arch_mach_hook(abfd, filehdr)\
-.        ((coff_backend_info (abfd)->_bfd_coff_set_arch_mach_hook) (abfd, filehdr))
+.  ((coff_backend_info (abfd)->_bfd_coff_set_arch_mach_hook) (abfd, filehdr))
 .#define bfd_coff_mkobject_hook(abfd, filehdr, aouthdr)\
-.        ((coff_backend_info (abfd)->_bfd_coff_mkobject_hook) (abfd, filehdr, aouthdr))
+.  ((coff_backend_info (abfd)->_bfd_coff_mkobject_hook) (abfd, filehdr, aouthdr))
 .
-.#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name)\
-.        ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook) (abfd, scnhdr, name))
+.#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name, section, flags_ptr)\
+.  ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook)\
+.   (abfd, scnhdr, name, section, flags_ptr))
 .
 .#define bfd_coff_set_alignment_hook(abfd, sec, scnhdr)\
-.        ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr))
+.  ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr))
 .
 .#define bfd_coff_slurp_symbol_table(abfd)\
-.        ((coff_backend_info (abfd)->_bfd_coff_slurp_symbol_table) (abfd))
+.  ((coff_backend_info (abfd)->_bfd_coff_slurp_symbol_table) (abfd))
 .
 .#define bfd_coff_symname_in_debug(abfd, sym)\
-.        ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym))
+.  ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym))
+.
+.#define bfd_coff_force_symnames_in_strings(abfd)\
+.  (coff_backend_info (abfd)->_bfd_coff_force_symnames_in_strings)
+.
+.#define bfd_coff_debug_string_prefix_length(abfd)\
+.  (coff_backend_info (abfd)->_bfd_coff_debug_string_prefix_length)
 .
 .#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))
+.  ((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))
+.  ((coff_backend_info (abfd)->_bfd_coff_reloc16_extra_cases)\
+.   (abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr))
 .
 .#define bfd_coff_reloc16_estimate(abfd, section, reloc, shrink, link_info)\
-.        ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\
-.         (abfd, section, reloc, shrink, link_info))
+.  ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\
+.   (abfd, section, reloc, shrink, link_info))
 .
 .#define bfd_coff_classify_symbol(abfd, sym)\
-.        ((coff_backend_info (abfd)->_bfd_coff_classify_symbol)\
-.         (abfd, sym))
+.  ((coff_backend_info (abfd)->_bfd_coff_classify_symbol)\
+.   (abfd, sym))
 .
 .#define bfd_coff_compute_section_file_positions(abfd)\
-.        ((coff_backend_info (abfd)->_bfd_coff_compute_section_file_positions)\
-.         (abfd))
+.  ((coff_backend_info (abfd)->_bfd_coff_compute_section_file_positions)\
+.   (abfd))
 .
 .#define bfd_coff_start_final_link(obfd, info)\
-.        ((coff_backend_info (obfd)->_bfd_coff_start_final_link)\
-.         (obfd, info))
+.  ((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))
+.  ((coff_backend_info (ibfd)->_bfd_coff_relocate_section)\
+.   (obfd, info, ibfd, o, con, rel, isyms, secs))
 .#define bfd_coff_rtype_to_howto(abfd, sec, rel, h, sym, addendp)\
-.        ((coff_backend_info (abfd)->_bfd_coff_rtype_to_howto)\
-.         (abfd, sec, rel, h, sym, addendp))
+.  ((coff_backend_info (abfd)->_bfd_coff_rtype_to_howto)\
+.   (abfd, sec, rel, h, sym, addendp))
 .#define bfd_coff_adjust_symndx(obfd, info, ibfd, sec, rel, adjustedp)\
-.        ((coff_backend_info (abfd)->_bfd_coff_adjust_symndx)\
-.         (obfd, info, ibfd, sec, rel, adjustedp))
+.  ((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))
+.  ((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))
+.  ((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))
+.  ((coff_backend_info (a)->_bfd_coff_final_link_postscript) (a,p))
 .
 */
 
@@ -1072,7 +1409,7 @@ coff_bad_format_hook (abfd, filehdr)
      */
 
 #if defined(M88) || defined(I960)
-  if (internal_f->f_opthdr != 0 && AOUTSZ != internal_f->f_opthdr)
+  if (internal_f->f_opthdr != 0 && bfd_coff_aoutsz (abfd) != internal_f->f_opthdr)
     return false;
 #endif
 
@@ -1109,7 +1446,10 @@ coff_set_custom_section_alignment (abfd, section, alignment_table, table_size)
     return;
 
   if (alignment_table[i].default_alignment_max != COFF_ALIGNMENT_FIELD_EMPTY
-      && default_alignment > alignment_table[i].default_alignment_max)
+#if COFF_DEFAULT_SECTION_ALIGNMENT_POWER != 0
+      && default_alignment > alignment_table[i].default_alignment_max
+#endif
+      )
     return;
 
   section->alignment_power = alignment_table[i].alignment_power;
@@ -1144,10 +1484,11 @@ static const unsigned int coff_section_alignment_table_size =
 
 static boolean
 coff_new_section_hook (abfd, section)
-     bfd *abfd;
-     asection *section;
+     bfd * abfd;
+     asection * section;
 {
   combined_entry_type *native;
+  bfd_size_type amt;
 
   section->alignment_power = COFF_DEFAULT_SECTION_ALIGNMENT_POWER;
 
@@ -1165,8 +1506,8 @@ coff_new_section_hook (abfd, section)
 
      @@ 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));
+  amt = sizeof (combined_entry_type) * 10;
+  native = (combined_entry_type *) bfd_zalloc (abfd, amt);
   if (native == NULL)
     return false;
 
@@ -1210,10 +1551,17 @@ coff_set_alignment_hook (abfd, section, scnhdr)
       break;
 #endif
 #ifdef TIC80COFF
-  /* TI tools hijack bits 8-11 for the alignment */
+  /* TI tools puts the alignment power in bits 8-11 */
   i = (hdr->s_flags >> 8) & 0xF ;
+#endif
+#ifdef COFF_DECODE_ALIGNMENT
+  i = COFF_DECODE_ALIGNMENT(hdr->s_flags);
 #endif
   section->alignment_power = i;
+
+#ifdef coff_set_section_load_page
+  coff_set_section_load_page (section, hdr->s_page);
+#endif
 }
 
 #else /* ! COFF_ALIGN_IN_SECTION_HEADER */
@@ -1241,6 +1589,7 @@ coff_set_alignment_hook (abfd, section, scnhdr)
      PTR scnhdr;
 {
   struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
+  bfd_size_type amt;
 
   ALIGN_SET     (hdr->s_flags, IMAGE_SCN_ALIGN_64BYTES, 6)
   ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_32BYTES, 5)
@@ -1250,69 +1599,50 @@ coff_set_alignment_hook (abfd, section, scnhdr)
   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)
+     section, while the s_size field holds the raw size.  We also keep
+     the original section flag value, since not every bit can be
+     mapped onto a generic BFD section bit.  */
+  if (coff_section_data (abfd, section) == NULL)
     {
-      if (coff_section_data (abfd, section) == NULL)
+      amt = sizeof (struct coff_section_tdata);
+      section->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
+      if (section->used_by_bfd == NULL)
        {
-         section->used_by_bfd =
-           (PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata));
-         if (section->used_by_bfd == NULL)
-           {
-             /* FIXME: Return error.  */
-             abort ();
-           }
+         /* FIXME: Return error.  */
+         abort ();
        }
-      if (pei_section_data (abfd, section) == NULL)
+    }
+  if (pei_section_data (abfd, section) == NULL)
+    {
+      amt = sizeof (struct pei_section_tdata);
+      coff_section_data (abfd, section)->tdata = (PTR) bfd_zalloc (abfd, amt);
+      if (coff_section_data (abfd, section)->tdata == 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 ();
-           }
+         /* FIXME: Return error.  */
+         abort ();
        }
-      pei_section_data (abfd, section)->virt_size = hdr->s_paddr;
     }
-#endif
+  pei_section_data (abfd, section)->virt_size = hdr->s_paddr;
+  pei_section_data (abfd, section)->pe_flags = hdr->s_flags;
 
-#ifdef COFF_WITH_PE
   section->lma = hdr->s_vaddr;
-#endif
+
+  /* check for extended relocs */
+  if (hdr->s_flags & IMAGE_SCN_LNK_NRELOC_OVFL)
+    {
+      struct external_reloc dst;
+      struct internal_reloc n;
+      file_ptr oldpos = bfd_tell (abfd);
+      bfd_seek (abfd, (file_ptr) hdr->s_relptr, 0);
+      if (bfd_bread ((PTR) &dst, (bfd_size_type) bfd_coff_relsz (abfd), abfd)
+         != bfd_coff_relsz (abfd))
+       return;
+
+      coff_swap_reloc_in (abfd, &dst, &n);
+      bfd_seek (abfd, oldpos, 0);
+      section->reloc_count = hdr->s_nreloc = n.r_vaddr;
+    }
 }
 #undef ALIGN_SET
 #undef ELIFALIGN_SET
@@ -1339,7 +1669,7 @@ coff_set_alignment_hook (abfd, section, scnhdr)
   if ((hdr->s_flags & STYP_OVRFLO) == 0)
     return;
 
-  real_sec = coff_section_from_bfd_index (abfd, hdr->s_nreloc);
+  real_sec = coff_section_from_bfd_index (abfd, (int) hdr->s_nreloc);
   if (real_sec == NULL)
     return;
 
@@ -1375,8 +1705,9 @@ coff_mkobject (abfd)
      bfd * abfd;
 {
   coff_data_type *coff;
+  bfd_size_type amt = sizeof (coff_data_type);
 
-  abfd->tdata.coff_obj_data = (struct coff_tdata *) bfd_zalloc (abfd, sizeof (coff_data_type));
+  abfd->tdata.coff_obj_data = (struct coff_tdata *) bfd_zalloc (abfd, amt);
   if (abfd->tdata.coff_obj_data == 0)
     return false;
   coff = coff_data (abfd);
@@ -1417,9 +1748,11 @@ coff_mkobject_hook (abfd, filehdr, aouthdr)
   coff->local_n_btshft = N_BTSHFT;
   coff->local_n_tmask = N_TMASK;
   coff->local_n_tshift = N_TSHIFT;
-  coff->local_symesz = SYMESZ;
-  coff->local_auxesz = AUXESZ;
-  coff->local_linesz = LINESZ;
+  coff->local_symesz = bfd_coff_symesz (abfd);
+  coff->local_auxesz = bfd_coff_auxesz (abfd);
+  coff->local_linesz = bfd_coff_linesz (abfd);
+
+  coff->timestamp = internal_f->f_timdat;
 
   obj_raw_syment_count (abfd) =
     obj_conv_table_size (abfd) =
@@ -1428,13 +1761,18 @@ coff_mkobject_hook (abfd, filehdr, aouthdr)
 #ifdef RS6000COFF_C
   if ((internal_f->f_flags & F_SHROBJ) != 0)
     abfd->flags |= DYNAMIC;
-  if (aouthdr != NULL && internal_f->f_opthdr >= AOUTSZ)
+  if (aouthdr != NULL && internal_f->f_opthdr >= bfd_coff_aoutsz (abfd))
     {
       struct internal_aouthdr *internal_a =
        (struct internal_aouthdr *) aouthdr;
       struct xcoff_tdata *xcoff;
 
       xcoff = xcoff_data (abfd);
+# ifdef U803XTOCMAGIC
+      xcoff->xcoff64 = internal_f->f_magic == U803XTOCMAGIC;
+# else
+      xcoff->xcoff64 = 0;
+# endif
       xcoff->full_aouthdr = true;
       xcoff->toc = internal_a->o_toc;
       xcoff->sntoc = internal_a->o_sntoc;
@@ -1448,12 +1786,19 @@ coff_mkobject_hook (abfd, filehdr, aouthdr)
     }
 #endif
 
-#ifdef ARM 
+#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
-  
+
+#ifdef COFF_WITH_PE
+  /* FIXME: I'm not sure this is ever executed, since peicode.h
+     defines coff_mkobject_hook.  */
+  if ((internal_f->f_flags & IMAGE_FILE_DEBUG_STRIPPED) == 0)
+    abfd->flags |= HAS_DEBUG;
+#endif
+
   return (PTR) coff;
 }
 #endif
@@ -1470,7 +1815,7 @@ coff_set_arch_mach_hook (abfd, filehdr)
      bfd *abfd;
      PTR filehdr;
 {
-  long machine;
+  unsigned long machine;
   enum bfd_architecture arch;
   struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
 
@@ -1481,7 +1826,7 @@ coff_set_arch_mach_hook (abfd, filehdr)
     case PPCMAGIC:
       arch = bfd_arch_powerpc;
       machine = 0; /* what does this mean? (krk) */
-      break; 
+      break;
 #endif
 #ifdef I386MAGIC
     case I386MAGIC:
@@ -1492,6 +1837,12 @@ coff_set_arch_mach_hook (abfd, filehdr)
       machine = 0;
       break;
 #endif
+#ifdef IA64MAGIC
+    case IA64MAGIC:
+      arch = bfd_arch_ia64;
+      machine = 0;
+      break;
+#endif
 #ifdef A29K_MAGIC_BIG
     case A29K_MAGIC_BIG:
     case A29K_MAGIC_LITTLE:
@@ -1501,6 +1852,8 @@ coff_set_arch_mach_hook (abfd, filehdr)
 #endif
 #ifdef ARMMAGIC
     case ARMMAGIC:
+    case ARMPEMAGIC:
+    case THUMBPEMAGIC:
       arch = bfd_arch_arm;
       switch (internal_f->f_flags & F_ARM_ARCHITECTURE_MASK)
        {
@@ -1598,9 +1951,13 @@ coff_set_arch_mach_hook (abfd, filehdr)
 #endif
 
 #ifdef RS6000COFF_C
+#ifdef XCOFF64
+    case U803XTOCMAGIC:
+#else
     case U802ROMAGIC:
     case U802WRMAGIC:
     case U802TOCMAGIC:
+#endif
       {
        int cputype;
 
@@ -1616,17 +1973,23 @@ coff_set_arch_mach_hook (abfd, filehdr)
              cputype = 0;
            else
              {
-               bfd_byte buf[SYMESZ];
+               bfd_byte *buf;
                struct internal_syment sym;
+               bfd_size_type amt = bfd_coff_symesz (abfd);
 
+               buf = (bfd_byte *) bfd_malloc (amt);
                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);
+                   || bfd_bread (buf, amt, abfd) != amt)
+                 {
+                   free (buf);
+                   return false;
+                 }
+               bfd_coff_swap_sym_in (abfd, (PTR) buf, (PTR) &sym);
                if (sym.n_sclass == C_FILE)
                  cputype = sym.n_type & 0xff;
                else
                  cputype = 0;
+               free (buf);
              }
          }
 
@@ -1635,33 +1998,25 @@ coff_set_arch_mach_hook (abfd, filehdr)
          {
          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 */
+           arch = bfd_xcoff_architecture (abfd);
+           machine = bfd_xcoff_machine (abfd);
            break;
 
          case 1:
            arch = bfd_arch_powerpc;
-           machine = 601;
+           machine = bfd_mach_ppc_601;
            break;
          case 2: /* 64 bit PowerPC */
            arch = bfd_arch_powerpc;
-           machine = 620;
+           machine = bfd_mach_ppc_620;
            break;
          case 3:
            arch = bfd_arch_powerpc;
-           machine = 0;
+           machine = bfd_mach_ppc;
            break;
          case 4:
            arch = bfd_arch_rs6000;
-           machine = 6000;
+           machine = bfd_mach_rs6k;
            break;
          }
       }
@@ -1705,11 +2060,21 @@ coff_set_arch_mach_hook (abfd, filehdr)
 #ifdef SH_ARCH_MAGIC_BIG
     case SH_ARCH_MAGIC_BIG:
     case SH_ARCH_MAGIC_LITTLE:
+#ifdef COFF_WITH_PE
+    case SH_ARCH_MAGIC_WINCE:
+#endif
       arch = bfd_arch_sh;
       machine = 0;
       break;
 #endif
 
+#ifdef MIPS_ARCH_MAGIC_WINCE
+    case MIPS_ARCH_MAGIC_WINCE:
+      arch = bfd_arch_mips;
+      machine = 0;
+      break;
+#endif
+
 #ifdef H8500MAGIC
     case H8500MAGIC:
       arch = bfd_arch_h8500;
@@ -1733,6 +2098,37 @@ coff_set_arch_mach_hook (abfd, filehdr)
       break;
 #endif
 
+#ifdef TICOFF0MAGIC
+#ifdef TICOFF_TARGET_ARCH
+      /* this TI COFF section should be used by all new TI COFF v0 targets */
+    case TICOFF0MAGIC:
+      arch = TICOFF_TARGET_ARCH;
+      break;
+#endif
+#endif
+
+#ifdef TICOFF1MAGIC
+      /* this TI COFF section should be used by all new TI COFF v1/2 targets */
+      /* TI COFF1 and COFF2 use the target_id field to specify which arch */
+    case TICOFF1MAGIC:
+    case TICOFF2MAGIC:
+      switch (internal_f->f_target_id)
+        {
+#ifdef TI_TARGET_ID
+        case TI_TARGET_ID:
+          arch = TICOFF_TARGET_ARCH;
+          break;
+#endif
+        default:
+          arch = bfd_arch_obscure;
+          (*_bfd_error_handler)
+            (_("Unrecognized TI COFF target id '0x%x'"),
+             internal_f->f_target_id);
+          break;
+        }
+      break;
+#endif
+
 #ifdef TIC80_ARCH_MAGIC
     case TIC80_ARCH_MAGIC:
       arch = bfd_arch_tic80;
@@ -1775,6 +2171,10 @@ symname_in_debug_hook (abfd, sym)
 
 #ifdef RS6000COFF_C
 
+#ifdef XCOFF64
+#define FORCE_SYMNAMES_IN_STRINGS
+#endif
+
 /* Handle the csect auxent of a C_EXT or C_HIDEXT symbol.  */
 
 static boolean coff_pointerize_aux_hook
@@ -1870,13 +2270,21 @@ coff_print_aux (abfd, file, table_base, symbol, aux, indaux)
       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);
+#ifdef XCOFF64
+         fprintf (file, "val %5lld", aux->u.auxent.x_csect.x_scnlen.l);
+#else
+         fprintf (file, "val %5ld", (long) aux->u.auxent.x_csect.x_scnlen.l);
+#endif
        }
       else
        {
          fprintf (file, "indx ");
          if (! aux->fix_scnlen)
-           fprintf (file, "%4ld", aux->u.auxent.x_csect.x_scnlen.l);
+#ifdef XCOFF64
+           fprintf (file, "%4lld", aux->u.auxent.x_csect.x_scnlen.l);
+#else
+           fprintf (file, "%4ld", (long) aux->u.auxent.x_csect.x_scnlen.l);
+#endif
          else
            fprintf (file, "%4ld",
                     (long) (aux->u.auxent.x_csect.x_scnlen.p - table_base));
@@ -1950,16 +2358,38 @@ coff_write_relocs (abfd, first_undef)
 #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);
+      {
+       /* sort relocations before we write them out */
+       bfd_size_type amt;
+
+       amt = s->reloc_count;
+       amt *= sizeof (arelent *);
+       p = (arelent **) bfd_malloc (amt);
+       if (p == NULL && s->reloc_count > 0)
+         return false;
+       memcpy (p, s->orelocation, (size_t) amt);
+       qsort (p, s->reloc_count, sizeof (arelent *), compare_arelent_ptr);
+      }
 #endif
 
       if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0)
        return false;
+
+#ifdef COFF_WITH_PE
+      if (s->reloc_count > 0xffff)
+       {
+         /* encode real count here as first reloc */
+         struct internal_reloc n;
+         memset ((PTR) & n, 0, sizeof (n));
+         /* add one to count *this* reloc (grr) */
+         n.r_vaddr = s->reloc_count + 1;
+         coff_swap_reloc_out (abfd, &n, &dst);
+         if (bfd_bwrite ((PTR) & dst, (bfd_size_type) bfd_coff_relsz (abfd),
+                        abfd) != bfd_coff_relsz (abfd))
+           return false;
+       }
+#endif
+
       for (i = 0; i < s->reloc_count; i++)
        {
          struct internal_reloc n;
@@ -1974,19 +2404,19 @@ coff_write_relocs (abfd, first_undef)
             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. */
+            have to look up the output symbol here.  */
 
          if (q->sym_ptr_ptr[0]->the_bfd != abfd)
            {
-             int i;
+             int j;
              const char *sname = q->sym_ptr_ptr[0]->name;
              asymbol **outsyms = abfd->outsymbols;
-             for (i = first_undef; outsyms[i]; i++)
+             for (j = first_undef; outsyms[j]; j++)
                {
-                 const char *intable = outsyms[i]->name;
+                 const char *intable = outsyms[j]->name;
                  if (strcmp (intable, sname) == 0) {
                    /* got a hit, so repoint the reloc */
-                   q->sym_ptr_ptr = outsyms + i;
+                   q->sym_ptr_ptr = outsyms + j;
                    break;
                  }
                }
@@ -2004,7 +2434,11 @@ coff_write_relocs (abfd, first_undef)
 #endif
            if (q->sym_ptr_ptr)
              {
+#ifdef SECTION_RELATIVE_ABSOLUTE_SYMBOL_P
+                if (SECTION_RELATIVE_ABSOLUTE_SYMBOL_P (q,s))
+#else
                if (q->sym_ptr_ptr == bfd_abs_section_ptr->symbol_ptr_ptr)
+#endif
                  /* This is a relocation relative to the absolute symbol.  */
                  n.r_symndx = -1;
                else
@@ -2029,7 +2463,8 @@ coff_write_relocs (abfd, first_undef)
          n.r_type = q->howto->type;
 #endif
          coff_swap_reloc_out (abfd, &n, &dst);
-         if (bfd_write ((PTR) & dst, 1, RELSZ, abfd) != RELSZ)
+         if (bfd_bwrite ((PTR) & dst, (bfd_size_type) bfd_coff_relsz (abfd),
+                        abfd) != bfd_coff_relsz (abfd))
            return false;
        }
 
@@ -2120,6 +2555,33 @@ coff_set_flags (abfd, magicp, flagsp)
       *magicp = TIC30MAGIC;
       return true;
 #endif
+
+#ifdef TICOFF_DEFAULT_MAGIC
+    case TICOFF_TARGET_ARCH:
+      /* if there's no indication of which version we want, use the default */
+      if (!abfd->xvec )
+        *magicp = TICOFF_DEFAULT_MAGIC;
+      else
+        {
+          /* we may want to output in a different COFF version */
+          switch (abfd->xvec->name[4])
+            {
+            case '0':
+              *magicp = TICOFF0MAGIC;
+              break;
+            case '1':
+              *magicp = TICOFF1MAGIC;
+              break;
+            case '2':
+              *magicp = TICOFF2MAGIC;
+              break;
+            default:
+              return false;
+            }
+        }
+      return true;
+#endif
+
 #ifdef TIC80_ARCH_MAGIC
     case bfd_arch_tic80:
       *magicp = TIC80_ARCH_MAGIC;
@@ -2127,16 +2589,20 @@ coff_set_flags (abfd, magicp, flagsp)
 #endif
 #ifdef ARMMAGIC
     case bfd_arch_arm:
+#ifdef ARM_WINCE
+      * magicp = ARMPEMAGIC;
+#else
       * magicp = ARMMAGIC;
+#endif
       * 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;
        }
@@ -2151,7 +2617,10 @@ coff_set_flags (abfd, magicp, flagsp)
        case bfd_mach_arm_4:  * flagsp |= F_ARM_4;  break;
        case bfd_mach_arm_4T: * flagsp |= F_ARM_4T; break;
        case bfd_mach_arm_5:  * flagsp |= F_ARM_5;  break;
-       case bfd_mach_arm_5T: * flagsp |= F_ARM_5;  break; /* XXX - we do not have an F_ARM_5T */
+         /* FIXME: we do not have F_ARM vaues greater than F_ARM_5.  */
+       case bfd_mach_arm_5T: * flagsp |= F_ARM_5;  break;
+       case bfd_mach_arm_5TE: * flagsp |= F_ARM_5; break;
+       case bfd_mach_arm_XScale: * flagsp |= F_ARM_5; break;
        }
       return true;
 #endif
@@ -2165,7 +2634,7 @@ coff_set_flags (abfd, magicp, flagsp)
     case bfd_arch_i386:
       *magicp = I386MAGIC;
 #ifdef LYNXOS
-      /* Just overwrite the usual value if we're doing Lynx. */
+      /* Just overwrite the usual value if we're doing Lynx.  */
       *magicp = LYNXCOFFMAGIC;
 #endif
       return true;
@@ -2177,6 +2646,12 @@ coff_set_flags (abfd, magicp, flagsp)
       return true;
       break;
 #endif
+#ifdef IA64MAGIC
+    case bfd_arch_ia64:
+      *magicp = IA64MAGIC;
+      return true;
+      break;
+#endif
 #ifdef MC68MAGIC
     case bfd_arch_m68k:
 #ifdef APOLLOM68KMAGIC
@@ -2190,7 +2665,7 @@ coff_set_flags (abfd, magicp, flagsp)
 #endif
 #endif
 #ifdef LYNXOS
-      /* Just overwrite the usual value if we're doing Lynx. */
+      /* Just overwrite the usual value if we're doing Lynx.  */
       *magicp = LYNXCOFFMAGIC;
 #endif
       return true;
@@ -2222,10 +2697,21 @@ coff_set_flags (abfd, magicp, flagsp)
 
 #ifdef SH_ARCH_MAGIC_BIG
     case bfd_arch_sh:
+#ifdef COFF_IMAGE_WITH_PE
+      *magicp = SH_ARCH_MAGIC_WINCE;
+#else
       if (bfd_big_endian (abfd))
        *magicp = SH_ARCH_MAGIC_BIG;
       else
        *magicp = SH_ARCH_MAGIC_LITTLE;
+#endif
+      return true;
+      break;
+#endif
+
+#ifdef MIPS_ARCH_MAGIC_WINCE
+    case bfd_arch_mips:
+      *magicp = MIPS_ARCH_MAGIC_WINCE;
       return true;
       break;
 #endif
@@ -2234,7 +2720,7 @@ coff_set_flags (abfd, magicp, flagsp)
     case bfd_arch_sparc:
       *magicp = SPARCMAGIC;
 #ifdef LYNXOS
-      /* Just overwrite the usual value if we're doing Lynx. */
+      /* Just overwrite the usual value if we're doing Lynx.  */
       *magicp = LYNXCOFFMAGIC;
 #endif
       return true;
@@ -2264,12 +2750,19 @@ coff_set_flags (abfd, magicp, flagsp)
       break;
 #endif
 
-#ifdef U802TOCMAGIC
+#ifdef RS6000COFF_C
     case bfd_arch_rs6000:
 #ifndef PPCMAGIC
     case bfd_arch_powerpc:
 #endif
-      *magicp = U802TOCMAGIC;
+#ifdef XCOFF64
+      if (bfd_get_mach (abfd) == bfd_mach_ppc_620
+         && !strncmp (abfd->xvec->name,"aix", 3))
+       *magicp = U803XTOCMAGIC;
+      else
+#else
+       *magicp = U802TOCMAGIC;
+#endif
       return true;
       break;
 #endif
@@ -2279,17 +2772,22 @@ coff_set_flags (abfd, magicp, flagsp)
       * magicp = MCOREMAGIC;
       return true;
 #endif
-      
-    default:                   /* Unknown architecture */
-      /* return false;  -- fall through to "return false" below, to avoid
-       "statement never reached" errors on the one below. */
+
+#ifdef W65MAGIC
+    case bfd_arch_w65:
+      *magicp = W65MAGIC;
+      return true;
+#endif
+
+    default:                   /* Unknown architecture.  */
+      /* Fall through to "return false" below, to avoid
+        "statement never reached" errors on the one below.  */
       break;
     }
 
   return false;
 }
 
-
 static boolean
 coff_set_arch_mach (abfd, arch, machine)
      bfd * abfd;
@@ -2306,16 +2804,40 @@ coff_set_arch_mach (abfd, arch, machine)
       coff_set_flags (abfd, &dummy1, &dummy2) != true)
     return false;              /* We can't represent this type */
 
-  return true;                 /* We're easy ... */
+  return true;                 /* We're easy ...  */
+}
+
+#ifdef COFF_IMAGE_WITH_PE
+
+/* This is used to sort sections by VMA, as required by PE image
+   files.  */
+
+static int sort_by_secaddr PARAMS ((const PTR, const PTR));
+
+static int
+sort_by_secaddr (arg1, arg2)
+     const PTR arg1;
+     const PTR arg2;
+{
+  const asection *a = *(const asection **) arg1;
+  const asection *b = *(const asection **) arg2;
+
+  if (a->vma < b->vma)
+    return -1;
+  else if (a->vma > b->vma)
+    return 1;
+  else
+    return 0;
 }
 
+#endif /* COFF_IMAGE_WITH_PE */
 
-/* Calculate the file position for each section. */
+/* Calculate the file position for each section.  */
 
 #ifndef I960
 #define ALIGN_SECTIONS_IN_FILE
 #endif
-#ifdef TIC80COFF
+#if defined(TIC80COFF) || defined(TICOFF)
 #undef ALIGN_SECTIONS_IN_FILE
 #endif
 
@@ -2325,9 +2847,8 @@ coff_compute_section_file_positions (abfd)
 {
   asection *current;
   asection *previous = (asection *) NULL;
-  file_ptr sofar = FILHSZ;
+  file_ptr sofar = bfd_coff_filhsz (abfd);
   boolean align_adjust;
-  unsigned int count;
 #ifdef ALIGN_SECTIONS_IN_FILE
   file_ptr old_sofar;
 #endif
@@ -2354,8 +2875,8 @@ coff_compute_section_file_positions (abfd)
              size_t len;
 
              len = strlen (bfd_asymbol_name (*symp));
-             if (len > SYMNMLEN)
-               sz += len + 3;
+             if (len > SYMNMLEN || bfd_coff_force_symnames_in_strings (abfd))
+               sz += len + 1 + bfd_coff_debug_string_prefix_length (abfd);
            }
        }
       if (sz > 0)
@@ -2373,7 +2894,7 @@ coff_compute_section_file_positions (abfd)
 
 #ifdef COFF_IMAGE_WITH_PE
   int page_size;
-  if (coff_data (abfd)->link_info) 
+  if (coff_data (abfd)->link_info)
     {
       page_size = pe_data (abfd)->pe_opthdr.FileAlignment;
     }
@@ -2393,52 +2914,139 @@ coff_compute_section_file_positions (abfd)
     }
 
   if (abfd->flags & EXEC_P)
-    sofar += AOUTSZ;
+    sofar += bfd_coff_aoutsz (abfd);
 #ifdef RS6000COFF_C
   else if (xcoff_data (abfd)->full_aouthdr)
-    sofar += AOUTSZ;
+    sofar += bfd_coff_aoutsz (abfd);
   else
     sofar += SMALL_AOUTSZ;
 #endif
 
-  sofar += abfd->section_count * SCNHSZ;
+  sofar += abfd->section_count * bfd_coff_scnhsz (abfd);
 
 #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;
+      sofar += bfd_coff_scnhsz (abfd);
 #endif
 
+#ifdef COFF_IMAGE_WITH_PE
+  {
+    /* PE requires the sections to be in memory order when listed in
+       the section headers.  It also does not like empty loadable
+       sections.  The sections apparently do not have to be in the
+       right order in the image file itself, but we do need to get the
+       target_index values right.  */
+
+    unsigned int count;
+    asection **section_list;
+    unsigned int i;
+    int target_index;
+    bfd_size_type amt;
+
+    count = 0;
+    for (current = abfd->sections; current != NULL; current = current->next)
+      ++count;
+
+    /* We allocate an extra cell to simplify the final loop.  */
+    amt = sizeof (struct asection *) * (count + 1);
+    section_list = bfd_malloc (amt);
+    if (section_list == NULL)
+      return false;
+
+    i = 0;
+    for (current = abfd->sections; current != NULL; current = current->next)
+      {
+       section_list[i] = current;
+       ++i;
+      }
+    section_list[i] = NULL;
+
+    qsort (section_list, count, sizeof (asection *), sort_by_secaddr);
+
+    /* Rethread the linked list into sorted order; at the same time,
+       assign target_index values.  */
+    target_index = 1;
+    abfd->sections = section_list[0];
+    for (i = 0; i < count; i++)
+      {
+       current = section_list[i];
+       current->next = section_list[i + 1];
+
+       /* Later, if the section has zero size, we'll be throwing it
+          away, so we don't want to number it now.  Note that having
+          a zero size and having real contents are different
+          concepts: .bss has no contents, but (usually) non-zero
+          size.  */
+       if (current->_raw_size == 0)
+         {
+           /* Discard.  However, it still might have (valid) symbols
+              in it, so arbitrarily set it to section 1 (indexing is
+              1-based here; usually .text).  __end__ and other
+              contents of .endsection really have this happen.
+              FIXME: This seems somewhat dubious.  */
+           current->target_index = 1;
+         }
+       else
+         current->target_index = target_index++;
+      }
+
+    free (section_list);
+  }
+#else /* ! COFF_IMAGE_WITH_PE */
+  {
+    /* Set the target_index field.  */
+    int target_index;
+
+    target_index = 1;
+    for (current = abfd->sections; current != NULL; current = current->next)
+      current->target_index = target_index++;
+  }
+#endif /* ! COFF_IMAGE_WITH_PE */
+
   align_adjust = false;
-  for (current = abfd->sections, count = 1;
+  for (current = abfd->sections;
        current != (asection *) NULL;
-       current = current->next, ++count)
+       current = current->next)
     {
 #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)
+      /* 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)
+       {
+         bfd_size_type amt = sizeof (struct coff_section_tdata);
+         current->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);
+         if (current->used_by_bfd == NULL)
+           return false;
+       }
+      if (pei_section_data (abfd, current) == NULL)
        {
-         current->target_index = -1;
-         --count;
-         continue;
+         bfd_size_type amt = sizeof (struct pei_section_tdata);
+         coff_section_data (abfd, current)->tdata
+           = (PTR) bfd_zalloc (abfd, amt);
+         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;
 #endif
 
-      current->target_index = count;
-
-      /* Only deal with sections which have contents */
+      /* Only deal with sections which have contents.  */
       if (!(current->flags & SEC_HAS_CONTENTS))
        continue;
 
+#ifdef COFF_IMAGE_WITH_PE
+      /* Make sure we skip empty sections in a PE image.  */
+      if (current->_raw_size == 0)
+       continue;
+#endif
+
       /* Align the sections in the file to the same boundary on
         which they are aligned in virtual memory.  I960 doesn't
         do this (FIXME) so we can stay in sync with Intel.  960
-        doesn't yet page from files... */
+        doesn't yet page from files...  */
 #ifdef ALIGN_SECTIONS_IN_FILE
       if ((abfd->flags & EXEC_P) != 0)
        {
@@ -2446,7 +3054,36 @@ coff_compute_section_file_positions (abfd)
             padding the previous section up if necessary */
 
          old_sofar = sofar;
-         sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+#ifdef RS6000COFF_C
+         /* AIX loader checks the text section alignment of (vma - filepos)
+            So even though the filepos may be aligned wrt the o_algntext, for
+            AIX executables, this check fails. This shows up when an native 
+            AIX executable is stripped with gnu strip because the default vma
+            of native is 0x10000150 but default for gnu is 0x10000140.  Gnu
+            stripped gnu excutable passes this check because the filepos is 
+            0x0140. */
+         if (!strcmp (current->name, _TEXT)) 
+           {
+             bfd_vma pad;
+             bfd_vma align;
+
+             sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+
+             align = 1 << current->alignment_power;
+             pad = abs (current->vma - sofar) % align;
+             
+             if (pad) 
+               {
+                 pad = align - pad;
+                 sofar += pad;
+               }
+           }
+         else
+#else
+           {
+             sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+           }
+#endif
          if (previous != (asection *) NULL)
            {
              previous->_raw_size += sofar - old_sofar;
@@ -2465,26 +3102,7 @@ coff_compute_section_file_positions (abfd)
       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;
-
+      /* Set the padded size.  */
       current->_raw_size = (current->_raw_size + page_size -1) & -page_size;
 #endif
 
@@ -2541,7 +3159,7 @@ coff_compute_section_file_positions (abfd)
 
       b = 0;
       if (bfd_seek (abfd, sofar - 1, SEEK_SET) != 0
-         || bfd_write (&b, 1, 1, abfd) != 1)
+         || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
        return false;
     }
 
@@ -2574,11 +3192,12 @@ coff_add_missing_symbols (abfd)
   asymbol **sympp2;
   unsigned int i;
   int need_text = 1, need_data = 1, need_bss = 1, need_file = 1;
+  bfd_size_type amt;
 
   for (i = 0; i < nsyms; i++)
     {
       coff_symbol_type *csym = coff_symbol_from (abfd, sympp[i]);
-      CONST char *name;
+      const char *name;
       if (csym)
        {
          /* only do this if there is a coff representation of the input
@@ -2610,7 +3229,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 (abfd, nsyms * sizeof (asymbol *));
+  amt = nsyms;
+  amt *= sizeof (asymbol *);
+  sympp2 = (asymbol **) bfd_alloc (abfd, amt);
   if (!sympp2)
     return false;
   memcpy (sympp2, sympp, i * sizeof (asymbol *));
@@ -2641,11 +3262,12 @@ coff_write_object_contents (abfd)
   asection *current;
   boolean hasrelocs = false;
   boolean haslinno = false;
+  boolean hasdebug = false;
   file_ptr scn_base;
   file_ptr reloc_base;
   file_ptr lineno_base;
   file_ptr sym_base;
-  unsigned long reloc_size = 0;
+  unsigned long reloc_size = 0, reloc_count = 0;
   unsigned long lnno_size = 0;
   boolean long_section_names;
   asection *text_sec = NULL;
@@ -2662,7 +3284,7 @@ coff_write_object_contents (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;
+  lnno_size = coff_count_linenumbers (abfd) * bfd_coff_linesz (abfd);
 
   if (abfd->output_has_begun == false)
     {
@@ -2676,7 +3298,16 @@ coff_write_object_contents (abfd)
 
   for (current = abfd->sections; current != NULL; current =
        current->next)
-    reloc_size += current->reloc_count * RELSZ;
+    {
+#ifdef COFF_WITH_PE
+      /* we store the actual reloc count in the first reloc's addr */
+      if (current->reloc_count > 0xffff)
+       reloc_count ++;
+#endif
+      reloc_count += current->reloc_count;
+    }
+
+  reloc_size = reloc_count * bfd_coff_relsz (abfd);
 
   lineno_base = reloc_base + reloc_size;
   sym_base = lineno_base + lnno_size;
@@ -2689,7 +3320,7 @@ coff_write_object_contents (abfd)
        {
          current->line_filepos = lineno_base;
          current->moving_line_filepos = lineno_base;
-         lineno_base += current->lineno_count * LINESZ;
+         lineno_base += current->lineno_count * bfd_coff_linesz (abfd);
        }
       else
        {
@@ -2698,7 +3329,12 @@ coff_write_object_contents (abfd)
       if (current->reloc_count)
        {
          current->rel_filepos = reloc_base;
-         reloc_base += current->reloc_count * RELSZ;
+         reloc_base += current->reloc_count * bfd_coff_relsz (abfd);
+#ifdef COFF_WITH_PE
+         /* extra reloc to hold real count */
+         if (current->reloc_count > 0xffff)
+           reloc_base += bfd_coff_relsz (abfd);
+#endif
        }
       else
        {
@@ -2710,15 +3346,17 @@ coff_write_object_contents (abfd)
   internal_f.f_nscns = 0;
 
   if ((abfd->flags & EXEC_P) != 0)
-    scn_base = FILHSZ + AOUTSZ;
+    scn_base = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd);
   else
     {
-      scn_base = FILHSZ;
+      scn_base = bfd_coff_filhsz (abfd);
 #ifdef RS6000COFF_C
+#ifndef XCOFF64
       if (xcoff_data (abfd)->full_aouthdr)
-       scn_base += AOUTSZ;
+       scn_base += bfd_coff_aoutsz (abfd);
       else
        scn_base += SMALL_AOUTSZ;
+#endif
 #endif
     }
 
@@ -2731,25 +3369,24 @@ coff_write_object_contents (abfd)
        current = current->next)
     {
       struct internal_scnhdr section;
-
-#ifdef COFF_WITH_PE
-      /* If we've got a .reloc section, remember. */
+      boolean is_reloc_section = false;
 
 #ifdef COFF_IMAGE_WITH_PE
       if (strcmp (current->name, ".reloc") == 0)
        {
+         is_reloc_section = true;
+         hasrelocs = true;
          pe_data (abfd)->has_reloc_section = 1;
        }
 #endif
 
-#endif
       internal_f.f_nscns++;
 
       strncpy (section.s_name, current->name, SCNNMLEN);
 
 #ifdef COFF_LONG_SECTION_NAMES
       /* Handle long section names as in PE.  This must be compatible
-         with the code in coff_write_symbols.  */
+         with the code in coff_write_symbols and _bfd_coff_final_link.  */
       {
        size_t len;
 
@@ -2774,6 +3411,9 @@ coff_write_object_contents (abfd)
       section.s_vaddr = current->vma;
       section.s_paddr = current->lma;
       section.s_size =  current->_raw_size;
+#ifdef coff_get_section_load_page
+      section.s_page = coff_get_section_load_page (current);
+#endif
 
 #ifdef COFF_WITH_PE
       section.s_paddr = 0;
@@ -2804,18 +3444,26 @@ coff_write_object_contents (abfd)
       section.s_lnnoptr = current->line_filepos;
       section.s_nreloc = current->reloc_count;
       section.s_nlnno = current->lineno_count;
+#ifndef COFF_IMAGE_WITH_PE
+      /* In PEI, relocs come in the .reloc section.  */
       if (current->reloc_count != 0)
        hasrelocs = true;
+#endif
       if (current->lineno_count != 0)
        haslinno = true;
+      if ((current->flags & SEC_DEBUGGING) != 0
+         && ! is_reloc_section)
+       hasdebug = true;
 
 #ifdef RS6000COFF_C
+#ifndef XCOFF64
       /* 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
 #endif
 
       section.s_flags = sec_to_styp_flags (current->name, current->flags);
@@ -2837,25 +3485,31 @@ coff_write_object_contents (abfd)
       section.s_align = (current->alignment_power
                         ? 1 << current->alignment_power
                         : 0);
-#else
+#endif
 #ifdef TIC80COFF
+      /* TI COFF puts the alignment power in bits 8-11 of the flags */
       section.s_flags |= (current->alignment_power & 0xF) << 8;
 #endif
+#ifdef COFF_ENCODE_ALIGNMENT
+      COFF_ENCODE_ALIGNMENT(section, current->alignment_power);
 #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 */
+      /* 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.  See also coff_compute_section_file_positions.  */
       if (section.s_size == 0)
        internal_f.f_nscns--;
       else
 #endif
        {
          SCNHDR buff;
+         bfd_size_type amt = bfd_coff_scnhsz (abfd);
+
          if (coff_swap_scnhdr_out (abfd, &section, &buff) == 0
-             || bfd_write ((PTR) (&buff), 1, SCNHSZ, abfd) != SCNHSZ)
+             || bfd_bwrite ((PTR) &buff, amt, abfd) != amt)
            return false;
        }
 
@@ -2955,6 +3609,7 @@ coff_write_object_contents (abfd)
     }
 
 #ifdef RS6000COFF_C
+#ifndef XCOFF64
   /* 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)
@@ -2963,6 +3618,7 @@ coff_write_object_contents (abfd)
        {
          struct internal_scnhdr scnhdr;
          SCNHDR buff;
+         bfd_size_type amt;
 
          internal_f.f_nscns++;
          strncpy (&(scnhdr.s_name[0]), current->name, 8);
@@ -2975,14 +3631,16 @@ coff_write_object_contents (abfd)
          scnhdr.s_nreloc = current->target_index;
          scnhdr.s_nlnno = current->target_index;
          scnhdr.s_flags = STYP_OVRFLO;
+         amt = bfd_coff_scnhsz (abfd);
          if (coff_swap_scnhdr_out (abfd, &scnhdr, &buff) == 0
-             || bfd_write ((PTR) &buff, 1, SCNHSZ, abfd) != SCNHSZ)
+             || bfd_bwrite ((PTR) &buff, amt, abfd) != amt)
            return false;
        }
     }
+#endif
 #endif
 
-  /* OK, now set up the filehdr... */
+  /* OK, now set up the filehdr...  */
 
   /* Don't include the internal abs section in the section count */
 
@@ -2997,15 +3655,17 @@ coff_write_object_contents (abfd)
   internal_f.f_flags = 0;
 
   if (abfd->flags & EXEC_P)
-    internal_f.f_opthdr = AOUTSZ;
+    internal_f.f_opthdr = bfd_coff_aoutsz (abfd);
   else
     {
       internal_f.f_opthdr = 0;
 #ifdef RS6000COFF_C
+#ifndef XCOFF64
       if (xcoff_data (abfd)->full_aouthdr)
-       internal_f.f_opthdr = AOUTSZ;
+       internal_f.f_opthdr = bfd_coff_aoutsz (abfd);
       else
        internal_f.f_opthdr = SMALL_AOUTSZ;
+#endif
 #endif
     }
 
@@ -3015,13 +3675,23 @@ coff_write_object_contents (abfd)
     internal_f.f_flags |= F_LNNO;
   if (abfd->flags & EXEC_P)
     internal_f.f_flags |= F_EXEC;
+#ifdef COFF_IMAGE_WITH_PE
+  if (! hasdebug)
+    internal_f.f_flags |= IMAGE_FILE_DEBUG_STRIPPED;
+#endif
 
-  /* FIXME: this is wrong for PPC_PE! */
+#ifndef COFF_WITH_PE
   if (bfd_little_endian (abfd))
     internal_f.f_flags |= F_AR32WR;
   else
     internal_f.f_flags |= F_AR32W;
+#endif
 
+#ifdef TI_TARGET_ID
+  /* target id is used in TI COFF v1 and later; COFF0 won't use this field,
+     but it doesn't hurt to set it internally */
+  internal_f.f_target_id = TI_TARGET_ID;
+#endif
 #ifdef TIC80_TARGET_ID
   internal_f.f_target_id = TIC80_TARGET_ID;
 #endif
@@ -3048,7 +3718,7 @@ coff_write_object_contents (abfd)
     coff_set_flags (abfd, &magic, &flags);
     internal_f.f_magic = magic;
     internal_f.f_flags |= flags;
-    /* ...and the "opt"hdr... */
+    /* ...and the "opt"hdr...  */
 
 #ifdef A29K
 #ifdef ULTRA3                  /* NYU's machine */
@@ -3063,6 +3733,10 @@ coff_write_object_contents (abfd)
       internal_a.magic = NMAGIC; /* Assume separate i/d */
 #define __A_MAGIC_SET__
 #endif /* A29K */
+#ifdef TICOFF_AOUT_MAGIC
+    internal_a.magic = TICOFF_AOUT_MAGIC;
+#define __A_MAGIC_SET__
+#endif
 #ifdef TIC80COFF
     internal_a.magic = TIC80_ARCH_MAGIC;
 #define __A_MAGIC_SET__
@@ -3106,7 +3780,7 @@ coff_write_object_contents (abfd)
 #if defined(ARM)
 #define __A_MAGIC_SET__
     internal_a.magic = ZMAGIC;
-#endif 
+#endif
 
 #if defined(PPC_PE)
 #define __A_MAGIC_SET__
@@ -3116,7 +3790,7 @@ coff_write_object_contents (abfd)
 #if defined MCORE_PE
 #define __A_MAGIC_SET__
     internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
-#endif 
+#endif
 
 #if defined(I386)
 #define __A_MAGIC_SET__
@@ -3127,6 +3801,11 @@ coff_write_object_contents (abfd)
 #endif /* LYNXOS */
 #endif /* I386 */
 
+#if defined(IA64)
+#define __A_MAGIC_SET__
+    internal_a.magic = ZMAGIC;
+#endif /* IA64 */
+
 #if defined(SPARC)
 #define __A_MAGIC_SET__
 #if defined(LYNXOS)
@@ -3141,6 +3820,16 @@ coff_write_object_contents (abfd)
     RS6K_AOUTHDR_OMAGIC;
 #endif
 
+#if defined(SH) && defined(COFF_WITH_PE)
+#define __A_MAGIC_SET__
+    internal_a.magic = SH_PE_MAGIC;
+#endif
+
+#if defined(MIPS) && defined(COFF_WITH_PE)
+#define __A_MAGIC_SET__
+    internal_a.magic = MIPS_PE_MAGIC;
+#endif
+
 #ifndef __A_MAGIC_SET__
 #include "Your aouthdr magic number is not being set!"
 #else
@@ -3172,7 +3861,7 @@ coff_write_object_contents (abfd)
        return false;
     }
 #ifdef COFF_LONG_SECTION_NAMES
-  else if (long_section_names)
+  else if (long_section_names && ! obj_coff_strings_written (abfd))
     {
       /* If we have long section names we have to write out the string
          table even if there are no symbols.  */
@@ -3190,9 +3879,9 @@ coff_write_object_contents (abfd)
          rounded up to the page size.  */
       b = 0;
       if (bfd_seek (abfd,
-                   BFD_ALIGN (sym_base, COFF_PAGE_SIZE) - 1,
+                   (file_ptr) BFD_ALIGN (sym_base, COFF_PAGE_SIZE) - 1,
                    SEEK_SET) != 0
-         || bfd_write (&b, 1, 1, abfd) != 1)
+         || bfd_bwrite (&b, (bfd_size_type) 1, abfd) != 1)
        return false;
     }
 #endif
@@ -3313,19 +4002,41 @@ coff_write_object_contents (abfd)
   /* now write them */
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     return false;
+
   {
-    char buff[FILHSZ];
-    coff_swap_filehdr_out (abfd, (PTR) & internal_f, (PTR) buff);
-    if (bfd_write ((PTR) buff, 1, FILHSZ, abfd) != FILHSZ)
+    char * buff;
+    bfd_size_type amount = bfd_coff_filhsz (abfd);
+
+    buff = bfd_malloc (amount);
+    if (buff == NULL)
+      return false;
+
+    bfd_coff_swap_filehdr_out (abfd, (PTR) &internal_f, (PTR) buff);
+    amount = bfd_bwrite ((PTR) buff, amount, abfd);
+
+    free (buff);
+
+    if (amount != bfd_coff_filhsz (abfd))
       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)
+      /* Note that peicode.h fills in a PEAOUTHDR, not an AOUTHDR.
+        include/coff/pe.h sets AOUTSZ == sizeof (PEAOUTHDR)) */
+      char * buff;
+      bfd_size_type amount = bfd_coff_aoutsz (abfd);
+
+      buff = bfd_malloc (amount);
+      if (buff == NULL)
+       return false;
+
+      coff_swap_aouthdr_out (abfd, (PTR) &internal_a, (PTR) buff);
+      amount = bfd_bwrite ((PTR) buff, amount, abfd);
+
+      free (buff);
+
+      if (amount != bfd_coff_aoutsz (abfd))
        return false;
     }
 #ifdef RS6000COFF_C
@@ -3337,10 +4048,10 @@ coff_write_object_contents (abfd)
       /* 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;
+       size = bfd_coff_aoutsz (abfd);
       else
        size = SMALL_AOUTSZ;
-      if (bfd_write ((PTR) &buff, 1, size, abfd) != size)
+      if (bfd_bwrite ((PTR) &buff, (bfd_size_type) size, abfd) != size)
        return false;
     }
 #endif
@@ -3382,7 +4093,7 @@ coff_set_section_contents (abfd, section, location, offset, count)
       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)
@@ -3403,18 +4114,17 @@ coff_set_section_contents (abfd, section, location, offset, count)
 #endif
 
   /* Don't write out bss sections - one way to do this is to
-       see if the filepos has not been set. */
+       see if the filepos has not been set.  */
   if (section->filepos == 0)
     return true;
 
-  if (bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) != 0)
+  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
     return false;
 
-  if (count != 0)
-    {
-      return (bfd_write (location, 1, count, abfd) == count) ? true : false;
-    }
-  return true;
+  if (count == 0)
+    return true;
+
+  return bfd_bwrite (location, count, abfd) == count;
 }
 #if 0
 static boolean
@@ -3444,17 +4154,16 @@ coff_close_and_cleanup (abfd)
 #endif
 
 static PTR
-buy_and_read (abfd, where, seek_direction, size)
+buy_and_read (abfd, where, size)
      bfd *abfd;
      file_ptr where;
-     int seek_direction;
-     size_t size;
+     bfd_size_type size;
 {
   PTR area = (PTR) bfd_alloc (abfd, size);
   if (!area)
     return (NULL);
-  if (bfd_seek (abfd, where, seek_direction) != 0
-      || bfd_read (area, 1, size, abfd) != size)
+  if (bfd_seek (abfd, where, SEEK_SET) != 0
+      || bfd_bread (area, size, abfd) != size)
     return (NULL);
   return (area);
 }                              /* buy_and_read() */
@@ -3472,6 +4181,9 @@ SUBSUBSECTION
        base of the line number information for the table is stored in
        the symbol associated with the function.
 
+       Note: The PE format uses line number 0 for a flag indicating a
+       new source file.
+
        The information is copied from the external to the internal
        table, and each symbol which marks a function is marked by
        pointing its...
@@ -3487,16 +4199,14 @@ coff_slurp_line_table (abfd, asect)
 {
   LINENO *native_lineno;
   alent *lineno_cache;
+  bfd_size_type amt;
 
   BFD_ASSERT (asect->lineno == (alent *) NULL);
 
-  native_lineno = (LINENO *) buy_and_read (abfd,
-                                          asect->line_filepos,
-                                          SEEK_SET,
-                                          (size_t) (LINESZ *
-                                                    asect->lineno_count));
-  lineno_cache =
-    (alent *) bfd_alloc (abfd, (size_t) ((asect->lineno_count + 1) * sizeof (alent)));
+  amt = (bfd_size_type) bfd_coff_linesz (abfd) * asect->lineno_count;
+  native_lineno = (LINENO *) buy_and_read (abfd, asect->line_filepos, amt);
+  amt = ((bfd_size_type) asect->lineno_count + 1) * sizeof (alent);
+  lineno_cache = (alent *) bfd_alloc (abfd, amt);
   if (lineno_cache == NULL)
     return false;
   else
@@ -3508,23 +4218,23 @@ coff_slurp_line_table (abfd, asect)
       while (counter < asect->lineno_count)
        {
          struct internal_lineno dst;
-         coff_swap_lineno_in (abfd, src, &dst);
+         bfd_coff_swap_lineno_in (abfd, src, &dst);
          cache_ptr->line_number = dst.l_lnno;
 
          if (cache_ptr->line_number == 0)
            {
              boolean warned;
-             long symndx;
+             bfd_signed_vma 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_vma) 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);
+                    bfd_archive_filename (abfd), dst.l_addr.l_symndx);
                  symndx = 0;
                  warned = true;
                }
@@ -3538,7 +4248,7 @@ coff_slurp_line_table (abfd, asect)
                {
                  (*_bfd_error_handler)
                    (_("%s: warning: duplicate line number information for `%s'"),
-                    bfd_get_filename (abfd),
+                    bfd_archive_filename (abfd),
                     bfd_asymbol_name (&sym->symbol));
                }
              sym->lineno = cache_ptr;
@@ -3557,10 +4267,14 @@ coff_slurp_line_table (abfd, asect)
 
     }
   asect->lineno = lineno_cache;
-  /* FIXME, free native_lineno here, or use alloca or something. */
+  /* FIXME, free native_lineno here, or use alloca or something.  */
   return true;
 }
 
+/* Slurp in the symbol table, converting it to generic form.  Note
+   that if coff_relocate_section is defined, the linker will read
+   symbols via coff_link_add_symbols, rather than via this routine.  */
+
 static boolean
 coff_slurp_symbol_table (abfd)
      bfd * abfd;
@@ -3568,6 +4282,7 @@ coff_slurp_symbol_table (abfd)
   combined_entry_type *native_symbols;
   coff_symbol_type *cached_area;
   unsigned int *table_ptr;
+  bfd_size_type amt;
 
   unsigned int number_of_symbols = 0;
 
@@ -3581,17 +4296,15 @@ coff_slurp_symbol_table (abfd)
     }                          /* on error */
 
   /* Allocate enough room for all the symbols in cached form */
-  cached_area = ((coff_symbol_type *)
-                bfd_alloc (abfd,
-                           (obj_raw_syment_count (abfd)
-                            * sizeof (coff_symbol_type))));
-
+  amt = obj_raw_syment_count (abfd);
+  amt *= sizeof (coff_symbol_type);
+  cached_area = (coff_symbol_type *) bfd_alloc (abfd, amt);
   if (cached_area == NULL)
     return false;
-  table_ptr = ((unsigned int *)
-              bfd_alloc (abfd,
-                         (obj_raw_syment_count (abfd)
-                          * sizeof (unsigned int))));
+
+  amt = obj_raw_syment_count (abfd);
+  amt *= sizeof (unsigned int);
+  table_ptr = (unsigned int *) bfd_alloc (abfd, amt);
 
   if (table_ptr == NULL)
     return false;
@@ -3673,7 +4386,7 @@ coff_slurp_symbol_table (abfd)
                case COFF_SYMBOL_UNDEFINED:
                  dst->symbol.section = bfd_und_section_ptr;
                  dst->symbol.value = 0;
-                 break; 
+                 break;
 
                case COFF_SYMBOL_PE_SECTION:
                  dst->symbol.flags |= BSF_EXPORT | BSF_SECTION_SYM;
@@ -3720,13 +4433,13 @@ coff_slurp_symbol_table (abfd)
 #ifdef I960
            case C_LEAFSTAT:    /* static leaf procedure        */
 #endif
-#if defined ARM 
+#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)
+             if (src->u.syment.n_scnum == N_DEBUG)
                dst->symbol.flags = BSF_DEBUGGING;
              else
                dst->symbol.flags = BSF_LOCAL;
@@ -3757,7 +4470,8 @@ coff_slurp_symbol_table (abfd)
 #endif
            case C_REGPARM:     /* register parameter            */
            case C_REG: /* register variable             */
-#ifndef TIC80COFF
+              /* C_AUTOARG conflictes with TI COFF C_UEXT */
+#if !defined (TIC80COFF) && !defined (TICOFF)
 #ifdef C_AUTOARG
            case C_AUTOARG:     /* 960-specific storage class */
 #endif
@@ -3808,7 +4522,7 @@ coff_slurp_symbol_table (abfd)
                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)
+                                     + sec->lineno_count * bfd_coff_linesz (abfd))
                          > (file_ptr) src->u.syment.n_value))
                    break;
                if (sec == NULL)
@@ -3818,7 +4532,7 @@ coff_slurp_symbol_table (abfd)
                    dst->symbol.section = sec;
                    dst->symbol.value = ((src->u.syment.n_value
                                          - sec->line_filepos)
-                                        / LINESZ);
+                                        / bfd_coff_linesz (abfd));
                    src->fix_line = 1;
                  }
              }
@@ -3838,22 +4552,42 @@ coff_slurp_symbol_table (abfd)
 #endif
 
            case C_BLOCK:       /* ".bb" or ".eb"                */
-           case C_FCN:         /* ".bf" or ".ef"                */
+           case C_FCN:         /* ".bf" or ".ef" (or PE ".lf")  */
            case C_EFCN:        /* physical end of function      */
-             dst->symbol.flags = BSF_LOCAL;
 #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;
+             if (strcmp (dst->symbol.name, ".bf") != 0)
+               {
+                 /* PE uses funny values for .ef and .lf; don't
+                     relocate them.  */
+                 dst->symbol.flags = BSF_DEBUGGING;
+               }
+             else
+               dst->symbol.flags = BSF_DEBUGGING | BSF_DEBUGGING_RELOC;
 #else
              /* Base the value as an index from the base of the
                 section.  */
+             dst->symbol.flags = BSF_LOCAL;
              dst->symbol.value = (src->u.syment.n_value
                                   - dst->symbol.section->vma);
 #endif
              break;
 
+           case C_STATLAB:     /* Static load time label */
+              dst->symbol.value = src->u.syment.n_value;
+              dst->symbol.flags = BSF_GLOBAL;
+              break;
+
            case C_NULL:
+             /* PE DLLs sometimes have zeroed out symbols for some
+                 reason.  Just ignore them without a warning.  */
+             if (src->u.syment.n_type == 0
+                 && src->u.syment.n_value == 0
+                 && src->u.syment.n_scnum == 0)
+               break;
+             /* Fall through.  */
            case C_EXTDEF:      /* external definition           */
            case C_ULABEL:      /* undefined label               */
            case C_USTATIC:     /* undefined static              */
@@ -3864,17 +4598,16 @@ coff_slurp_symbol_table (abfd)
              /* NT uses 0x67 for a weak symbol, not C_ALIAS.  */
            case C_ALIAS:       /* duplicate tag                 */
 #endif
-             /* New storage classes for TIc80 */
-#ifdef TIC80COFF
+             /* New storage classes for TI COFF */
+#if defined(TIC80COFF) || defined(TICOFF)
            case C_UEXT:        /* Tentative external definition */
 #endif
-           case C_STATLAB:     /* Static load time label */
            case C_EXTLAB:      /* External load time label */
            case C_HIDDEN:      /* ext symbol in dmert public lib */
            default:
              (*_bfd_error_handler)
                (_("%s: Unrecognized storage class %d for %s symbol `%s'"),
-                bfd_get_filename (abfd), src->u.syment.n_sclass,
+                bfd_archive_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);
@@ -3964,7 +4697,7 @@ coff_classify_symbol (abfd, syment)
          return COFF_SYMBOL_LOCAL;
        }
 
-#if 0
+#ifdef STRICT_PE_FORMAT
       /* This is correct for Microsoft generated objects, but it
          breaks gas generated objects.  */
 
@@ -4005,7 +4738,7 @@ coff_classify_symbol (abfd, syment)
 
       (*_bfd_error_handler)
        (_("warning: %s: local symbol `%s' has no section"),
-        bfd_get_filename (abfd),
+        bfd_archive_filename (abfd),
         _bfd_coff_internal_syment_name (abfd, syment, buf));
     }
 
@@ -4038,7 +4771,6 @@ SUBSUBSECTION
        into a howto table vector; the 88k subtracts a number from the
        @code{r_type} field and creates an addend field.
 
-
 */
 
 #ifndef CALC_ADDEND
@@ -4070,8 +4802,8 @@ coff_slurp_reloc_table (abfd, asect, symbols)
   RELOC *native_relocs;
   arelent *reloc_cache;
   arelent *cache_ptr;
-
   unsigned int idx;
+  bfd_size_type amt;
 
   if (asect->relocation)
     return true;
@@ -4081,19 +4813,14 @@ coff_slurp_reloc_table (abfd, asect, symbols)
     return true;
   if (!coff_slurp_symbol_table (abfd))
     return false;
-  native_relocs =
-    (RELOC *) buy_and_read (abfd,
-                           asect->rel_filepos,
-                           SEEK_SET,
-                           (size_t) (RELSZ *
-                                     asect->reloc_count));
-  reloc_cache = (arelent *)
-    bfd_alloc (abfd, (size_t) (asect->reloc_count * sizeof (arelent)));
+  amt = (bfd_size_type) bfd_coff_relsz (abfd) * asect->reloc_count;
+  native_relocs = (RELOC *) buy_and_read (abfd, asect->rel_filepos, amt);
+  amt = (bfd_size_type) asect->reloc_count * sizeof (arelent);
+  reloc_cache = (arelent *) bfd_alloc (abfd, amt);
 
   if (reloc_cache == NULL)
     return false;
 
-
   for (idx = 0; idx < asect->reloc_count; idx++)
     {
       struct internal_reloc dst;
@@ -4118,7 +4845,7 @@ coff_slurp_reloc_table (abfd, asect, symbols)
            {
              (*_bfd_error_handler)
                (_("%s: warning: illegal symbol index %ld in relocs"),
-                bfd_get_filename (abfd), dst.r_symndx);
+                bfd_archive_filename (abfd), dst.r_symndx);
              cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
              ptr = NULL;
            }
@@ -4156,7 +4883,7 @@ coff_slurp_reloc_table (abfd, asect, symbols)
        {
          (*_bfd_error_handler)
            (_("%s: illegal relocation type %d at address 0x%lx"),
-            bfd_get_filename (abfd), dst.r_type, (long) dst.r_vaddr);
+            bfd_archive_filename (abfd), dst.r_type, (long) dst.r_vaddr);
          bfd_set_error (bfd_error_bad_value);
          return false;
        }
@@ -4214,7 +4941,6 @@ coff_canonicalize_reloc (abfd, section, relptr, symbols)
   arelent *tblptr = section->relocation;
   unsigned int count = 0;
 
-
   if (section->flags & SEC_CONSTRUCTOR)
     {
       /* this section has relocs made up by us, they are not in the
@@ -4237,8 +4963,6 @@ coff_canonicalize_reloc (abfd, section, relptr, symbols)
 
       for (; count++ < section->reloc_count;)
        *relptr++ = tblptr++;
-
-
     }
   *relptr = 0;
   return section->reloc_count;
@@ -4269,6 +4993,7 @@ dummy_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
      struct bfd_link_info *link_info ATTRIBUTE_UNUSED;
 {
   abort ();
+  return 0;
 }
 
 #endif
@@ -4406,16 +5131,14 @@ coff_final_link_postscript (abfd, pfinfo)
 #define coff_SWAP_scnhdr_in coff_swap_scnhdr_in
 #endif
 
-
-
-static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
+static const bfd_coff_backend_data bfd_coff_std_swap_table =
 {
   coff_SWAP_aux_in, coff_SWAP_sym_in, coff_SWAP_lineno_in,
   coff_SWAP_aux_out, coff_SWAP_sym_out,
   coff_SWAP_lineno_out, coff_SWAP_reloc_out,
   coff_SWAP_filehdr_out, coff_SWAP_aouthdr_out,
   coff_SWAP_scnhdr_out,
-  FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, RELSZ, LINESZ,
+  FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, RELSZ, LINESZ, FILNMLEN,
 #ifdef COFF_LONG_FILENAMES
   true,
 #else
@@ -4427,6 +5150,16 @@ static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
   false,
 #endif
   COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
+#ifdef COFF_FORCE_SYMBOLS_IN_STRINGS
+  true,
+#else
+  false,
+#endif
+#ifdef COFF_DEBUG_STRING_WIDE_PREFIX
+  4,
+#else
+  2,
+#endif
   coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in,
   coff_SWAP_reloc_in, coff_bad_format_hook, coff_set_arch_mach_hook,
   coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
@@ -4458,7 +5191,7 @@ static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
 #define coff_bfd_copy_private_section_data  _bfd_generic_bfd_copy_private_section_data
 #endif
 
-#ifndef coff_bfd_copy_private_bfd_data 
+#ifndef coff_bfd_copy_private_bfd_data
 #define coff_bfd_copy_private_bfd_data      _bfd_generic_bfd_copy_private_bfd_data
 #endif
 
@@ -4470,7 +5203,7 @@ static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
 #define coff_bfd_set_private_flags          _bfd_generic_bfd_set_private_flags
 #endif
 
-#ifndef coff_bfd_print_private_bfd_data 
+#ifndef coff_bfd_print_private_bfd_data
 #define coff_bfd_print_private_bfd_data     _bfd_generic_bfd_print_private_bfd_data
 #endif
 
@@ -4505,96 +5238,104 @@ static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
 #define coff_bfd_gc_sections               bfd_generic_gc_sections
 #endif
 
+#ifndef coff_bfd_merge_sections
+#define coff_bfd_merge_sections                    bfd_generic_merge_sections
+#endif
+
 #define CREATE_BIG_COFF_TARGET_VEC(VAR, NAME, EXTRA_O_FLAGS, EXTRA_S_FLAGS, UNDER, ALTERNATIVE)        \
-const bfd_target VAR =                                                                         \
-{                                                                                              \
-  NAME ,                                                                                       \
-  bfd_target_coff_flavour,                                                                     \
-  BFD_ENDIAN_BIG,              /* data byte order is big */                                    \
-  BFD_ENDIAN_BIG,              /* header byte order is big */                                  \
-  /* object flags */                                                                           \
-  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG |                                               \
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | EXTRA_O_FLAGS),                                           \
-  /* section flags */                                                                          \
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | EXTRA_S_FLAGS),                       \
-  UNDER,                       /* leading symbol underscore */                                 \
-  '/',                         /* ar_pad_char */                                               \
-  15,                          /* ar_max_namelen */                                            \
-                                                                                               \
-  /* Data conversion functions.  */                                                            \
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,                                                  \
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,                                                  \
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,                                                  \
-                                                                                               \
-  /* Header conversion functions.  */                                                          \
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,                                                  \
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,                                                  \
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,                                                  \
-                                                                                               \
-       /* bfd_check_format */                                                                  \
-  { _bfd_dummy_target, coff_object_p, bfd_generic_archive_p, _bfd_dummy_target },              \
-       /* bfd_set_format */                                                                    \
-  { bfd_false, coff_mkobject, _bfd_generic_mkarchive, bfd_false },                             \
-       /* bfd_write_contents */                                                                \
-  { bfd_false, coff_write_object_contents, _bfd_write_archive_contents, bfd_false },           \
-                                                                                               \
-  BFD_JUMP_TABLE_GENERIC (coff),                                                               \
-  BFD_JUMP_TABLE_COPY (coff),                                                                  \
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),                                                           \
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),                                                  \
-  BFD_JUMP_TABLE_SYMBOLS (coff),                                                               \
-  BFD_JUMP_TABLE_RELOCS (coff),                                                                        \
-  BFD_JUMP_TABLE_WRITE (coff),                                                                 \
-  BFD_JUMP_TABLE_LINK (coff),                                                                  \
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),                                                     \
-                                                                                               \
-  ALTERNATIVE,                                                                                 \
-                                                                                               \
-  COFF_SWAP_TABLE                                                                              \
+const bfd_target VAR =                                                 \
+{                                                                      \
+  NAME ,                                                               \
+  bfd_target_coff_flavour,                                             \
+  BFD_ENDIAN_BIG,              /* data byte order is big */            \
+  BFD_ENDIAN_BIG,              /* header byte order is big */          \
+  /* object flags */                                                   \
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG |                       \
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | EXTRA_O_FLAGS),                   \
+  /* section flags */                                                  \
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | EXTRA_S_FLAGS),\
+  UNDER,                       /* leading symbol underscore */         \
+  '/',                         /* ar_pad_char */                       \
+  15,                          /* ar_max_namelen */                    \
+                                                                       \
+  /* Data conversion functions.  */                                    \
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,                          \
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,                          \
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,                          \
+                                                                       \
+  /* Header conversion functions.  */                                  \
+  bfd_getb64, bfd_getb_signed_64, bfd_putb64,                          \
+  bfd_getb32, bfd_getb_signed_32, bfd_putb32,                          \
+  bfd_getb16, bfd_getb_signed_16, bfd_putb16,                          \
+                                                                       \
+       /* bfd_check_format */                                          \
+  { _bfd_dummy_target, coff_object_p, bfd_generic_archive_p,           \
+    _bfd_dummy_target },                                               \
+       /* bfd_set_format */                                            \
+  { bfd_false, coff_mkobject, _bfd_generic_mkarchive, bfd_false },     \
+       /* bfd_write_contents */                                        \
+  { bfd_false, coff_write_object_contents, _bfd_write_archive_contents,        \
+    bfd_false },                                                       \
+                                                                       \
+  BFD_JUMP_TABLE_GENERIC (coff),                                       \
+  BFD_JUMP_TABLE_COPY (coff),                                          \
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),                                   \
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),                          \
+  BFD_JUMP_TABLE_SYMBOLS (coff),                                       \
+  BFD_JUMP_TABLE_RELOCS (coff),                                                \
+  BFD_JUMP_TABLE_WRITE (coff),                                         \
+  BFD_JUMP_TABLE_LINK (coff),                                          \
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),                             \
+                                                                       \
+  ALTERNATIVE,                                                         \
+                                                                       \
+  COFF_SWAP_TABLE                                                      \
 };
 
 #define CREATE_LITTLE_COFF_TARGET_VEC(VAR, NAME, EXTRA_O_FLAGS, EXTRA_S_FLAGS, UNDER, ALTERNATIVE)     \
-const bfd_target VAR =                                                                         \
-{                                                                                              \
-  NAME ,                                                                                       \
-  bfd_target_coff_flavour,                                                                     \
-  BFD_ENDIAN_LITTLE,           /* data byte order is little */                                 \
-  BFD_ENDIAN_LITTLE,           /* header byte order is little */                               \
-       /* object flags */                                                                      \
-  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG |                                               \
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | EXTRA_O_FLAGS),                                           \
-       /* section flags */                                                                     \
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | EXTRA_S_FLAGS),                       \
-  UNDER,                       /* leading symbol underscore */                                 \
-  '/',                         /* ar_pad_char */                                               \
-  15,                          /* ar_max_namelen */                                            \
-                                                                                               \
-  /* Data conversion functions.  */                                                            \
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,                                                  \
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,                                                  \
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,                                                  \
-  /* Header conversion functions.  */                                                          \
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,                                                  \
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,                                                  \
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,                                                  \
-       /* bfd_check_format */                                                                  \
-  { _bfd_dummy_target, coff_object_p, bfd_generic_archive_p, _bfd_dummy_target },              \
-       /* bfd_set_format */                                                                    \
-  { bfd_false, coff_mkobject, _bfd_generic_mkarchive, bfd_false },                             \
-       /* bfd_write_contents */                                                                \
-  { bfd_false, coff_write_object_contents, _bfd_write_archive_contents, bfd_false },           \
-                                                                                               \
-  BFD_JUMP_TABLE_GENERIC (coff),                                                               \
-  BFD_JUMP_TABLE_COPY (coff),                                                                  \
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),                                                           \
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),                                                  \
-  BFD_JUMP_TABLE_SYMBOLS (coff),                                                               \
-  BFD_JUMP_TABLE_RELOCS (coff),                                                                        \
-  BFD_JUMP_TABLE_WRITE (coff),                                                                 \
-  BFD_JUMP_TABLE_LINK (coff),                                                                  \
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),                                                     \
-                                                                                               \
-  ALTERNATIVE,                                                                                 \
-                                                                                               \
-  COFF_SWAP_TABLE                                                                              \
+const bfd_target VAR =                                                 \
+{                                                                      \
+  NAME ,                                                               \
+  bfd_target_coff_flavour,                                             \
+  BFD_ENDIAN_LITTLE,           /* data byte order is little */         \
+  BFD_ENDIAN_LITTLE,           /* header byte order is little */       \
+       /* object flags */                                              \
+  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG |                       \
+   HAS_SYMS | HAS_LOCALS | WP_TEXT | EXTRA_O_FLAGS),                   \
+       /* section flags */                                             \
+  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | EXTRA_S_FLAGS),\
+  UNDER,                       /* leading symbol underscore */         \
+  '/',                         /* ar_pad_char */                       \
+  15,                          /* ar_max_namelen */                    \
+                                                                       \
+  /* Data conversion functions.  */                                    \
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,                          \
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,                          \
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,                          \
+  /* Header conversion functions.  */                                  \
+  bfd_getl64, bfd_getl_signed_64, bfd_putl64,                          \
+  bfd_getl32, bfd_getl_signed_32, bfd_putl32,                          \
+  bfd_getl16, bfd_getl_signed_16, bfd_putl16,                          \
+       /* bfd_check_format */                                          \
+  { _bfd_dummy_target, coff_object_p, bfd_generic_archive_p,           \
+    _bfd_dummy_target },                                               \
+       /* bfd_set_format */                                            \
+  { bfd_false, coff_mkobject, _bfd_generic_mkarchive, bfd_false },     \
+       /* bfd_write_contents */                                        \
+  { bfd_false, coff_write_object_contents, _bfd_write_archive_contents,        \
+    bfd_false },                                                       \
+                                                                       \
+  BFD_JUMP_TABLE_GENERIC (coff),                                       \
+  BFD_JUMP_TABLE_COPY (coff),                                          \
+  BFD_JUMP_TABLE_CORE (_bfd_nocore),                                   \
+  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),                          \
+  BFD_JUMP_TABLE_SYMBOLS (coff),                                       \
+  BFD_JUMP_TABLE_RELOCS (coff),                                                \
+  BFD_JUMP_TABLE_WRITE (coff),                                         \
+  BFD_JUMP_TABLE_LINK (coff),                                          \
+  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),                             \
+                                                                       \
+  ALTERNATIVE,                                                         \
+                                                                       \
+  COFF_SWAP_TABLE                                                      \
 };
This page took 0.065045 seconds and 4 git commands to generate.