* sunos.c (sunos_create_dynamic_sections): We need the dynamic
[deliverable/binutils-gdb.git] / bfd / coffcode.h
index 3d9d2881de9ac9e39bda88fa5f1ab3af8acdb149..ae07e91d9c0a5d22ede8f6abc86c5a4752840904 100644 (file)
@@ -1,5 +1,5 @@
 /* Support for the generic parts of most COFF variants, for BFD.
-   Copyright 1990, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
+   Copyright 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -309,6 +309,7 @@ CODE_FRAGMENT
 #include "coffswap.h"
 #endif
 
+#define STRING_SIZE_SIZE (4)
 \f
 /* void warning(); */
 
@@ -414,6 +415,11 @@ sec_to_styp_flags (sec_name, sec_flags)
     styp_flags |= STYP_NOLOAD;
 #endif
 
+#ifdef COFF_WITH_PE
+  if (sec_flags & SEC_LINK_ONCE)
+    styp_flags |= IMAGE_SCN_LNK_COMDAT;
+#endif
+
   return (styp_flags);
 }
 /*
@@ -477,6 +483,10 @@ styp_to_sec_flags (abfd, hdr, name)
       sec_flags |= SEC_DEBUGGING;
 #endif
     }
+  else if (styp_flags & STYP_PAD)
+    {
+      sec_flags = 0;
+    }
   else if (strcmp (name, _TEXT) == 0)
     {
       if (sec_flags & SEC_NEVER_LOAD)
@@ -538,6 +548,97 @@ styp_to_sec_flags (abfd, hdr, name)
     }
 #endif /* STYP_SDATA */
 
+#ifdef COFF_WITH_PE
+  if (styp_flags & IMAGE_SCN_LNK_REMOVE)
+    sec_flags |= SEC_EXCLUDE;
+
+  if (styp_flags & IMAGE_SCN_LNK_COMDAT)
+    {
+      sec_flags |= SEC_LINK_ONCE;
+
+      /* Unfortunately, the PE format stores essential information in
+         the symbol table, of all places.  We need to extract that
+         information now, so that objdump and the linker will know how
+         to handle the section without worrying about the symbols.  We
+         can't call slurp_symtab, because the linker doesn't want the
+         swapped symbols.  */
+
+      if (_bfd_coff_get_external_symbols (abfd))
+       {
+         bfd_byte *esym, *esymend;
+
+         esym = (bfd_byte *) obj_coff_external_syms (abfd);
+         esymend = esym + obj_raw_syment_count (abfd) * SYMESZ;
+
+         while (esym < esymend)
+           {
+             struct internal_syment isym;
+
+             bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &isym);
+
+             if (sizeof (internal_s->s_name) > SYMNMLEN)
+               {
+                 /* This case implies that the matching symbol name
+                     will be in the string table.  */
+                 abort ();
+               }
+
+             if (isym.n_sclass == C_STAT
+                 && isym.n_type == T_NULL
+                 && isym.n_numaux == 1)
+               {
+                 char buf[SYMNMLEN + 1];
+                 const char *symname;
+
+                 symname = _bfd_coff_internal_syment_name (abfd, &isym, buf);
+                 if (symname == NULL)
+                   abort ();
+
+                 if (strcmp (name, symname) == 0)
+                   {
+                     union internal_auxent aux;
+
+                     /* This is the section symbol.  */
+
+                     bfd_coff_swap_aux_in (abfd, (PTR) (esym + SYMESZ),
+                                           isym.n_type, isym.n_sclass,
+                                           0, isym.n_numaux, (PTR) &aux);
+
+                     switch (aux.x_scn.x_comdat)
+                       {
+                       case IMAGE_COMDAT_SELECT_NODUPLICATES:
+                         sec_flags |= SEC_LINK_DUPLICATES_ONE_ONLY;
+                         break;
+
+                       default:
+                       case IMAGE_COMDAT_SELECT_ANY:
+                         sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
+                         break;
+
+                       case IMAGE_COMDAT_SELECT_SAME_SIZE:
+                         sec_flags |= SEC_LINK_DUPLICATES_SAME_SIZE;
+                         break;
+
+                       case IMAGE_COMDAT_SELECT_EXACT_MATCH:
+                         sec_flags |= SEC_LINK_DUPLICATES_SAME_CONTENTS;
+                         break;
+
+                       case IMAGE_COMDAT_SELECT_ASSOCIATIVE:
+                         /* FIXME: This is not currently implemented.  */
+                         sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
+                         break;
+                       }
+
+                     break;
+                   }
+               }
+
+             esym += (isym.n_numaux + 1) * SYMESZ;
+           }
+       }
+    }
+#endif
+
   return (sec_flags);
 }
 
@@ -625,6 +726,7 @@ dependent COFF routines:
 . unsigned int _bfd_relsz;
 . unsigned int _bfd_linesz;
 . boolean _bfd_coff_long_filenames;
+. boolean _bfd_coff_long_section_names;
 . void (*_bfd_coff_swap_filehdr_in) PARAMS ((
 .       bfd     *abfd,
 .       PTR     ext,
@@ -722,6 +824,17 @@ dependent COFF routines:
 .       asection *sec,
 .       struct internal_reloc *reloc,
 .       boolean *adjustedp));
+. boolean (*_bfd_coff_link_add_one_symbol) PARAMS ((
+.       struct bfd_link_info *info,
+.       bfd *abfd,
+.       const char *name,
+.       flagword flags, 
+.       asection *section,
+.       bfd_vma value,
+.       const char *string,
+.       boolean copy,
+.       boolean collect, 
+.       struct bfd_link_hash_entry **hashp));
 .
 .} bfd_coff_backend_data;
 .
@@ -765,6 +878,8 @@ dependent COFF routines:
 .#define bfd_coff_relsz(abfd)  (coff_backend_info (abfd)->_bfd_relsz)
 .#define bfd_coff_linesz(abfd) (coff_backend_info (abfd)->_bfd_linesz)
 .#define bfd_coff_long_filenames(abfd) (coff_backend_info (abfd)->_bfd_coff_long_filenames)
+.#define bfd_coff_long_section_names(abfd) \
+.        (coff_backend_info (abfd)->_bfd_coff_long_section_names)
 .#define bfd_coff_swap_filehdr_in(abfd, i,o) \
 .        ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_in) (abfd, i, o))
 .
@@ -829,6 +944,9 @@ dependent COFF routines:
 .#define bfd_coff_adjust_symndx(obfd, info, ibfd, sec, rel, adjustedp)\
 .        ((coff_backend_info (abfd)->_bfd_coff_adjust_symndx)\
 .         (obfd, info, ibfd, sec, rel, adjustedp))
+.#define bfd_coff_link_add_one_symbol(info,abfd,name,flags,section,value,string,cp,coll,hashp)\
+.        ((coff_backend_info (abfd)->_bfd_coff_link_add_one_symbol)\
+.         (info, abfd, name, flags, section, value, string, cp, coll, hashp))
 .
 */
 
@@ -885,7 +1003,8 @@ coff_new_section_hook (abfd, section)
   /* Allocate aux records for section symbols, to store size and
      related info.
 
-     @@ Shouldn't use constant multiplier here!  */
+     @@ The 10 is a guess at a plausible maximum number of aux entries
+     (but shouldn't be a constant).  */
   coffsymbol (section->symbol)->native =
     (combined_entry_type *) bfd_zalloc (abfd,
                                        sizeof (combined_entry_type) * 10);
@@ -902,6 +1021,11 @@ coff_new_section_hook (abfd, section)
          || strcmp (section->name, ".dtors") == 0))
     section->alignment_power = 2;
 
+  /* Similarly, the .stabstr section must be aligned to 2**0 at most.  */
+  if (COFF_DEFAULT_SECTION_ALIGNMENT_POWER > 0
+      && strncmp (section->name, ".stabstr", 8) == 0)
+    section->alignment_power = 0;
+
   return true;
 }
 
@@ -925,10 +1049,146 @@ coff_set_alignment_hook (abfd, section, scnhdr)
 }
 
 #else /* ! I960 */
+#ifdef COFF_WITH_PE
+
+/* a couple of macros to help setting the alignment power field */
+#define ALIGN_SET(field,x,y) \
+  if (((field) & IMAGE_SCN_ALIGN_64BYTES) == x )\
+  {\
+     section->alignment_power = y;\
+  }
+
+#define ELIFALIGN_SET(field,x,y) \
+  else if (( (field) & IMAGE_SCN_ALIGN_64BYTES) == x ) \
+  {\
+     section->alignment_power = y;\
+  }
+
+static void
+coff_set_alignment_hook (abfd, section, scnhdr)
+     bfd * abfd;
+     asection * section;
+     PTR scnhdr;
+{
+  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
+
+  ALIGN_SET     (hdr->s_flags, IMAGE_SCN_ALIGN_64BYTES, 6)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_32BYTES, 5)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_16BYTES, 4)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_8BYTES,  3)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_4BYTES,  2)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_2BYTES,  1)
+  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_1BYTES,  0)
+
+#ifdef POWERPC_LE_PE
+  if (strcmp (section->name, ".idata$2") == 0)
+    {
+      section->alignment_power = 0;
+    }
+  else if (strcmp (section->name, ".idata$3") == 0)
+    {
+      section->alignment_power = 0;
+    }
+  else if (strcmp (section->name, ".idata$4") == 0)
+    {
+      section->alignment_power = 2;
+    }
+  else if (strcmp (section->name, ".idata$5") == 0)
+    {
+      section->alignment_power = 2;
+    }
+  else if (strcmp (section->name, ".idata$6") == 0)
+    {
+      section->alignment_power = 1;
+    }
+  else if (strcmp (section->name, ".reloc") == 0)
+    {
+      section->alignment_power = 1;
+    }
+  else if (strncmp (section->name, ".stab", 5) == 0)
+    {
+      section->alignment_power = 2;
+    }
+#endif
+
+#ifdef COFF_IMAGE_WITH_PE
+  /* In a PE image file, the s_paddr field holds the virtual size of a
+     section, while the s_size field holds the raw size.  */
+  if (hdr->s_paddr != 0)
+    {
+      if (coff_section_data (abfd, section) == NULL)
+       {
+         section->used_by_bfd =
+           (PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata));
+         if (section->used_by_bfd == NULL)
+           {
+             /* FIXME: Return error.  */
+             abort ();
+           }
+       }
+      if (pei_section_data (abfd, section) == NULL)
+       {
+         coff_section_data (abfd, section)->tdata =
+           (PTR) bfd_zalloc (abfd, sizeof (struct pei_section_tdata));
+         if (coff_section_data (abfd, section)->tdata == NULL)
+           {
+             /* FIXME: Return error.  */
+             abort ();
+           }
+       }
+      pei_section_data (abfd, section)->virt_size = hdr->s_paddr;
+    }
+#endif
+
+}
+#undef ALIGN_SET
+#undef ELIFALIGN_SET
+
+#else /* ! COFF_WITH_PE */
+#ifdef RS6000COFF_C
+
+/* We grossly abuse this function to handle XCOFF overflow headers.
+   When we see one, we correct the reloc and line number counts in the
+   real header, and remove the section we just created.  */
+
+static void
+coff_set_alignment_hook (abfd, section, scnhdr)
+     bfd *abfd;
+     asection *section;
+     PTR scnhdr;
+{
+  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
+  asection *real_sec;
+  asection **ps;
+
+  if ((hdr->s_flags & STYP_OVRFLO) == 0)
+    return;
+
+  real_sec = coff_section_from_bfd_index (abfd, hdr->s_nreloc);
+  if (real_sec == NULL)
+    return;
+
+  real_sec->reloc_count = hdr->s_paddr;
+  real_sec->lineno_count = hdr->s_vaddr;
+
+  for (ps = &abfd->sections; *ps != NULL; ps = &(*ps)->next)
+    {
+      if (*ps == section)
+       {
+         *ps = (*ps)->next;
+         --abfd->section_count;
+         break;
+       }
+    }
+}
+
+#else /* ! RS6000COFF_C */
 
 #define coff_set_alignment_hook \
   ((void (*) PARAMS ((bfd *, asection *, PTR))) bfd_void)
 
+#endif /* ! RS6000COFF_C */
+#endif /* ! COFF_WITH_PE */
 #endif /* ! I960 */
 
 #ifndef coff_mkobject
@@ -940,15 +1200,14 @@ coff_mkobject (abfd)
 
   abfd->tdata.coff_obj_data = (struct coff_tdata *) bfd_zalloc (abfd, sizeof (coff_data_type));
   if (abfd->tdata.coff_obj_data == 0)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
   coff = coff_data (abfd);
   coff->symbols = (coff_symbol_type *) NULL;
   coff->conversion_table = (unsigned int *) NULL;
   coff->raw_syments = (struct coff_ptr_struct *) NULL;
   coff->relocbase = 0;
+  coff->local_toc_sym_map = 0;
+
 /*  make_abs_section(abfd);*/
 
   return true;
@@ -998,7 +1257,10 @@ coff_mkobject_hook (abfd, filehdr, aouthdr)
       struct xcoff_tdata *xcoff;
 
       xcoff = xcoff_data (abfd);
+      xcoff->full_aouthdr = true;
       xcoff->toc = internal_a->o_toc;
+      xcoff->sntoc = internal_a->o_sntoc;
+      xcoff->snentry = internal_a->o_snentry;
       xcoff->text_align_power = internal_a->o_algntext;
       xcoff->data_align_power = internal_a->o_algndata;
       xcoff->modtype = internal_a->o_modtype;
@@ -1099,6 +1361,11 @@ coff_set_arch_mach_hook (abfd, filehdr)
        }
       break;
 #endif
+#ifdef I860
+    case I860MAGIC:
+      arch = bfd_arch_i860;
+      break;
+#endif
 #ifdef I960
 #ifdef I960ROMAGIC
     case I960ROMAGIC:
@@ -1125,11 +1392,12 @@ coff_set_arch_mach_hook (abfd, filehdr)
        case F_I960KA:
          machine = bfd_mach_i960_ka_sa;
          break;
-         /* start-sanitize-i960xl */
-       case F_I960XL:
-         machine = bfd_mach_i960_xl;
+       case F_I960JX:
+         machine = bfd_mach_i960_jx;
+         break;
+       case F_I960HX:
+         machine = bfd_mach_i960_hx;
          break;
-         /* end-sanitize-i960xl */
        }
       break;
 #endif
@@ -1178,7 +1446,7 @@ coff_set_arch_mach_hook (abfd, filehdr)
               (because that's how they were bootstrapped originally),
               but they are always PowerPC architecture.  */
            arch = bfd_arch_powerpc;
-           machine = 601;
+           machine = 0;
 #else
            arch = bfd_arch_rs6000;
            machine = 6000;
@@ -1231,6 +1499,15 @@ coff_set_arch_mach_hook (abfd, filehdr)
       break;
 #endif
 
+#ifdef H8300SMAGIC
+    case H8300SMAGIC:
+      arch = bfd_arch_h8300;
+      machine = bfd_mach_h8300s;
+      /* !! FIXME this probably isn't the right place for this */
+      abfd->flags |= BFD_IS_RELAXABLE;
+      break;
+#endif
+
 #ifdef SH_ARCH_MAGIC_BIG
     case SH_ARCH_MAGIC_BIG:
     case SH_ARCH_MAGIC_LITTLE:
@@ -1256,6 +1533,12 @@ coff_set_arch_mach_hook (abfd, filehdr)
       break;
 #endif
 
+#ifdef TIC80_ARCH_MAGIC
+    case TIC80_ARCH_MAGIC:
+      arch = bfd_arch_tic80;
+      break;
+#endif
+
     default:                   /* Unreadable input file type */
       arch = bfd_arch_obscure;
       break;
@@ -1341,7 +1624,10 @@ coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
 {
   /* Return true if we don't want to pointerize this aux entry, which
      is the case for the lastfirst aux entry for a C_LEAFPROC symbol.  */
-  return indaux == 1 && symbol->u.syment.n_sclass == C_LEAFPROC;
+  return (indaux == 1
+         && (symbol->u.syment.n_sclass == C_LEAFPROC
+             || symbol->u.syment.n_sclass == C_LEAFSTAT
+             || symbol->u.syment.n_sclass == C_LEAFEXT));
 }
 
 #else /* ! I960 */
@@ -1420,18 +1706,50 @@ SUBSUBSECTION
 
 */
 
+#ifdef TARG_AUX
+
+static int compare_arelent_ptr PARAMS ((const PTR, const PTR));
+
+/* AUX's ld wants relocations to be sorted */
+static int
+compare_arelent_ptr (x, y)
+     const PTR x;
+     const PTR y;
+{
+  const arelent **a = (const arelent **) x;
+  const arelent **b = (const arelent **) y;
+  bfd_size_type aadr = (*a)->address;
+  bfd_size_type badr = (*b)->address;
+
+  return (aadr < badr ? -1 : badr < aadr ? 1 : 0);
+}
+
+#endif /* TARG_AUX */
+
 static boolean
 coff_write_relocs (abfd, first_undef)
      bfd * abfd;
      int first_undef;
 {
   asection *s;
+
   for (s = abfd->sections; s != (asection *) NULL; s = s->next)
     {
       unsigned int i;
       struct external_reloc dst;
+      arelent **p;
+
+#ifndef TARG_AUX
+      p = s->orelocation;
+#else
+      /* sort relocations before we write them out */
+      p = (arelent **) bfd_malloc (s->reloc_count * sizeof (arelent *));
+      if (p == NULL && s->reloc_count > 0)
+       return false;
+      memcpy (p, s->orelocation, s->reloc_count * sizeof (arelent *));
+      qsort (p, s->reloc_count, sizeof (arelent *), compare_arelent_ptr);
+#endif
 
-      arelent **p = s->orelocation;
       if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0)
        return false;
       for (i = 0; i < s->reloc_count; i++)
@@ -1506,6 +1824,11 @@ coff_write_relocs (abfd, first_undef)
          if (bfd_write ((PTR) & dst, 1, RELSZ, abfd) != RELSZ)
            return false;
        }
+
+#ifdef TARG_AUX
+      if (p != NULL)
+       free (p);
+#endif
     }
 
   return true;
@@ -1569,11 +1892,12 @@ coff_set_flags (abfd, magicp, flagsp)
          case bfd_mach_i960_ka_sa:
            flags = F_I960KA;
            break;
-           /* start-sanitize-i960xl */
-         case bfd_mach_i960_xl:
-           flags = F_I960XL;
+         case bfd_mach_i960_jx:
+           flags = F_I960JX;
+           break;
+         case bfd_mach_i960_hx:
+           flags = F_I960HX;
            break;
-           /* end-sanitize-i960xl */
          default:
            return false;
          }
@@ -1603,13 +1927,24 @@ coff_set_flags (abfd, magicp, flagsp)
       return true;
       break;
 #endif
+#ifdef I860MAGIC
+    case bfd_arch_i860:
+      *magicp = I860MAGIC;
+      return true;
+      break;
+#endif
 #ifdef MC68MAGIC
     case bfd_arch_m68k:
 #ifdef APOLLOM68KMAGIC
       *magicp = APOLLO_COFF_VERSION_NUMBER;
+#else
+      /* NAMES_HAVE_UNDERSCORE may be defined by coff-u68k.c.  */
+#ifdef NAMES_HAVE_UNDERSCORE
+      *magicp = MC68KBCSMAGIC;
 #else
       *magicp = MC68MAGIC;
 #endif
+#endif
 #ifdef LYNXOS
       /* Just overwrite the usual value if we're doing Lynx. */
       *magicp = LYNXCOFFMAGIC;
@@ -1634,13 +1969,16 @@ coff_set_flags (abfd, magicp, flagsp)
        case bfd_mach_h8300h:
          *magicp = H8300HMAGIC;
          return true;
+       case bfd_mach_h8300s:
+         *magicp = H8300SMAGIC;
+         return true;
        }
       break;
 #endif
 
 #ifdef SH_ARCH_MAGIC_BIG
     case bfd_arch_sh:
-      if (abfd->xvec->byteorder_big_p)
+      if (bfd_big_endian (abfd))
        *magicp = SH_ARCH_MAGIC_BIG;
       else
        *magicp = SH_ARCH_MAGIC_LITTLE;
@@ -1667,7 +2005,7 @@ coff_set_flags (abfd, magicp, flagsp)
 #endif
 #ifdef A29K_MAGIC_BIG
     case bfd_arch_a29k:
-      if (abfd->xvec->byteorder_big_p)
+      if (bfd_big_endian (abfd))
        *magicp = A29K_MAGIC_BIG;
       else
        *magicp = A29K_MAGIC_LITTLE;
@@ -1737,6 +2075,44 @@ coff_compute_section_file_positions (abfd)
 #endif
   unsigned int count;
 
+#ifdef RS6000COFF_C
+  /* On XCOFF, if we have symbols, set up the .debug section.  */
+  if (bfd_get_symcount (abfd) > 0)
+    {
+      bfd_size_type sz;
+      bfd_size_type i, symcount;
+      asymbol **symp;
+
+      sz = 0;
+      symcount = bfd_get_symcount (abfd);
+      for (symp = abfd->outsymbols, i = 0; i < symcount; symp++, i++)
+       {
+         coff_symbol_type *cf;
+
+         cf = coff_symbol_from (abfd, *symp);
+         if (cf != NULL
+             && cf->native != NULL
+             && SYMNAME_IN_DEBUG (&cf->native->u.syment))
+           {
+             size_t len;
+
+             len = strlen (bfd_asymbol_name (*symp));
+             if (len > SYMNMLEN)
+               sz += len + 3;
+           }
+       }
+      if (sz > 0)
+       {
+         asection *dsec;
+
+         dsec = bfd_make_section_old_way (abfd, ".debug");
+         if (dsec == NULL)
+           abort ();
+         dsec->_raw_size = sz;
+         dsec->flags |= SEC_HAS_CONTENTS;
+       }
+    }
+#endif
 
 #ifdef COFF_IMAGE_WITH_PE
   int page_size;
@@ -1746,8 +2122,10 @@ coff_compute_section_file_positions (abfd)
     }
   else
     page_size = PE_DEF_FILE_ALIGNMENT;
-#elif defined (COFF_PAGE_SIZE)
+#else
+#ifdef COFF_PAGE_SIZE
   int page_size = COFF_PAGE_SIZE;
+#endif
 #endif
 
   if (bfd_get_start_address (abfd))
@@ -1760,11 +2138,22 @@ coff_compute_section_file_positions (abfd)
   if (abfd->flags & EXEC_P)
     sofar += AOUTSZ;
 #ifdef RS6000COFF_C
+  else if (xcoff_data (abfd)->full_aouthdr)
+    sofar += AOUTSZ;
   else
     sofar += SMALL_AOUTSZ;
 #endif
 
   sofar += abfd->section_count * SCNHSZ;
+
+#ifdef RS6000COFF_C
+  /* XCOFF handles overflows in the reloc and line number count fields
+     by allocating a new section header to hold the correct counts.  */
+  for (current = abfd->sections; current != NULL; current = current->next)
+    if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
+      sofar += SCNHSZ;
+#endif
+
   for (current = abfd->sections, count = 1;
        current != (asection *) NULL;
        current = current->next, ++count)
@@ -1775,32 +2164,23 @@ coff_compute_section_file_positions (abfd)
       if (!(current->flags & SEC_HAS_CONTENTS))
        continue;
 
-#ifdef COFF_WITH_PE
-      /* Do not include the .junk section.  This is where we collect section
-         data which we don't need.  This is mainly the MS .debug$ data which
-         stores codeview debug data. */
-      if (strcmp (current->name, ".junk") == 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... */
 #ifndef I960
-      {
-       /* make sure this section is aligned on the right boundary - by
-          padding the previous section up if necessary */
+      if ((abfd->flags & EXEC_P) != 0)
+       {
+         /* make sure this section is aligned on the right boundary - by
+            padding the previous section up if necessary */
 
-       old_sofar = sofar;
-       sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
-       if (previous != (asection *) NULL)
-         {
-           previous->_raw_size += sofar - old_sofar;
-         }
-      }
+         old_sofar = sofar;
+         sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+         if (previous != (asection *) NULL)
+           {
+             previous->_raw_size += sofar - old_sofar;
+           }
+       }
 
 #endif
 
@@ -1814,9 +2194,32 @@ 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. Cooked_size becomes very useful. */
-      current->_cooked_size = current->_raw_size;
+      /* With PE we have to pad each section to be a multiple of its
+        page size too, and remember both sizes.  */
+
+      if (coff_section_data (abfd, current) == NULL)
+       {
+         current->used_by_bfd =
+           (PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata));
+         if (current->used_by_bfd == NULL)
+           {
+             /* FIXME: Return error.  */
+             abort ();
+           }
+       }
+      if (pei_section_data (abfd, current) == NULL)
+       {
+         coff_section_data (abfd, current)->tdata =
+           (PTR) bfd_zalloc (abfd, sizeof (struct pei_section_tdata));
+         if (coff_section_data (abfd, current)->tdata == NULL)
+           {
+             /* FIXME: Return error.  */
+             abort ();
+           }
+       }
+      if (pei_section_data (abfd, current)->virt_size == 0)
+       pei_section_data (abfd, current)->virt_size = current->_raw_size;
+
       current->_raw_size = (current->_raw_size + page_size -1) & -page_size;
 #endif
 
@@ -1824,9 +2227,21 @@ coff_compute_section_file_positions (abfd)
 
 #ifndef I960
       /* make sure that this section is of the right size too */
-      old_sofar = sofar;
-      sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
-      current->_raw_size += sofar - old_sofar;
+      if ((abfd->flags & EXEC_P) == 0)
+       {
+         bfd_size_type old_size;
+
+         old_size = current->_raw_size;
+         current->_raw_size = BFD_ALIGN (current->_raw_size,
+                                         1 << current->alignment_power);
+         sofar += current->_raw_size - old_size;
+       }
+      else
+       {
+         old_sofar = sofar;
+         sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
+         current->_raw_size += sofar - old_sofar;
+       }
 #endif
 
 #ifdef _LIB
@@ -1845,7 +2260,11 @@ coff_compute_section_file_positions (abfd)
 
 }
 
-#ifndef RS6000COFF_C
+#if 0
+
+/* This can never work, because it is called too late--after the
+   section positions have been set.  I can't figure out what it is
+   for, so I am going to disable it--Ian Taylor 20 March 1996.  */
 
 /* If .file, .text, .data, .bss symbols are missing, add them.  */
 /* @@ Should we only be adding missing symbols, or overriding the aux
@@ -1897,10 +2316,7 @@ coff_add_missing_symbols (abfd)
   nsyms += need_text + need_data + need_bss + need_file;
   sympp2 = (asymbol **) bfd_alloc_by_size_t (abfd, nsyms * sizeof (asymbol *));
   if (!sympp2)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
   memcpy (sympp2, sympp, i * sizeof (asymbol *));
   if (need_file)
     {
@@ -1918,9 +2334,7 @@ coff_add_missing_symbols (abfd)
   return true;
 }
 
-#endif /* ! defined (RS6000COFF_C) */
-
-
+#endif /* 0 */
 
 /* SUPPRESS 558 */
 /* SUPPRESS 529 */
@@ -1937,25 +2351,28 @@ coff_write_object_contents (abfd)
   file_ptr sym_base;
   unsigned long reloc_size = 0;
   unsigned long lnno_size = 0;
+  boolean long_section_names;
   asection *text_sec = NULL;
   asection *data_sec = NULL;
   asection *bss_sec = NULL;
-
   struct internal_filehdr internal_f;
   struct internal_aouthdr internal_a;
+#ifdef COFF_LONG_SECTION_NAMES
+  size_t string_size = STRING_SIZE_SIZE;
+#endif
 
   bfd_set_error (bfd_error_system_call);
 
-  if (abfd->output_has_begun == false)
-    coff_compute_section_file_positions (abfd);
-
-  reloc_base = obj_relocbase (abfd);
-
   /* Make a pass through the symbol table to count line number entries and
      put them into the correct asections */
 
   lnno_size = coff_count_linenumbers (abfd) * LINESZ;
 
+  if (abfd->output_has_begun == false)
+    coff_compute_section_file_positions (abfd);
+
+  reloc_base = obj_relocbase (abfd);
+
   /* Work out the size of the reloc and linno areas */
 
   for (current = abfd->sections; current != NULL; current =
@@ -1999,13 +2416,17 @@ coff_write_object_contents (abfd)
     {
       scn_base = FILHSZ;
 #ifdef RS6000COFF_C
-      scn_base += SMALL_AOUTSZ;
+      if (xcoff_data (abfd)->full_aouthdr)
+       scn_base += AOUTSZ;
+      else
+       scn_base += SMALL_AOUTSZ;
 #endif
     }
 
   if (bfd_seek (abfd, scn_base, SEEK_SET) != 0)
     return false;
 
+  long_section_names = false;
   for (current = abfd->sections;
        current != NULL;
        current = current->next)
@@ -2013,14 +2434,6 @@ coff_write_object_contents (abfd)
       struct internal_scnhdr section;
 
 #ifdef COFF_WITH_PE
-      /* Do not include the .junk section.  This is where we collect section
-        data which we don't need.  This is mainly the MS .debug$ data which
-        stores codeview debug data. */
-      if (strcmp (current->name, ".junk") == 0)
-       {
-         continue;
-       }
-
       /* If we've got a .reloc section, remember. */
 
 #ifdef COFF_IMAGE_WITH_PE
@@ -2032,7 +2445,26 @@ coff_write_object_contents (abfd)
 
 #endif
       internal_f.f_nscns++;
-      strncpy (&(section.s_name[0]), current->name, 8);
+
+      strncpy (section.s_name, current->name, SCNNMLEN);
+
+#ifdef COFF_LONG_SECTION_NAMES
+      /* Handle long section names as in PE.  This must be compatible
+         with the code in coff_write_symbols.  */
+      {
+       size_t len;
+
+       len = strlen (current->name);
+       if (len > SCNNMLEN)
+         {
+           memset (section.s_name, 0, SCNNMLEN);
+           sprintf (section.s_name, "/%lu", (unsigned long) string_size);
+           string_size += len + 1;
+           long_section_names = true;
+         }
+      }
+#endif
+
 #ifdef _LIB
       /* Always set s_vaddr of .lib to 0.  This is right for SVR3.2
         Ian Taylor <ian@cygnus.com>.  */
@@ -2040,12 +2472,20 @@ coff_write_object_contents (abfd)
        section.s_vaddr = 0;
       else
 #endif
-      section.s_vaddr = current->lma;
+      section.s_vaddr = current->vma;
       section.s_paddr = current->lma;
       section.s_size =  current->_raw_size;
 
 #ifdef COFF_WITH_PE
-      section.s_paddr = current->_cooked_size;
+      section.s_paddr = 0;
+#endif
+#ifdef COFF_IMAGE_WITH_PE
+      /* Reminder: s_paddr holds the virtual size of the section.  */
+      if (coff_section_data (abfd, current) != NULL
+         && pei_section_data (abfd, current) != NULL)
+       section.s_paddr = pei_section_data (abfd, current)->virt_size;
+      else
+       section.s_paddr = 0;
 #endif
 
       /*
@@ -2070,6 +2510,15 @@ coff_write_object_contents (abfd)
       if (current->lineno_count != 0)
        haslinno = true;
 
+#ifdef RS6000COFF_C
+      /* Indicate the use of an XCOFF overflow section header.  */
+      if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
+       {
+         section.s_nreloc = 0xffff;
+         section.s_nlnno = 0xffff;
+       }
+#endif
+
       section.s_flags = sec_to_styp_flags (current->name, current->flags);
 
       if (!strcmp (current->name, _TEXT))
@@ -2107,9 +2556,99 @@ coff_write_object_contents (abfd)
              || bfd_write ((PTR) (&buff), 1, SCNHSZ, abfd) != SCNHSZ)
            return false;
        }
+
+#ifdef COFF_WITH_PE
+      /* PE stores COMDAT section information in the symbol table.  If
+         this section is supposed to have some COMDAT info, track down
+         the symbol in the symbol table and modify it.  */
+      if ((current->flags & SEC_LINK_ONCE) != 0)
+       {
+         unsigned int i, count;
+         asymbol **psym;
+         coff_symbol_type *csym;
+
+         count = bfd_get_symcount (abfd);
+         for (i = 0, psym = abfd->outsymbols; i < count; i++, psym++)
+           {
+             /* Here *PSYM is the section symbol for CURRENT.  */
+
+             if (strcmp ((*psym)->name, current->name) == 0)
+               {
+                 csym = coff_symbol_from (abfd, *psym);
+                 if (csym == NULL
+                     || csym->native == NULL
+                     || csym->native->u.syment.n_numaux < 1
+                     || csym->native->u.syment.n_sclass != C_STAT
+                     || csym->native->u.syment.n_type != T_NULL)
+                   continue;
+                 break;
+               }
+           }
+
+         /* Did we find it?
+            Note that we might not if we're converting the file from
+            some other object file format.  */
+         if (i < count)
+           {
+             combined_entry_type *aux;
+
+             /* We don't touch the x_checksum field.  The
+                x_associated field is not currently supported.  */
+
+             aux = csym->native + 1;
+             switch (current->flags & SEC_LINK_DUPLICATES)
+               {
+               case SEC_LINK_DUPLICATES_DISCARD:
+                 aux->u.auxent.x_scn.x_comdat = IMAGE_COMDAT_SELECT_ANY;
+                 break;
+
+               case SEC_LINK_DUPLICATES_ONE_ONLY:
+                 aux->u.auxent.x_scn.x_comdat =
+                   IMAGE_COMDAT_SELECT_NODUPLICATES;
+                 break;
+
+               case SEC_LINK_DUPLICATES_SAME_SIZE:
+                 aux->u.auxent.x_scn.x_comdat =
+                   IMAGE_COMDAT_SELECT_SAME_SIZE;
+                 break;
+
+               case SEC_LINK_DUPLICATES_SAME_CONTENTS:
+                 aux->u.auxent.x_scn.x_comdat =
+                   IMAGE_COMDAT_SELECT_EXACT_MATCH;
+                 break;
+               }
+           }
+       }
+#endif /* COFF_WITH_PE */
     }
 
+#ifdef RS6000COFF_C
+  /* XCOFF handles overflows in the reloc and line number count fields
+     by creating a new section header to hold the correct values.  */
+  for (current = abfd->sections; current != NULL; current = current->next)
+    {
+      if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
+       {
+         struct internal_scnhdr scnhdr;
+         SCNHDR buff;
 
+         internal_f.f_nscns++;
+         strncpy (&(scnhdr.s_name[0]), current->name, 8);
+         scnhdr.s_paddr = current->reloc_count;
+         scnhdr.s_vaddr = current->lineno_count;
+         scnhdr.s_size = 0;
+         scnhdr.s_scnptr = 0;
+         scnhdr.s_relptr = current->rel_filepos;
+         scnhdr.s_lnnoptr = current->line_filepos;
+         scnhdr.s_nreloc = current->target_index;
+         scnhdr.s_nlnno = current->target_index;
+         scnhdr.s_flags = STYP_OVRFLO;
+         if (coff_swap_scnhdr_out (abfd, &scnhdr, &buff) == 0
+             || bfd_write ((PTR) &buff, 1, SCNHSZ, abfd) != SCNHSZ)
+           return false;
+       }
+    }
+#endif
 
   /* OK, now set up the filehdr... */
 
@@ -2131,8 +2670,10 @@ coff_write_object_contents (abfd)
     {
       internal_f.f_opthdr = 0;
 #ifdef RS6000COFF_C
-      /* XCOFF seems to always write at least a small a.out header.  */
-      internal_f.f_opthdr = SMALL_AOUTSZ;
+      if (xcoff_data (abfd)->full_aouthdr)
+       internal_f.f_opthdr = AOUTSZ;
+      else
+       internal_f.f_opthdr = SMALL_AOUTSZ;
 #endif
     }
 
@@ -2143,7 +2684,8 @@ coff_write_object_contents (abfd)
   if (abfd->flags & EXEC_P)
     internal_f.f_flags |= F_EXEC;
 
-  if (!abfd->xvec->byteorder_big_p)
+  /* FIXME: this is wrong for PPC_PE! */
+  if (bfd_little_endian (abfd))
     internal_f.f_flags |= F_AR32WR;
   else
     internal_f.f_flags |= F_AR32W;
@@ -2185,6 +2727,15 @@ coff_write_object_contents (abfd)
       internal_a.magic = NMAGIC; /* Assume separate i/d */
 #define __A_MAGIC_SET__
 #endif /* A29K */
+#ifdef TIC80
+    internal_a.magic = TIC80MAGIC;
+#define __A_MAGIC_SET__
+#endif /* TIC80 */
+#ifdef I860
+    /* FIXME: What are the a.out magic numbers for the i860?  */
+    internal_a.magic = 0;
+#define __A_MAGIC_SET__
+#endif /* I860 */
 #ifdef I960
     internal_a.magic = (magic == I960ROMAGIC ? NMAGIC : OMAGIC);
 #define __A_MAGIC_SET__
@@ -2203,6 +2754,16 @@ coff_write_object_contents (abfd)
 #define __A_MAGIC_SET__
 #if defined(LYNXOS)
     internal_a.magic = LYNXCOFFMAGIC;
+#else
+#if defined(TARG_AUX)
+    internal_a.magic = (abfd->flags & D_PAGED ? PAGEMAGICPEXECPAGED :
+                       abfd->flags & WP_TEXT ? PAGEMAGICPEXECSWAPPED :
+                       PAGEMAGICEXECSWAPPED);
+#else
+#if defined (PAGEMAGICPEXECPAGED)
+    internal_a.magic = PAGEMAGICPEXECPAGED;
+#endif
+#endif /* TARG_AUX */
 #endif /* LYNXOS */
 #endif /* M68 || WE32K || M68K */
 
@@ -2210,9 +2771,9 @@ coff_write_object_contents (abfd)
 #define __A_MAGIC_SET__
     internal_a.magic = ZMAGIC;
 #endif 
-#if defined(PPC)
+#if defined(PPC_PE)
 #define __A_MAGIC_SET__
-    internal_a.magic = PPCMAGIC;
+    internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
 #endif
 #if defined(I386)
 #define __A_MAGIC_SET__
@@ -2253,7 +2814,7 @@ coff_write_object_contents (abfd)
   if (bfd_get_symcount (abfd) != 0)
     {
       int firstundef;
-#ifndef RS6000COFF_C
+#if 0
       if (!coff_add_missing_symbols (abfd))
        return false;
 #endif
@@ -2267,6 +2828,23 @@ coff_write_object_contents (abfd)
       if (! coff_write_relocs (abfd, firstundef))
        return false;
     }
+#ifdef COFF_IMAGE_WITH_PE
+#ifdef PPC_PE
+  else if ((abfd->flags & EXEC_P) != 0)
+    {
+      bfd_byte b;
+
+      /* PowerPC PE appears to require that all executable files be
+         rounded up to the page size.  */
+      b = 0;
+      if (bfd_seek (abfd,
+                   BFD_ALIGN (sym_base, COFF_PAGE_SIZE) - 1,
+                   SEEK_SET) != 0
+         || bfd_write (&b, 1, 1, abfd) != 1)
+       return false;
+    }
+#endif
+#endif
 
   /* If bfd_get_symcount (abfd) != 0, then we are not using the COFF
      backend linker, and obj_raw_syment_count is not valid until after
@@ -2282,7 +2860,10 @@ coff_write_object_contents (abfd)
     }
   else
     {
-      internal_f.f_symptr = 0;
+      if (long_section_names)
+       internal_f.f_symptr = sym_base;
+      else
+       internal_f.f_symptr = 0;
       internal_f.f_flags |= F_LSYMS;
     }
 
@@ -2299,28 +2880,25 @@ coff_write_object_contents (abfd)
   if (bss_sec)
     {
       internal_a.bsize = bfd_get_section_size_before_reloc (bss_sec);
+      if (internal_a.bsize && bss_sec->vma < internal_a.data_start)
+       internal_a.data_start = bss_sec->vma;
     }
 
   internal_a.entry = bfd_get_start_address (abfd);
   internal_f.f_nsyms = obj_raw_syment_count (abfd);
 
 #ifdef RS6000COFF_C
-  if ((abfd->flags & EXEC_P) != 0)
+  if (xcoff_data (abfd)->full_aouthdr)
     {
-      bfd_vma entry, toc;
+      bfd_vma toc;
       asection *loader_sec;
 
-      entry = bfd_get_start_address (abfd);
-      if (text_sec != NULL
-         && entry >= text_sec->vma
-         && entry < text_sec->vma + bfd_section_size (abfd, text_sec))
-       internal_a.o_snentry = text_sec->target_index;
-      else if (data_sec != NULL
-              && entry >= data_sec->vma
-              && entry < data_sec->vma + bfd_section_size (abfd, data_sec))
-       internal_a.o_snentry = data_sec->target_index;
-      else
-       internal_a.o_snentry = 0;
+      internal_a.vstamp = 1;
+
+      internal_a.o_snentry = xcoff_data (abfd)->snentry;
+      if (internal_a.o_snentry == 0)
+       internal_a.entry = (bfd_vma) -1;
+
       if (text_sec != NULL)
        {
          internal_a.o_sntext = text_sec->target_index;
@@ -2353,16 +2931,7 @@ coff_write_object_contents (abfd)
 
       toc = xcoff_data (abfd)->toc;
       internal_a.o_toc = toc;
-      if (text_sec != NULL
-         && toc >= text_sec->vma
-         && toc < text_sec->vma + bfd_section_size (abfd, text_sec))
-       internal_a.o_sntoc = text_sec->target_index;
-      else if (data_sec != NULL
-              && toc >= data_sec->vma
-              && toc < data_sec->vma + bfd_section_size (abfd, data_sec))
-       internal_a.o_sntoc = data_sec->target_index;
-      else
-       internal_a.o_sntoc = 0;
+      internal_a.o_sntoc = xcoff_data (abfd)->sntoc;
 
       internal_a.o_modtype = xcoff_data (abfd)->modtype;
       if (xcoff_data (abfd)->cputype != -1)
@@ -2393,25 +2962,33 @@ coff_write_object_contents (abfd)
   if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
     return false;
   {
-    FILHDR buff;
-    coff_swap_filehdr_out (abfd, (PTR) & internal_f, (PTR) buff);
-    if (bfd_write ((PTR) buff, 1, FILHSZ, abfd) != FILHSZ)
+    char buff[FILHSZ];
+    coff_swap_filehdr_out (abfd, (PTR) & internal_f, (PTR) buff);
+    if (bfd_write ((PTR) buff, 1, FILHSZ, abfd) != FILHSZ)
       return false;
   }
   if (abfd->flags & EXEC_P)
     {
-      AOUTHDR buff;
-      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[AOUTSZ];
+      coff_swap_aouthdr_out (abfd, (PTR) & internal_a, (PTR) buff);
+      if (bfd_write ((PTR) buff, 1, AOUTSZ, abfd) != AOUTSZ)
        return false;
     }
 #ifdef RS6000COFF_C
   else
     {
       AOUTHDR buff;
+      size_t size;
+
       /* XCOFF seems to always write at least a small a.out header.  */
       coff_swap_aouthdr_out (abfd, (PTR) &internal_a, (PTR) &buff);
-      if (bfd_write ((PTR) &buff, 1, SMALL_AOUTSZ, abfd) != SMALL_AOUTSZ)
+      if (xcoff_data (abfd)->full_aouthdr)
+       size = AOUTSZ;
+      else
+       size = SMALL_AOUTSZ;
+      if (bfd_write ((PTR) &buff, 1, size, abfd) != size)
        return false;
     }
 #endif
@@ -2430,13 +3007,44 @@ coff_set_section_contents (abfd, section, location, offset, count)
   if (abfd->output_has_begun == false) /* set by bfd.c handler */
     coff_compute_section_file_positions (abfd);
 
-#ifdef _LIB
-  /* If this is a .lib section, bump the vma address so that it
-       winds up being the number of .lib sections output.  This is
-       right for SVR3.2.  Shared libraries should probably get more
-       generic support.  Ian Taylor <ian@cygnus.com>.  */
-  if (strcmp (section->name, _LIB) == 0)
-    ++section->lma;
+#if defined(_LIB) && !defined(TARG_AUX)
+
+   /* The physical address field of a .lib section is used to hold the
+      number of shared libraries in the section.  This code counts the
+      number of sections being written, and increments the lma field
+      with the number.
+
+      I have found no documentation on the contents of this section.
+      Experimentation indicates that the section contains zero or more
+      records, each of which has the following structure:
+
+      - a (four byte) word holding the length of this record, in words,
+      - a word that always seems to be set to "2",
+      - the path to a shared library, null-terminated and then padded
+        to a whole word boundary.
+
+      bfd_assert calls have been added to alert if an attempt is made
+      to write a section which doesn't follow these assumptions.  The
+      code has been tested on ISC 4.1 by me, and on SCO by Robert Lipe
+      <robertl@arnet.com> (Thanks!).
+  
+      Gvran Uddeborg <gvran@uddeborg.pp.se> */
+
+    if (strcmp (section->name, _LIB) == 0)
+      {
+       bfd_byte *rec, *recend;
+
+       rec = (bfd_byte *) location;
+       recend = rec + count;
+       while (rec < recend)
+         {
+           ++section->lma;
+           rec += bfd_get_32 (abfd, rec) * 4;
+         }
+
+       BFD_ASSERT (rec == recend);
+      }
+
 #endif
 
   /* Don't write out bss sections - one way to do this is to
@@ -2490,10 +3098,7 @@ buy_and_read (abfd, where, seek_direction, size)
 {
   PTR area = (PTR) bfd_alloc (abfd, size);
   if (!area)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return (NULL);
-    }
+    return (NULL);
   if (bfd_seek (abfd, where, seek_direction) != 0
       || bfd_read (area, 1, size, abfd) != size)
     return (NULL);
@@ -2539,10 +3144,7 @@ coff_slurp_line_table (abfd, asect)
   lineno_cache =
     (alent *) bfd_alloc (abfd, (size_t) ((asect->lineno_count + 1) * sizeof (alent)));
   if (lineno_cache == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
   else
     {
       unsigned int counter = 0;
@@ -2557,11 +3159,27 @@ coff_slurp_line_table (abfd, asect)
 
          if (cache_ptr->line_number == 0)
            {
-             coff_symbol_type *sym =
-             (coff_symbol_type *) (dst.l_addr.l_symndx
-                     + obj_raw_syments (abfd))->u.syment._n._n_n._n_zeroes;
+             boolean warned;
+             long symndx;
+             coff_symbol_type *sym;
+
+             warned = false;
+             symndx = dst.l_addr.l_symndx;
+             if (symndx < 0 || symndx >= obj_raw_syment_count (abfd))
+               {
+                 (*_bfd_error_handler)
+                   ("%s: warning: illegal symbol index %ld in line numbers",
+                    bfd_get_filename (abfd), dst.l_addr.l_symndx);
+                 symndx = 0;
+                 warned = true;
+               }
+             /* FIXME: We should not be casting between ints and
+                 pointers like this.  */
+             sym = ((coff_symbol_type *)
+                    ((symndx + obj_raw_syments (abfd))
+                     ->u.syment._n._n_n._n_zeroes));
              cache_ptr->u.sym = (asymbol *) sym;
-             if (sym->lineno != NULL)
+             if (sym->lineno != NULL && ! warned)
                {
                  (*_bfd_error_handler)
                    ("%s: warning: duplicate line number information for `%s'",
@@ -2614,20 +3232,14 @@ coff_slurp_symbol_table (abfd)
                             * sizeof (coff_symbol_type))));
 
   if (cached_area == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }                          /* on error */
+    return false;
   table_ptr = ((unsigned int *)
               bfd_alloc (abfd,
                          (obj_raw_syment_count (abfd)
                           * sizeof (unsigned int))));
 
   if (table_ptr == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
   else
     {
       coff_symbol_type *dst = cached_area;
@@ -2667,6 +3279,8 @@ coff_slurp_symbol_table (abfd)
 #ifdef COFF_WITH_PE
             /* PE uses storage class 0x68 to denote a section symbol */
             case C_SECTION:
+           /* PE uses storage class 0x67 for a weak external symbol.  */
+           case C_NT_WEAK:
 #endif
              if ((src->u.syment.n_scnum) == 0)
                {
@@ -2707,6 +3321,11 @@ coff_slurp_symbol_table (abfd)
                dst->symbol.flags |= BSF_NOT_AT_END;
 #endif
 
+#ifdef COFF_WITH_PE
+             if (src->u.syment.n_sclass == C_NT_WEAK)
+               dst->symbol.flags = BSF_WEAK;
+#endif
+
              break;
 
            case C_STAT:        /* static                        */
@@ -2718,15 +3337,14 @@ coff_slurp_symbol_table (abfd)
                dst->symbol.flags = BSF_DEBUGGING;
              else
                dst->symbol.flags = BSF_LOCAL;
-             /*
-         Base the value as an index from the base of the section, if
-         there is one
-         */
+
+             /* Base the value as an index from the base of the
+                section, if there is one.  */
              if (dst->symbol.section)
-               dst->symbol.value = (src->u.syment.n_value) -
-                 dst->symbol.section->vma;
+               dst->symbol.value = (src->u.syment.n_value
+                                    - dst->symbol.section->vma);
              else
-               dst->symbol.value = (src->u.syment.n_value);
+               dst->symbol.value = src->u.syment.n_value;
              break;
 
            case C_MOS: /* member of structure   */
@@ -2762,6 +3380,8 @@ coff_slurp_symbol_table (abfd)
            case C_RSYM:
            case C_RPSYM:
            case C_STSYM:
+           case C_BCOMM:
+           case C_ECOMM:
            case C_DECL:
            case C_ENTRY:
            case C_FUN:
@@ -2815,13 +3435,13 @@ coff_slurp_symbol_table (abfd)
 #endif
 
            case C_BLOCK:       /* ".bb" or ".eb"                */
-           case C_FCN: /* ".bf" or ".ef"                */
+           case C_FCN:         /* ".bf" or ".ef"                */
            case C_EFCN:        /* physical end of function      */
              dst->symbol.flags = BSF_LOCAL;
-             /*
-         Base the value as an index from the base of the section
-         */
-             dst->symbol.value = (src->u.syment.n_value) - dst->symbol.section->vma;
+             /* Base the value as an index from the base of the
+                section.  */
+             dst->symbol.value = (src->u.syment.n_value
+                                  - dst->symbol.section->vma);
              break;
 
            case C_NULL:
@@ -2832,8 +3452,9 @@ coff_slurp_symbol_table (abfd)
             /* C_LINE in regular coff is 0x68.  NT has taken over this storage
                class to represent a section symbol */
            case C_LINE:        /* line # reformatted as symbol table entry */
-#endif
+             /* NT uses 0x67 for a weak symbol, not C_ALIAS.  */
            case C_ALIAS:       /* duplicate tag                 */
+#endif
            case C_HIDDEN:      /* ext symbol in dmert public lib */
            default:
              (*_bfd_error_handler)
@@ -2991,10 +3612,7 @@ coff_slurp_reloc_table (abfd, asect, symbols)
     bfd_alloc (abfd, (size_t) (asect->reloc_count * sizeof (arelent)));
 
   if (reloc_cache == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
+    return false;
 
 
   for (idx = 0; idx < asect->reloc_count; idx++)
@@ -3023,11 +3641,20 @@ coff_slurp_reloc_table (abfd, asect, symbols)
 
       if (dst.r_symndx != -1)
        {
-         /* @@ Should never be greater than count of symbols!  */
-         if (dst.r_symndx >= obj_conv_table_size (abfd))
-           abort ();
-         cache_ptr->sym_ptr_ptr = symbols + obj_convert (abfd)[dst.r_symndx];
-         ptr = *(cache_ptr->sym_ptr_ptr);
+         if (dst.r_symndx < 0 || dst.r_symndx >= obj_conv_table_size (abfd))
+           {
+             (*_bfd_error_handler)
+               ("%s: warning: illegal symbol index %ld in relocs",
+                bfd_get_filename (abfd), dst.r_symndx);
+             cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
+             ptr = 0;
+           }
+         else
+           {
+             cache_ptr->sym_ptr_ptr = (symbols
+                                       + obj_convert (abfd)[dst.r_symndx]);
+             ptr = *(cache_ptr->sym_ptr_ptr);
+           }
        }
       else
        {
@@ -3052,6 +3679,14 @@ coff_slurp_reloc_table (abfd, asect, symbols)
       RTYPE2HOWTO (cache_ptr, &dst);
 #endif
 
+      if (cache_ptr->howto == NULL)
+       {
+         (*_bfd_error_handler)
+           ("%s: illegal relocation type %d at address 0x%lx",
+            bfd_get_filename (abfd), dst.r_type, (long) dst.r_vaddr);
+         bfd_set_error (bfd_error_bad_value);
+         return false;
+       }
     }
 
   asect->relocation = reloc_cache;
@@ -3193,8 +3828,12 @@ dummy_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 #endif
 #else /* ! defined (coff_relocate_section) */
 #define coff_relocate_section NULL
+#ifndef coff_bfd_link_hash_table_create
 #define coff_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
+#endif
+#ifndef coff_bfd_link_add_symbols
 #define coff_bfd_link_add_symbols _bfd_generic_link_add_symbols
+#endif
 #define coff_bfd_final_link _bfd_generic_final_link
 #endif /* ! defined (coff_relocate_section) */
 #define coff_bfd_link_split_section  _bfd_generic_link_split_section
@@ -3207,6 +3846,10 @@ dummy_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
 #define coff_adjust_symndx NULL
 #endif
 
+#ifndef coff_link_add_one_symbol
+#define coff_link_add_one_symbol _bfd_generic_link_add_one_symbol
+#endif
+
 static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
 {
   coff_swap_aux_in, coff_swap_sym_in, coff_swap_lineno_in,
@@ -3219,6 +3862,11 @@ static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
   true,
 #else
   false,
+#endif
+#ifdef COFF_LONG_SECTION_NAMES
+  true,
+#else
+  false,
 #endif
   coff_swap_filehdr_in, coff_swap_aouthdr_in, coff_swap_scnhdr_in,
   coff_swap_reloc_in, coff_bad_format_hook, coff_set_arch_mach_hook,
@@ -3227,7 +3875,7 @@ static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
   coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
   coff_sym_is_global, coff_compute_section_file_positions,
   coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
-  coff_adjust_symndx
+  coff_adjust_symndx, coff_link_add_one_symbol
 };
 
 #define        coff_close_and_cleanup _bfd_generic_close_and_cleanup
This page took 0.040434 seconds and 4 git commands to generate.