* gas/h8300/h8300.exp (h8sx_disp2, h8sx_rtsl, h8sx_mov_imm): Move...

[deliverable/binutils-gdb.git] / bfd / coffgen.c

diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index 74414a15927203d83f3fa2dc5c15df289e6a3852..fcb00fc4737cb03b1cee6a91be9bdf715d81b5c0 100644 (file)
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -1,5 +1,7 @@
 /* Support for the generic parts of COFF, for BFD.
 /* Support for the generic parts of COFF, for BFD.

-   Copyright 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
+   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2000, 2001, 2002
+   Free Software Foundation, Inc.

    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
    Written by Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.


@@ -44,35 +46,35 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 static void coff_fix_symbol_name
   PARAMS ((bfd *, asymbol *, combined_entry_type *, bfd_size_type *,
           asection **, bfd_size_type *));
 static void coff_fix_symbol_name
   PARAMS ((bfd *, asymbol *, combined_entry_type *, bfd_size_type *,
           asection **, bfd_size_type *));

-static boolean coff_write_symbol
-  PARAMS ((bfd *, asymbol *, combined_entry_type *, unsigned int *,
+static bfd_boolean coff_write_symbol
+  PARAMS ((bfd *, asymbol *, combined_entry_type *, bfd_vma *,

           bfd_size_type *, asection **, bfd_size_type *));
           bfd_size_type *, asection **, bfd_size_type *));

-static boolean coff_write_alien_symbol
-  PARAMS ((bfd *, asymbol *, unsigned int *, bfd_size_type *,
+static bfd_boolean coff_write_alien_symbol
+  PARAMS ((bfd *, asymbol *, bfd_vma *, bfd_size_type *,

           asection **, bfd_size_type *));
           asection **, bfd_size_type *));

-static boolean coff_write_native_symbol
-  PARAMS ((bfd *, coff_symbol_type *, unsigned int *, bfd_size_type *,
+static bfd_boolean coff_write_native_symbol
+  PARAMS ((bfd *, coff_symbol_type *, bfd_vma *, bfd_size_type *,

           asection **, bfd_size_type *));
 static void coff_pointerize_aux
   PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
           unsigned int, combined_entry_type *));
           asection **, bfd_size_type *));
 static void coff_pointerize_aux
   PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
           unsigned int, combined_entry_type *));

-static boolean make_a_section_from_file
+static bfd_boolean make_a_section_from_file

   PARAMS ((bfd *, struct internal_scnhdr *, unsigned int));
 static const bfd_target *coff_real_object_p
   PARAMS ((bfd *, struct internal_scnhdr *, unsigned int));
 static const bfd_target *coff_real_object_p

-  PARAMS ((bfd *, unsigned, struct internal_filehdr *, 
+  PARAMS ((bfd *, unsigned, struct internal_filehdr *,

           struct internal_aouthdr *));
 static void fixup_symbol_value
   PARAMS ((bfd *, coff_symbol_type *, struct internal_syment *));
 static char *build_debug_section
   PARAMS ((bfd *));
 static char *copy_name
           struct internal_aouthdr *));
 static void fixup_symbol_value
   PARAMS ((bfd *, coff_symbol_type *, struct internal_syment *));
 static char *build_debug_section
   PARAMS ((bfd *));
 static char *copy_name

-  PARAMS ((bfd *, char *, int));
+  PARAMS ((bfd *, char *, size_t));

 
 #define STRING_SIZE_SIZE (4)
 
 /* Take a section header read from a coff file (in HOST byte order),
    and make a BFD "section" out of it.  This is used by ECOFF.  */
 
 #define STRING_SIZE_SIZE (4)
 
 /* Take a section header read from a coff file (in HOST byte order),
    and make a BFD "section" out of it.  This is used by ECOFF.  */

-static boolean
+static bfd_boolean

 make_a_section_from_file (abfd, hdr, target_index)
      bfd *abfd;
      struct internal_scnhdr *hdr;
 make_a_section_from_file (abfd, hdr, target_index)
      bfd *abfd;
      struct internal_scnhdr *hdr;


@@ -80,6 +82,8 @@ make_a_section_from_file (abfd, hdr, target_index)
 {
   asection *return_section;
   char *name;
 {
   asection *return_section;
   char *name;

+  bfd_boolean result = TRUE;
+  flagword flags;

 
   name = NULL;
 
 
   name = NULL;
 


@@ -99,14 +103,14 @@ make_a_section_from_file (abfd, hdr, target_index)
        {
          strings = _bfd_coff_read_string_table (abfd);
          if (strings == NULL)
        {
          strings = _bfd_coff_read_string_table (abfd);
          if (strings == NULL)

-           return false;
+           return FALSE;

          /* FIXME: For extra safety, we should make sure that
              strindex does not run us past the end, but right now we
              don't know the length of the string table.  */
          strings += strindex;
          /* FIXME: For extra safety, we should make sure that
              strindex does not run us past the end, but right now we
              don't know the length of the string table.  */
          strings += strindex;

-         name = bfd_alloc (abfd, strlen (strings) + 1);
+         name = bfd_alloc (abfd, (bfd_size_type) strlen (strings) + 1);

          if (name == NULL)
          if (name == NULL)

-           return false;
+           return FALSE;

          strcpy (name, strings);
        }
     }
          strcpy (name, strings);
        }
     }


@@ -114,16 +118,16 @@ make_a_section_from_file (abfd, hdr, target_index)
   if (name == NULL)
     {
       /* Assorted wastage to null-terminate the name, thanks AT&T! */
   if (name == NULL)
     {
       /* Assorted wastage to null-terminate the name, thanks AT&T! */

-      name = bfd_alloc (abfd, sizeof (hdr->s_name) + 1);
+      name = bfd_alloc (abfd, (bfd_size_type) sizeof (hdr->s_name) + 1);

       if (name == NULL)
       if (name == NULL)

-       return false;
+       return FALSE;

       strncpy (name, (char *) &hdr->s_name[0], sizeof (hdr->s_name));
       name[sizeof (hdr->s_name)] = 0;
     }
 
   return_section = bfd_make_section_anyway (abfd, name);
   if (return_section == NULL)
       strncpy (name, (char *) &hdr->s_name[0], sizeof (hdr->s_name));
       name[sizeof (hdr->s_name)] = 0;
     }
 
   return_section = bfd_make_section_anyway (abfd, name);
   if (return_section == NULL)

-    return false;
+    return FALSE;

 
   return_section->vma = hdr->s_vaddr;
   return_section->lma = hdr->s_paddr;
 
   return_section->vma = hdr->s_vaddr;
   return_section->lma = hdr->s_paddr;


@@ -139,10 +143,14 @@ make_a_section_from_file (abfd, hdr, target_index)
   return_section->lineno_count = hdr->s_nlnno;
   return_section->userdata = NULL;
   return_section->next = (asection *) NULL;
   return_section->lineno_count = hdr->s_nlnno;
   return_section->userdata = NULL;
   return_section->next = (asection *) NULL;

-  return_section->flags = bfd_coff_styp_to_sec_flags_hook (abfd, hdr, name);
-

   return_section->target_index = target_index;
 
   return_section->target_index = target_index;
 

+  if (! bfd_coff_styp_to_sec_flags_hook (abfd, hdr, name, return_section,
+                                        & flags))
+    result = FALSE;
+
+  return_section->flags = flags;
+

   /* At least on i386-coff, the line number count for a shared library
      section must be ignored.  */
   if ((return_section->flags & SEC_COFF_SHARED_LIBRARY) != 0)
   /* At least on i386-coff, the line number count for a shared library
      section must be ignored.  */
   if ((return_section->flags & SEC_COFF_SHARED_LIBRARY) != 0)


@@ -153,7 +161,8 @@ make_a_section_from_file (abfd, hdr, target_index)
   /* FIXME: should this check 'hdr->s_size > 0' */
   if (hdr->s_scnptr != 0)
     return_section->flags |= SEC_HAS_CONTENTS;
   /* FIXME: should this check 'hdr->s_size > 0' */
   if (hdr->s_scnptr != 0)
     return_section->flags |= SEC_HAS_CONTENTS;

-  return true;
+
+  return result;

 }
 
 /* Read in a COFF object and make it into a BFD.  This is used by
 }
 
 /* Read in a COFF object and make it into a BFD.  This is used by


@@ -169,7 +178,8 @@ coff_real_object_p (abfd, nscns, internal_f, internal_a)
   flagword oflags = abfd->flags;
   bfd_vma ostart = bfd_get_start_address (abfd);
   PTR tdata;
   flagword oflags = abfd->flags;
   bfd_vma ostart = bfd_get_start_address (abfd);
   PTR tdata;

-  size_t readsize;             /* length of file_info */
+  PTR tdata_save;
+  bfd_size_type readsize;      /* length of file_info */

   unsigned int scnhsz;
   char *external_sections;
 
   unsigned int scnhsz;
   char *external_sections;
 


@@ -197,20 +207,26 @@ coff_real_object_p (abfd, nscns, internal_f, internal_a)
 
   /* Set up the tdata area.  ECOFF uses its own routine, and overrides
      abfd->flags.  */
 
   /* Set up the tdata area.  ECOFF uses its own routine, and overrides
      abfd->flags.  */

+  tdata_save = abfd->tdata.any;

   tdata = bfd_coff_mkobject_hook (abfd, (PTR) internal_f, (PTR) internal_a);
   if (tdata == NULL)
   tdata = bfd_coff_mkobject_hook (abfd, (PTR) internal_f, (PTR) internal_a);
   if (tdata == NULL)

-    return 0;
+    goto fail2;

 
   scnhsz = bfd_coff_scnhsz (abfd);
 
   scnhsz = bfd_coff_scnhsz (abfd);

-  readsize = nscns * scnhsz;
+  readsize = (bfd_size_type) nscns * scnhsz;

   external_sections = (char *) bfd_alloc (abfd, readsize);
   if (!external_sections)
     goto fail;
 
   external_sections = (char *) bfd_alloc (abfd, readsize);
   if (!external_sections)
     goto fail;
 

-  if (bfd_read ((PTR) external_sections, 1, readsize, abfd) != readsize)
+  if (bfd_bread ((PTR) external_sections, readsize, abfd) != readsize)
+    goto fail;
+
+  /* Set the arch/mach *before* swapping in sections; section header swapping
+     may depend on arch/mach info.  */
+  if (! bfd_coff_set_arch_mach_hook (abfd, (PTR) internal_f))

     goto fail;
 
     goto fail;
 

-  /* Now copy data as required; construct all asections etc */
+  /* Now copy data as required; construct all asections etc.  */

   if (nscns != 0)
     {
       unsigned int i;
   if (nscns != 0)
     {
       unsigned int i;


@@ -225,15 +241,12 @@ coff_real_object_p (abfd, nscns, internal_f, internal_a)
        }
     }
 
        }
     }
 

-  /*  make_abs_section (abfd); */
-
-  if (bfd_coff_set_arch_mach_hook (abfd, (PTR) internal_f) == false)
-    goto fail;
-

   return abfd->xvec;
 
  fail:
   bfd_release (abfd, tdata);
   return abfd->xvec;
 
  fail:
   bfd_release (abfd, tdata);

+ fail2:
+  abfd->tdata.any = tdata_save;

   abfd->flags = oflags;
   bfd_get_start_address (abfd) = ostart;
   return (const bfd_target *) NULL;
   abfd->flags = oflags;
   bfd_get_start_address (abfd) = ostart;
   return (const bfd_target *) NULL;


@@ -246,9 +259,9 @@ const bfd_target *
 coff_object_p (abfd)
      bfd *abfd;
 {
 coff_object_p (abfd)
      bfd *abfd;
 {

-  unsigned int filhsz;
-  unsigned int aoutsz;
-  int nscns;
+  bfd_size_type filhsz;
+  bfd_size_type aoutsz;
+  unsigned int nscns;

   PTR filehdr;
   struct internal_filehdr internal_f;
   struct internal_aouthdr internal_a;
   PTR filehdr;
   struct internal_filehdr internal_f;
   struct internal_aouthdr internal_a;


@@ -259,20 +272,30 @@ coff_object_p (abfd)
 
   filehdr = bfd_alloc (abfd, filhsz);
   if (filehdr == NULL)
 
   filehdr = bfd_alloc (abfd, filhsz);
   if (filehdr == NULL)

-    return 0;
-  if (bfd_read (filehdr, 1, filhsz, abfd) != filhsz)
+    return NULL;
+  if (bfd_bread (filehdr, filhsz, abfd) != filhsz)

     {
       if (bfd_get_error () != bfd_error_system_call)
        bfd_set_error (bfd_error_wrong_format);
     {
       if (bfd_get_error () != bfd_error_system_call)
        bfd_set_error (bfd_error_wrong_format);

-      return 0;
+      bfd_release (abfd, filehdr);
+      return NULL;

     }
   bfd_coff_swap_filehdr_in (abfd, filehdr, &internal_f);
   bfd_release (abfd, filehdr);
 
     }
   bfd_coff_swap_filehdr_in (abfd, filehdr, &internal_f);
   bfd_release (abfd, filehdr);
 

-  if (bfd_coff_bad_format_hook (abfd, &internal_f) == false)
+  /* The XCOFF format has two sizes for the f_opthdr.  SMALL_AOUTSZ
+     (less than aoutsz) used in object files and AOUTSZ (equal to
+     aoutsz) in executables.  The bfd_coff_swap_aouthdr_in function
+     expects this header to be aoutsz bytes in length, so we use that
+     value in the call to bfd_alloc below.  But we must be careful to
+     only read in f_opthdr bytes in the call to bfd_bread.  We should
+     also attempt to catch corrupt or non-COFF binaries with a strange
+     value for f_opthdr.  */
+  if (! bfd_coff_bad_format_hook (abfd, &internal_f)
+      || internal_f.f_opthdr > aoutsz)

     {
       bfd_set_error (bfd_error_wrong_format);
     {
       bfd_set_error (bfd_error_wrong_format);

-      return 0;
+      return NULL;

     }
   nscns = internal_f.f_nscns;
 
     }
   nscns = internal_f.f_nscns;
 


@@ -282,12 +305,15 @@ coff_object_p (abfd)
 
       opthdr = bfd_alloc (abfd, aoutsz);
       if (opthdr == NULL)
 
       opthdr = bfd_alloc (abfd, aoutsz);
       if (opthdr == NULL)

-       return 0;;
-      if (bfd_read (opthdr, 1, aoutsz, abfd) != aoutsz)
+       return NULL;
+      if (bfd_bread (opthdr, (bfd_size_type) internal_f.f_opthdr, abfd)
+         != internal_f.f_opthdr)

        {
        {

-         return 0;
+         bfd_release (abfd, opthdr);
+         return NULL;

        }
        }

-      bfd_coff_swap_aouthdr_in (abfd, opthdr, (PTR) & internal_a);
+      bfd_coff_swap_aouthdr_in (abfd, opthdr, (PTR) &internal_a);
+      bfd_release (abfd, opthdr);

     }
 
   return coff_real_object_p (abfd, nscns, &internal_f,
     }
 
   return coff_real_object_p (abfd, nscns, &internal_f,


@@ -336,7 +362,6 @@ coff_get_symtab_upper_bound (abfd)
   return (bfd_get_symcount (abfd) + 1) * (sizeof (coff_symbol_type *));
 }
 
   return (bfd_get_symcount (abfd) + 1) * (sizeof (coff_symbol_type *));
 }
 

-

 /* Canonicalize a COFF symbol table.  */
 
 long
 /* Canonicalize a COFF symbol table.  */
 
 long


@@ -396,12 +421,12 @@ _bfd_coff_internal_syment_name (abfd, sym, buf)
 }
 
 /* Read in and swap the relocs.  This returns a buffer holding the
 }
 
 /* Read in and swap the relocs.  This returns a buffer holding the

-   relocs for section SEC in file ABFD.  If CACHE is true and
+   relocs for section SEC in file ABFD.  If CACHE is TRUE and

    INTERNAL_RELOCS is NULL, the relocs read in will be saved in case
    the function is called again.  If EXTERNAL_RELOCS is not NULL, it
    is a buffer large enough to hold the unswapped relocs.  If
    INTERNAL_RELOCS is not NULL, it is a buffer large enough to hold
    INTERNAL_RELOCS is NULL, the relocs read in will be saved in case
    the function is called again.  If EXTERNAL_RELOCS is not NULL, it
    is a buffer large enough to hold the unswapped relocs.  If
    INTERNAL_RELOCS is not NULL, it is a buffer large enough to hold

-   the swapped relocs.  If REQUIRE_INTERNAL is true, then the return
+   the swapped relocs.  If REQUIRE_INTERNAL is TRUE, then the return

    value must be INTERNAL_RELOCS.  The function returns NULL on error.  */
 
 struct internal_reloc *
    value must be INTERNAL_RELOCS.  The function returns NULL on error.  */
 
 struct internal_reloc *


@@ -409,9 +434,9 @@ _bfd_coff_read_internal_relocs (abfd, sec, cache, external_relocs,
                                require_internal, internal_relocs)
      bfd *abfd;
      asection *sec;
                                require_internal, internal_relocs)
      bfd *abfd;
      asection *sec;

-     boolean cache;
+     bfd_boolean cache;

      bfd_byte *external_relocs;
      bfd_byte *external_relocs;

-     boolean require_internal;
+     bfd_boolean require_internal;

      struct internal_reloc *internal_relocs;
 {
   bfd_size_type relsz;
      struct internal_reloc *internal_relocs;
 {
   bfd_size_type relsz;


@@ -420,6 +445,7 @@ _bfd_coff_read_internal_relocs (abfd, sec, cache, external_relocs,
   bfd_byte *erel;
   bfd_byte *erel_end;
   struct internal_reloc *irel;
   bfd_byte *erel;
   bfd_byte *erel_end;
   struct internal_reloc *irel;

+  bfd_size_type amt;

 
   if (coff_section_data (abfd, sec) != NULL
       && coff_section_data (abfd, sec)->relocs != NULL)
 
   if (coff_section_data (abfd, sec) != NULL
       && coff_section_data (abfd, sec)->relocs != NULL)


@@ -433,24 +459,24 @@ _bfd_coff_read_internal_relocs (abfd, sec, cache, external_relocs,
 
   relsz = bfd_coff_relsz (abfd);
 
 
   relsz = bfd_coff_relsz (abfd);
 

+  amt = sec->reloc_count * relsz;

   if (external_relocs == NULL)
     {
   if (external_relocs == NULL)
     {

-      free_external = (bfd_byte *) bfd_malloc (sec->reloc_count * relsz);
+      free_external = (bfd_byte *) bfd_malloc (amt);

       if (free_external == NULL && sec->reloc_count > 0)
        goto error_return;
       external_relocs = free_external;
     }
 
   if (bfd_seek (abfd, sec->rel_filepos, SEEK_SET) != 0
       if (free_external == NULL && sec->reloc_count > 0)
        goto error_return;
       external_relocs = free_external;
     }
 
   if (bfd_seek (abfd, sec->rel_filepos, SEEK_SET) != 0

-      || (bfd_read (external_relocs, relsz, sec->reloc_count, abfd)
-         != relsz * sec->reloc_count))
+      || bfd_bread (external_relocs, amt, abfd) != amt)

     goto error_return;
 
   if (internal_relocs == NULL)
     {
     goto error_return;
 
   if (internal_relocs == NULL)
     {

-      free_internal = ((struct internal_reloc *)
-                      bfd_malloc (sec->reloc_count
-                                  * sizeof (struct internal_reloc)));
+      amt = sec->reloc_count;
+      amt *= sizeof (struct internal_reloc);
+      free_internal = (struct internal_reloc *) bfd_malloc (amt);

       if (free_internal == NULL && sec->reloc_count > 0)
        goto error_return;
       internal_relocs = free_internal;
       if (free_internal == NULL && sec->reloc_count > 0)
        goto error_return;
       internal_relocs = free_internal;


@@ -473,9 +499,8 @@ _bfd_coff_read_internal_relocs (abfd, sec, cache, external_relocs,
     {
       if (coff_section_data (abfd, sec) == NULL)
        {
     {
       if (coff_section_data (abfd, sec) == NULL)
        {

-         sec->used_by_bfd =
-           (PTR) bfd_zalloc (abfd,
-                             sizeof (struct coff_section_tdata));
+         amt = sizeof (struct coff_section_tdata);
+         sec->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);

          if (sec->used_by_bfd == NULL)
            goto error_return;
          coff_section_data (abfd, sec)->contents = NULL;
          if (sec->used_by_bfd == NULL)
            goto error_return;
          coff_section_data (abfd, sec)->contents = NULL;


@@ -521,7 +546,7 @@ coff_count_linenumbers (abfd)
     {
       asymbol *q_maybe = *p;
 
     {
       asymbol *q_maybe = *p;
 

-      if (bfd_asymbol_flavour (q_maybe) == bfd_target_coff_flavour)
+      if (bfd_family_coff (bfd_asymbol_bfd (q_maybe)))

        {
          coff_symbol_type *q = coffsymbol (q_maybe);
 
        {
          coff_symbol_type *q = coffsymbol (q_maybe);
 


@@ -535,15 +560,18 @@ coff_count_linenumbers (abfd)
                 section's linenumber count.  */
              alent *l = q->lineno;
 
                 section's linenumber count.  */
              alent *l = q->lineno;
 

-             ++q->symbol.section->output_section->lineno_count;
-             ++total;
-             ++l;
-             while (l->line_number != 0)
+             do

                {
                {

+                 asection * sec = q->symbol.section->output_section;
+
+                 /* Do not try to update fields in read-only sections.  */
+                 if (! bfd_is_const_section (sec))
+                   sec->lineno_count ++;
+

                  ++total;
                  ++total;

-                 ++q->symbol.section->output_section->lineno_count;

                  ++l;
                }
                  ++l;
                }

+             while (l->line_number != 0);

            }
        }
     }
            }
        }
     }


@@ -554,13 +582,12 @@ coff_count_linenumbers (abfd)
 /* Takes a bfd and a symbol, returns a pointer to the coff specific
    area of the symbol if there is one.  */
 
 /* Takes a bfd and a symbol, returns a pointer to the coff specific
    area of the symbol if there is one.  */
 

-/*ARGSUSED*/

 coff_symbol_type *
 coff_symbol_from (ignore_abfd, symbol)
 coff_symbol_type *
 coff_symbol_from (ignore_abfd, symbol)

-     bfd *ignore_abfd;
+     bfd *ignore_abfd ATTRIBUTE_UNUSED;

      asymbol *symbol;
 {
      asymbol *symbol;
 {

-  if (bfd_asymbol_flavour (symbol) != bfd_target_coff_flavour)
+  if (!bfd_family_coff (bfd_asymbol_bfd (symbol)))

     return (coff_symbol_type *) NULL;
 
   if (bfd_asymbol_bfd (symbol)->tdata.coff_obj_data == (coff_data_type *) NULL)
     return (coff_symbol_type *) NULL;
 
   if (bfd_asymbol_bfd (symbol)->tdata.coff_obj_data == (coff_data_type *) NULL)


@@ -583,7 +610,8 @@ fixup_symbol_value (abfd, coff_symbol_ptr, syment)
       syment->n_scnum = N_UNDEF;
       syment->n_value = coff_symbol_ptr->symbol.value;
     }
       syment->n_scnum = N_UNDEF;
       syment->n_value = coff_symbol_ptr->symbol.value;
     }

-  else if (coff_symbol_ptr->symbol.flags & BSF_DEBUGGING)
+  else if ((coff_symbol_ptr->symbol.flags & BSF_DEBUGGING) != 0
+          && (coff_symbol_ptr->symbol.flags & BSF_DEBUGGING_RELOC) == 0)

     {
       syment->n_value = coff_symbol_ptr->symbol.value;
     }
     {
       syment->n_value = coff_symbol_ptr->symbol.value;
     }


@@ -592,6 +620,7 @@ fixup_symbol_value (abfd, coff_symbol_ptr, syment)
       syment->n_scnum = N_UNDEF;
       syment->n_value = 0;
     }
       syment->n_scnum = N_UNDEF;
       syment->n_value = 0;
     }

+  /* FIXME: Do we need to handle the absolute section here?  */

   else
     {
       if (coff_symbol_ptr->symbol.section)
   else
     {
       if (coff_symbol_ptr->symbol.section)


@@ -602,8 +631,11 @@ fixup_symbol_value (abfd, coff_symbol_ptr, syment)
          syment->n_value = (coff_symbol_ptr->symbol.value
                             + coff_symbol_ptr->symbol.section->output_offset);
          if (! obj_pe (abfd))
          syment->n_value = (coff_symbol_ptr->symbol.value
                             + coff_symbol_ptr->symbol.section->output_offset);
          if (! obj_pe (abfd))

-           syment->n_value +=
-             coff_symbol_ptr->symbol.section->output_section->vma;
+            {
+              syment->n_value += (syment->n_sclass == C_STATLAB)
+                ? coff_symbol_ptr->symbol.section->output_section->lma
+                : coff_symbol_ptr->symbol.section->output_section->vma;
+            }

        }
       else
        {
        }
       else
        {


@@ -622,7 +654,7 @@ fixup_symbol_value (abfd, coff_symbol_ptr, syment)
    chain, and that the last one points to the first external symbol. We
    do that here too.  */
 
    chain, and that the last one points to the first external symbol. We
    do that here too.  */
 

-boolean
+bfd_boolean

 coff_renumber_symbols (bfd_ptr, first_undef)
      bfd *bfd_ptr;
      int *first_undef;
 coff_renumber_symbols (bfd_ptr, first_undef)
      bfd *bfd_ptr;
      int *first_undef;


@@ -646,26 +678,29 @@ coff_renumber_symbols (bfd_ptr, first_undef)
   {
     asymbol **newsyms;
     unsigned int i;
   {
     asymbol **newsyms;
     unsigned int i;

+    bfd_size_type amt;

 
 

-    newsyms = (asymbol **) bfd_alloc (bfd_ptr,
-                                     sizeof (asymbol *) * (symbol_count + 1));
+    amt = sizeof (asymbol *) * ((bfd_size_type) symbol_count + 1);
+    newsyms = (asymbol **) bfd_alloc (bfd_ptr, amt);

     if (!newsyms)
     if (!newsyms)

-      return false;
+      return FALSE;

     bfd_ptr->outsymbols = newsyms;
     for (i = 0; i < symbol_count; i++)
       if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) != 0
          || (!bfd_is_und_section (symbol_ptr_ptr[i]->section)
              && !bfd_is_com_section (symbol_ptr_ptr[i]->section)
     bfd_ptr->outsymbols = newsyms;
     for (i = 0; i < symbol_count; i++)
       if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) != 0
          || (!bfd_is_und_section (symbol_ptr_ptr[i]->section)
              && !bfd_is_com_section (symbol_ptr_ptr[i]->section)

-             && ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL | BSF_FUNCTION))
-                 != BSF_GLOBAL)))
+             && ((symbol_ptr_ptr[i]->flags & BSF_FUNCTION) != 0
+                 || ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL | BSF_WEAK))
+                     == 0))))

        *newsyms++ = symbol_ptr_ptr[i];
 
     for (i = 0; i < symbol_count; i++)
       if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) == 0
          && !bfd_is_und_section (symbol_ptr_ptr[i]->section)
          && (bfd_is_com_section (symbol_ptr_ptr[i]->section)
        *newsyms++ = symbol_ptr_ptr[i];
 
     for (i = 0; i < symbol_count; i++)
       if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) == 0
          && !bfd_is_und_section (symbol_ptr_ptr[i]->section)
          && (bfd_is_com_section (symbol_ptr_ptr[i]->section)

-             || ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL | BSF_FUNCTION))
-                 == BSF_GLOBAL)))
+             || ((symbol_ptr_ptr[i]->flags & BSF_FUNCTION) == 0
+                 && ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL | BSF_WEAK))
+                     != 0))))

        *newsyms++ = symbol_ptr_ptr[i];
 
     *first_undef = newsyms - bfd_ptr->outsymbols;
        *newsyms++ = symbol_ptr_ptr[i];
 
     *first_undef = newsyms - bfd_ptr->outsymbols;


@@ -681,7 +716,7 @@ coff_renumber_symbols (bfd_ptr, first_undef)
   for (symbol_index = 0; symbol_index < symbol_count; symbol_index++)
     {
       coff_symbol_type *coff_symbol_ptr = coff_symbol_from (bfd_ptr, symbol_ptr_ptr[symbol_index]);
   for (symbol_index = 0; symbol_index < symbol_count; symbol_index++)
     {
       coff_symbol_type *coff_symbol_ptr = coff_symbol_from (bfd_ptr, symbol_ptr_ptr[symbol_index]);

-      symbol_ptr_ptr[symbol_index]->udata.i = symbol_index; 
+      symbol_ptr_ptr[symbol_index]->udata.i = symbol_index;

       if (coff_symbol_ptr && coff_symbol_ptr->native)
        {
          combined_entry_type *s = coff_symbol_ptr->native;
       if (coff_symbol_ptr && coff_symbol_ptr->native)
        {
          combined_entry_type *s = coff_symbol_ptr->native;


@@ -711,7 +746,7 @@ coff_renumber_symbols (bfd_ptr, first_undef)
     }
   obj_conv_table_size (bfd_ptr) = native_index;
 
     }
   obj_conv_table_size (bfd_ptr) = native_index;
 

-  return true;
+  return TRUE;

 }
 
 /* Run thorough the symbol table again, and fix it so that all
 }
 
 /* Run thorough the symbol table again, and fix it so that all


@@ -740,7 +775,8 @@ coff_mangle_symbols (bfd_ptr)
            {
              /* FIXME: We should use a union here.  */
              s->u.syment.n_value =
            {
              /* FIXME: We should use a union here.  */
              s->u.syment.n_value =

-               ((combined_entry_type *) s->u.syment.n_value)->offset;
+               (bfd_vma)((combined_entry_type *)
+                         ((unsigned long) s->u.syment.n_value))->offset;

              s->fix_value = 0;
            }
          if (s->fix_line)
              s->fix_value = 0;
            }
          if (s->fix_line)


@@ -806,14 +842,27 @@ coff_fix_symbol_name (abfd, symbol, native, string_size_p,
   if (native->u.syment.n_sclass == C_FILE
       && native->u.syment.n_numaux > 0)
     {
   if (native->u.syment.n_sclass == C_FILE
       && native->u.syment.n_numaux > 0)
     {

-      strncpy (native->u.syment._n._n_name, ".file", SYMNMLEN);
+      unsigned int filnmlen;
+
+      if (bfd_coff_force_symnames_in_strings (abfd))
+       {
+          native->u.syment._n._n_n._n_offset =
+             (*string_size_p + STRING_SIZE_SIZE);
+         native->u.syment._n._n_n._n_zeroes = 0;
+         *string_size_p += 6;  /* strlen(".file") + 1 */
+       }
+      else
+       strncpy (native->u.syment._n._n_name, ".file", SYMNMLEN);
+

       auxent = &(native + 1)->u.auxent;
 
       auxent = &(native + 1)->u.auxent;
 

+      filnmlen = bfd_coff_filnmlen (abfd);
+

       if (bfd_coff_long_filenames (abfd))
        {
       if (bfd_coff_long_filenames (abfd))
        {

-         if (name_length <= FILNMLEN)
+         if (name_length <= filnmlen)

            {
            {

-             strncpy (auxent->x_file.x_fname, name, FILNMLEN);
+             strncpy (auxent->x_file.x_fname, name, filnmlen);

            }
          else
            {
            }
          else
            {


@@ -824,16 +873,14 @@ coff_fix_symbol_name (abfd, symbol, native, string_size_p,
        }
       else
        {
        }
       else
        {

-         strncpy (auxent->x_file.x_fname, name, FILNMLEN);
-         if (name_length > FILNMLEN)
-           {
-             name[FILNMLEN] = '\0';
-           }
+         strncpy (auxent->x_file.x_fname, name, filnmlen);
+         if (name_length > filnmlen)
+           name[filnmlen] = '\0';

        }
     }
   else
     {
        }
     }
   else
     {

-      if (name_length <= SYMNMLEN)
+      if (name_length <= SYMNMLEN && !bfd_coff_force_symnames_in_strings (abfd))

        {
          /* This name will fit into the symbol neatly */
          strncpy (native->u.syment._n._n_name, symbol->name, SYMNMLEN);
        {
          /* This name will fit into the symbol neatly */
          strncpy (native->u.syment._n._n_name, symbol->name, SYMNMLEN);


@@ -847,8 +894,9 @@ coff_fix_symbol_name (abfd, symbol, native, string_size_p,
        }
       else
        {
        }
       else
        {

-         long filepos;
-         bfd_byte buf[2];
+         file_ptr filepos;
+         bfd_byte buf[4];
+         int prefix_len = bfd_coff_debug_string_prefix_length (abfd);

 
          /* This name should be written into the .debug section.  For
             some reason each name is preceded by a two byte length
 
          /* This name should be written into the .debug section.  For
             some reason each name is preceded by a two byte length


@@ -858,24 +906,29 @@ coff_fix_symbol_name (abfd, symbol, native, string_size_p,
          if (*debug_string_section_p == (asection *) NULL)
            *debug_string_section_p = bfd_get_section_by_name (abfd, ".debug");
          filepos = bfd_tell (abfd);
          if (*debug_string_section_p == (asection *) NULL)
            *debug_string_section_p = bfd_get_section_by_name (abfd, ".debug");
          filepos = bfd_tell (abfd);

-         bfd_put_16 (abfd, name_length + 1, buf);
+         if (prefix_len == 4)
+           bfd_put_32 (abfd, (bfd_vma) (name_length + 1), buf);
+         else
+           bfd_put_16 (abfd, (bfd_vma) (name_length + 1), buf);
+

          if (!bfd_set_section_contents (abfd,
                                         *debug_string_section_p,
                                         (PTR) buf,
                                         (file_ptr) *debug_string_size_p,
          if (!bfd_set_section_contents (abfd,
                                         *debug_string_section_p,
                                         (PTR) buf,
                                         (file_ptr) *debug_string_size_p,

-                                        (bfd_size_type) 2)
+                                        (bfd_size_type) prefix_len)

              || !bfd_set_section_contents (abfd,
                                            *debug_string_section_p,
                                            (PTR) symbol->name,
              || !bfd_set_section_contents (abfd,
                                            *debug_string_section_p,
                                            (PTR) symbol->name,

-                                           ((file_ptr) *debug_string_size_p
-                                            + 2),
+                                           (file_ptr) (*debug_string_size_p
+                                                       + prefix_len),

                                            (bfd_size_type) name_length + 1))
            abort ();
          if (bfd_seek (abfd, filepos, SEEK_SET) != 0)
            abort ();
                                            (bfd_size_type) name_length + 1))
            abort ();
          if (bfd_seek (abfd, filepos, SEEK_SET) != 0)
            abort ();

-         native->u.syment._n._n_n._n_offset = *debug_string_size_p + 2;
+         native->u.syment._n._n_n._n_offset =
+             *debug_string_size_p + prefix_len;

          native->u.syment._n._n_n._n_zeroes = 0;
          native->u.syment._n._n_n._n_zeroes = 0;

-         *debug_string_size_p += name_length + 3;
+         *debug_string_size_p += name_length + 1 + prefix_len;

        }
     }
 }
        }
     }
 }


@@ -888,13 +941,13 @@ coff_fix_symbol_name (abfd, symbol, native, string_size_p,
 
 /* Write a symbol out to a COFF file.  */
 
 
 /* Write a symbol out to a COFF file.  */
 

-static boolean
+static bfd_boolean

 coff_write_symbol (abfd, symbol, native, written, string_size_p,
                   debug_string_section_p, debug_string_size_p)
      bfd *abfd;
      asymbol *symbol;
      combined_entry_type *native;
 coff_write_symbol (abfd, symbol, native, written, string_size_p,
                   debug_string_section_p, debug_string_size_p)
      bfd *abfd;
      asymbol *symbol;
      combined_entry_type *native;

-     unsigned int *written;
+     bfd_vma *written;

      bfd_size_type *string_size_p;
      asection **debug_string_section_p;
      bfd_size_type *debug_string_size_p;
      bfd_size_type *string_size_p;
      asection **debug_string_section_p;
      bfd_size_type *debug_string_size_p;


@@ -933,10 +986,10 @@ coff_write_symbol (abfd, symbol, native, written, string_size_p,
   symesz = bfd_coff_symesz (abfd);
   buf = bfd_alloc (abfd, symesz);
   if (!buf)
   symesz = bfd_coff_symesz (abfd);
   buf = bfd_alloc (abfd, symesz);
   if (!buf)

-    return false;
+    return FALSE;

   bfd_coff_swap_sym_out (abfd, &native->u.syment, buf);
   bfd_coff_swap_sym_out (abfd, &native->u.syment, buf);

-  if (bfd_write (buf, 1, symesz, abfd) != symesz)
-    return false;
+  if (bfd_bwrite (buf, symesz, abfd) != symesz)
+    return FALSE;

   bfd_release (abfd, buf);
 
   if (native->u.syment.n_numaux > 0)
   bfd_release (abfd, buf);
 
   if (native->u.syment.n_numaux > 0)


@@ -947,18 +1000,18 @@ coff_write_symbol (abfd, symbol, native, written, string_size_p,
       auxesz = bfd_coff_auxesz (abfd);
       buf = bfd_alloc (abfd, auxesz);
       if (!buf)
       auxesz = bfd_coff_auxesz (abfd);
       buf = bfd_alloc (abfd, auxesz);
       if (!buf)

-       return false;
+       return FALSE;

       for (j = 0; j < native->u.syment.n_numaux; j++)
        {
          bfd_coff_swap_aux_out (abfd,
                                 &((native + j + 1)->u.auxent),
                                 type,
                                 class,
       for (j = 0; j < native->u.syment.n_numaux; j++)
        {
          bfd_coff_swap_aux_out (abfd,
                                 &((native + j + 1)->u.auxent),
                                 type,
                                 class,

-                                j,
+                                (int) j,

                                 native->u.syment.n_numaux,
                                 buf);
                                 native->u.syment.n_numaux,
                                 buf);

-         if (bfd_write (buf, 1, auxesz, abfd) != auxesz)
-           return false;
+         if (bfd_bwrite (buf, auxesz, abfd) != auxesz)
+           return FALSE;

        }
       bfd_release (abfd, buf);
     }
        }
       bfd_release (abfd, buf);
     }


@@ -967,19 +1020,19 @@ coff_write_symbol (abfd, symbol, native, written, string_size_p,
   set_index (symbol, *written);
 
   *written += numaux + 1;
   set_index (symbol, *written);
 
   *written += numaux + 1;

-  return true;
+  return TRUE;

 }
 
 /* Write out a symbol to a COFF file that does not come from a COFF
    file originally.  This symbol may have been created by the linker,
    or we may be linking a non COFF file to a COFF file.  */
 
 }
 
 /* Write out a symbol to a COFF file that does not come from a COFF
    file originally.  This symbol may have been created by the linker,
    or we may be linking a non COFF file to a COFF file.  */
 

-static boolean
+static bfd_boolean

 coff_write_alien_symbol (abfd, symbol, written, string_size_p,
                         debug_string_section_p, debug_string_size_p)
      bfd *abfd;
      asymbol *symbol;
 coff_write_alien_symbol (abfd, symbol, written, string_size_p,
                         debug_string_section_p, debug_string_size_p)
      bfd *abfd;
      asymbol *symbol;

-     unsigned int *written;
+     bfd_vma *written;

      bfd_size_type *string_size_p;
      asection **debug_string_section_p;
      bfd_size_type *debug_string_size_p;
      bfd_size_type *string_size_p;
      asection **debug_string_section_p;
      bfd_size_type *debug_string_size_p;


@@ -1007,7 +1060,7 @@ coff_write_alien_symbol (abfd, symbol, written, string_size_p,
          format.  So, we just ignore them.  We must clobber the symbol
          name to keep it from being put in the string table.  */
       symbol->name = "";
          format.  So, we just ignore them.  We must clobber the symbol
          name to keep it from being put in the string table.  */
       symbol->name = "";

-      return true;
+      return TRUE;

     }
   else
     {
     }
   else
     {


@@ -1018,7 +1071,7 @@ coff_write_alien_symbol (abfd, symbol, written, string_size_p,
       if (! obj_pe (abfd))
        native->u.syment.n_value += symbol->section->output_section->vma;
 
       if (! obj_pe (abfd))
        native->u.syment.n_value += symbol->section->output_section->vma;
 

-      /* Copy the any flags from the the file header into the symbol.
+      /* Copy the any flags from the file header into the symbol.

          FIXME: Why?  */
       {
        coff_symbol_type *c = coff_symbol_from (abfd, symbol);
          FIXME: Why?  */
       {
        coff_symbol_type *c = coff_symbol_from (abfd, symbol);


@@ -1030,6 +1083,8 @@ coff_write_alien_symbol (abfd, symbol, written, string_size_p,
   native->u.syment.n_type = 0;
   if (symbol->flags & BSF_LOCAL)
     native->u.syment.n_sclass = C_STAT;
   native->u.syment.n_type = 0;
   if (symbol->flags & BSF_LOCAL)
     native->u.syment.n_sclass = C_STAT;

+  else if (symbol->flags & BSF_WEAK)
+    native->u.syment.n_sclass = obj_pe (abfd) ? C_NT_WEAK : C_WEAKEXT;

   else
     native->u.syment.n_sclass = C_EXT;
   native->u.syment.n_numaux = 0;
   else
     native->u.syment.n_sclass = C_EXT;
   native->u.syment.n_numaux = 0;


@@ -1040,12 +1095,12 @@ coff_write_alien_symbol (abfd, symbol, written, string_size_p,
 
 /* Write a native symbol to a COFF file.  */
 
 
 /* Write a native symbol to a COFF file.  */
 

-static boolean
+static bfd_boolean

 coff_write_native_symbol (abfd, symbol, written, string_size_p,
                          debug_string_section_p, debug_string_size_p)
      bfd *abfd;
      coff_symbol_type *symbol;
 coff_write_native_symbol (abfd, symbol, written, string_size_p,
                          debug_string_section_p, debug_string_size_p)
      bfd *abfd;
      coff_symbol_type *symbol;

-     unsigned int *written;
+     bfd_vma *written;

      bfd_size_type *string_size_p;
      asection **debug_string_section_p;
      bfd_size_type *debug_string_size_p;
      bfd_size_type *string_size_p;
      asection **debug_string_section_p;
      bfd_size_type *debug_string_size_p;


@@ -1073,7 +1128,7 @@ coff_write_native_symbol (abfd, symbol, written, string_size_p,
       while (lineno[count].line_number != 0)
        {
 #if 0
       while (lineno[count].line_number != 0)
        {
 #if 0

-         /* 13 april 92. sac 
+         /* 13 april 92. sac

             I've been told this, but still need proof:
             > The second bug is also in `bfd/coffcode.h'.  This bug
             > causes the linker to screw up the pc-relocations for
             I've been told this, but still need proof:
             > The second bug is also in `bfd/coffcode.h'.  This bug
             > causes the linker to screw up the pc-relocations for


@@ -1096,10 +1151,11 @@ coff_write_native_symbol (abfd, symbol, written, string_size_p,
 #endif
          count++;
        }
 #endif
          count++;
        }

-      symbol->done_lineno = true;
+      symbol->done_lineno = TRUE;

 
 

-      symbol->symbol.section->output_section->moving_line_filepos +=
-       count * bfd_coff_linesz (abfd);
+      if (! bfd_is_const_section (symbol->symbol.section->output_section))
+       symbol->symbol.section->output_section->moving_line_filepos +=
+         count * bfd_coff_linesz (abfd);

     }
 
   return coff_write_symbol (abfd, &(symbol->symbol), native, written,
     }
 
   return coff_write_symbol (abfd, &(symbol->symbol), native, written,


@@ -1109,7 +1165,7 @@ coff_write_native_symbol (abfd, symbol, written, string_size_p,
 
 /* Write out the COFF symbols.  */
 
 
 /* Write out the COFF symbols.  */
 

-boolean
+bfd_boolean

 coff_write_symbols (abfd)
      bfd *abfd;
 {
 coff_write_symbols (abfd)
      bfd *abfd;
 {


@@ -1118,7 +1174,7 @@ coff_write_symbols (abfd)
   bfd_size_type debug_string_size;
   unsigned int i;
   unsigned int limit = bfd_get_symcount (abfd);
   bfd_size_type debug_string_size;
   unsigned int i;
   unsigned int limit = bfd_get_symcount (abfd);

-  unsigned int written = 0;
+  bfd_signed_vma written = 0;

   asymbol **p;
 
   string_size = 0;
   asymbol **p;
 
   string_size = 0;


@@ -1145,7 +1201,7 @@ coff_write_symbols (abfd)
 
   /* Seek to the right place */
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
 
   /* Seek to the right place */
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)

-    return false;
+    return FALSE;

 
   /* Output all the symbols we have */
 
 
   /* Output all the symbols we have */
 


@@ -1161,14 +1217,14 @@ coff_write_symbols (abfd)
          if (!coff_write_alien_symbol (abfd, symbol, &written, &string_size,
                                        &debug_string_section,
                                        &debug_string_size))
          if (!coff_write_alien_symbol (abfd, symbol, &written, &string_size,
                                        &debug_string_section,
                                        &debug_string_size))

-           return false;
+           return FALSE;

        }
       else
        {
          if (!coff_write_native_symbol (abfd, c_symbol, &written,
                                         &string_size, &debug_string_section,
                                         &debug_string_size))
        }
       else
        {
          if (!coff_write_native_symbol (abfd, c_symbol, &written,
                                         &string_size, &debug_string_section,
                                         &debug_string_size))

-           return false;
+           return FALSE;

        }
     }
 
        }
     }
 


@@ -1182,12 +1238,13 @@ coff_write_symbols (abfd)
       bfd_byte buffer[STRING_SIZE_SIZE];
 
 #if STRING_SIZE_SIZE == 4
       bfd_byte buffer[STRING_SIZE_SIZE];
 
 #if STRING_SIZE_SIZE == 4

-      bfd_h_put_32 (abfd, size, buffer);
+      H_PUT_32 (abfd, size, buffer);

 #else
 #else

- #error Change bfd_h_put_32
+ #error Change H_PUT_32

 #endif
 #endif

-      if (bfd_write ((PTR) buffer, 1, sizeof (buffer), abfd) != sizeof (buffer))
-       return false;
+      if (bfd_bwrite ((PTR) buffer, (bfd_size_type) sizeof (buffer), abfd)
+         != sizeof (buffer))
+       return FALSE;

 
       /* Handle long section names.  This code must handle section
         names just as they are handled in coff_write_object_contents.  */
 
       /* Handle long section names.  This code must handle section
         names just as they are handled in coff_write_object_contents.  */


@@ -1202,8 +1259,9 @@ coff_write_symbols (abfd)
              len = strlen (o->name);
              if (len > SCNNMLEN)
                {
              len = strlen (o->name);
              if (len > SCNNMLEN)
                {

-                 if (bfd_write (o->name, 1, len + 1, abfd) != len + 1)
-                   return false;
+                 if (bfd_bwrite (o->name, (bfd_size_type) (len + 1), abfd)
+                     != len + 1)
+                   return FALSE;

                }
            }
        }
                }
            }
        }


@@ -1229,7 +1287,7 @@ coff_write_symbols (abfd)
            {
              /* This is not a COFF symbol, so it certainly is not a
                 file name, nor does it go in the .debug section.  */
            {
              /* This is not a COFF symbol, so it certainly is not a
                 file name, nor does it go in the .debug section.  */

-             maxlen = SYMNMLEN;
+             maxlen = bfd_coff_force_symnames_in_strings (abfd) ? 0 : SYMNMLEN;

            }
          else if (bfd_coff_symname_in_debug (abfd,
                                              &c_symbol->native->u.syment))
            }
          else if (bfd_coff_symname_in_debug (abfd,
                                              &c_symbol->native->u.syment))


@@ -1240,15 +1298,22 @@ coff_write_symbols (abfd)
            }
          else if (c_symbol->native->u.syment.n_sclass == C_FILE
                   && c_symbol->native->u.syment.n_numaux > 0)
            }
          else if (c_symbol->native->u.syment.n_sclass == C_FILE
                   && c_symbol->native->u.syment.n_numaux > 0)

-           maxlen = FILNMLEN;
+           {
+             if (bfd_coff_force_symnames_in_strings (abfd))
+               {
+                 if (bfd_bwrite (".file", (bfd_size_type) 6, abfd) != 6)
+                   return FALSE;
+               }
+             maxlen = bfd_coff_filnmlen (abfd);
+           }

          else
          else

-           maxlen = SYMNMLEN;
+           maxlen = bfd_coff_force_symnames_in_strings (abfd) ? 0 : SYMNMLEN;

 
          if (name_length > maxlen)
            {
 
          if (name_length > maxlen)
            {

-             if (bfd_write ((PTR) (q->name), 1, name_length + 1, abfd)
-                 != name_length + 1)
-               return false;
+             if (bfd_bwrite ((PTR) (q->name), (bfd_size_type) name_length + 1,
+                            abfd) != name_length + 1)
+               return FALSE;

            }
        }
     }
            }
        }
     }


@@ -1261,13 +1326,13 @@ coff_write_symbols (abfd)
       bfd_byte buffer[STRING_SIZE_SIZE];
 
 #if STRING_SIZE_SIZE == 4
       bfd_byte buffer[STRING_SIZE_SIZE];
 
 #if STRING_SIZE_SIZE == 4

-      bfd_h_put_32 (abfd, size, buffer);
+      H_PUT_32 (abfd, size, buffer);

 #else
 #else

- #error Change bfd_h_put_32
+ #error Change H_PUT_32

 #endif
 #endif

-      if (bfd_write ((PTR) buffer, 1, STRING_SIZE_SIZE, abfd)
+      if (bfd_bwrite ((PTR) buffer, (bfd_size_type) STRING_SIZE_SIZE, abfd)

          != STRING_SIZE_SIZE)
          != STRING_SIZE_SIZE)

-       return false;
+       return FALSE;

     }
 
   /* Make sure the .debug section was created to be the correct size.
     }
 
   /* Make sure the .debug section was created to be the correct size.


@@ -1281,10 +1346,10 @@ coff_write_symbols (abfd)
                                 1 << debug_string_section->alignment_power)
                      == bfd_section_size (abfd, debug_string_section))));
 
                                 1 << debug_string_section->alignment_power)
                      == bfd_section_size (abfd, debug_string_section))));
 

-  return true;
+  return TRUE;

 }
 
 }
 

-boolean
+bfd_boolean

 coff_write_linenumbers (abfd)
      bfd *abfd;
 {
 coff_write_linenumbers (abfd)
      bfd *abfd;
 {


@@ -1295,14 +1360,14 @@ coff_write_linenumbers (abfd)
   linesz = bfd_coff_linesz (abfd);
   buff = bfd_alloc (abfd, linesz);
   if (!buff)
   linesz = bfd_coff_linesz (abfd);
   buff = bfd_alloc (abfd, linesz);
   if (!buff)

-    return false;
+    return FALSE;

   for (s = abfd->sections; s != (asection *) NULL; s = s->next)
     {
       if (s->lineno_count)
        {
          asymbol **q = abfd->outsymbols;
          if (bfd_seek (abfd, s->line_filepos, SEEK_SET) != 0)
   for (s = abfd->sections; s != (asection *) NULL; s = s->next)
     {
       if (s->lineno_count)
        {
          asymbol **q = abfd->outsymbols;
          if (bfd_seek (abfd, s->line_filepos, SEEK_SET) != 0)

-           return false;
+           return FALSE;

          /* Find all the linenumbers in this section */
          while (*q)
            {
          /* Find all the linenumbers in this section */
          while (*q)
            {


@@ -1320,16 +1385,18 @@ coff_write_linenumbers (abfd)
                      out.l_lnno = 0;
                      out.l_addr.l_symndx = l->u.offset;
                      bfd_coff_swap_lineno_out (abfd, &out, buff);
                      out.l_lnno = 0;
                      out.l_addr.l_symndx = l->u.offset;
                      bfd_coff_swap_lineno_out (abfd, &out, buff);

-                     if (bfd_write (buff, 1, linesz, abfd) != linesz)
-                       return false;
+                     if (bfd_bwrite (buff, (bfd_size_type) linesz, abfd)
+                         != linesz)
+                       return FALSE;

                      l++;
                      while (l->line_number)
                        {
                          out.l_lnno = l->line_number;
                          out.l_addr.l_symndx = l->u.offset;
                          bfd_coff_swap_lineno_out (abfd, &out, buff);
                      l++;
                      while (l->line_number)
                        {
                          out.l_lnno = l->line_number;
                          out.l_addr.l_symndx = l->u.offset;
                          bfd_coff_swap_lineno_out (abfd, &out, buff);

-                         if (bfd_write (buff, 1, linesz, abfd) != linesz)
-                           return false;
+                         if (bfd_bwrite (buff, (bfd_size_type) linesz, abfd)
+                             != linesz)
+                           return FALSE;

                          l++;
                        }
                    }
                          l++;
                        }
                    }


@@ -1339,13 +1406,12 @@ coff_write_linenumbers (abfd)
        }
     }
   bfd_release (abfd, buff);
        }
     }
   bfd_release (abfd, buff);

-  return true;
+  return TRUE;

 }
 
 }
 

-/*ARGSUSED */

 alent *
 coff_get_lineno (ignore_abfd, symbol)
 alent *
 coff_get_lineno (ignore_abfd, symbol)

-     bfd *ignore_abfd;
+     bfd *ignore_abfd ATTRIBUTE_UNUSED;

      asymbol *symbol;
 {
   return coffsymbol (symbol)->lineno;
      asymbol *symbol;
 {
   return coffsymbol (symbol)->lineno;


@@ -1377,13 +1443,13 @@ coff_section_symbol (abfd, name)
          combined_entry_type e[10];
        };
       struct foo *f;
          combined_entry_type e[10];
        };
       struct foo *f;

-      f = (struct foo *) bfd_alloc (abfd, sizeof (*f));
+
+      f = (struct foo *) bfd_zalloc (abfd, (bfd_size_type) sizeof (*f));

       if (!f)
        {
          bfd_set_error (bfd_error_no_error);
          return NULL;
        }
       if (!f)
        {
          bfd_set_error (bfd_error_no_error);
          return NULL;
        }

-      memset ((char *) f, 0, sizeof (*f));

       coff_symbol_from (abfd, sym)->native = csym = f->e;
     }
   csym[0].u.syment.n_sclass = C_STAT;
       coff_symbol_from (abfd, sym)->native = csym = f->e;
     }
   csym[0].u.syment.n_sclass = C_STAT;


@@ -1415,8 +1481,8 @@ coff_pointerize_aux (abfd, table_base, symbol, indaux, auxent)
      unsigned int indaux;
      combined_entry_type *auxent;
 {
      unsigned int indaux;
      combined_entry_type *auxent;
 {

-  int type = symbol->u.syment.n_type;
-  int class = symbol->u.syment.n_sclass;
+  unsigned int type = symbol->u.syment.n_type;
+  unsigned int class = symbol->u.syment.n_sclass;

 
   if (coff_backend_info (abfd)->_bfd_coff_pointerize_aux_hook)
     {
 
   if (coff_backend_info (abfd)->_bfd_coff_pointerize_aux_hook)
     {


@@ -1453,14 +1519,15 @@ coff_pointerize_aux (abfd, table_base, symbol, indaux, auxent)
 
 /* Allocate space for the ".debug" section, and read it.
    We did not read the debug section until now, because
 
 /* Allocate space for the ".debug" section, and read it.
    We did not read the debug section until now, because

-   we didn't want to go to the trouble until someone needed it. */
+   we didn't want to go to the trouble until someone needed it.  */

 
 static char *
 build_debug_section (abfd)
      bfd *abfd;
 {
   char *debug_section;
 
 static char *
 build_debug_section (abfd)
      bfd *abfd;
 {
   char *debug_section;

-  long position;
+  file_ptr position;
+  bfd_size_type sec_size;

 
   asection *sect = bfd_get_section_by_name (abfd, ".debug");
 
 
   asection *sect = bfd_get_section_by_name (abfd, ".debug");
 


@@ -1470,26 +1537,23 @@ build_debug_section (abfd)
       return NULL;
     }
 
       return NULL;
     }
 

-  debug_section = (PTR) bfd_alloc (abfd,
-                                  bfd_get_section_size_before_reloc (sect));
+  sec_size = bfd_get_section_size_before_reloc (sect);
+  debug_section = (PTR) bfd_alloc (abfd, sec_size);

   if (debug_section == NULL)
     return NULL;
 
   if (debug_section == NULL)
     return NULL;
 

-  /* Seek to the beginning of the `.debug' section and read it. 
+  /* Seek to the beginning of the `.debug' section and read it.

      Save the current position first; it is needed by our caller.
      Then read debug section and reset the file pointer.  */
 
   position = bfd_tell (abfd);
   if (bfd_seek (abfd, sect->filepos, SEEK_SET) != 0
      Save the current position first; it is needed by our caller.
      Then read debug section and reset the file pointer.  */
 
   position = bfd_tell (abfd);
   if (bfd_seek (abfd, sect->filepos, SEEK_SET) != 0

-      || (bfd_read (debug_section,
-                   bfd_get_section_size_before_reloc (sect), 1, abfd)
-         != bfd_get_section_size_before_reloc (sect))
+      || bfd_bread (debug_section, sec_size, abfd) != sec_size

       || bfd_seek (abfd, position, SEEK_SET) != 0)
     return NULL;
   return debug_section;
 }
 
       || bfd_seek (abfd, position, SEEK_SET) != 0)
     return NULL;
   return debug_section;
 }
 

-

 /* Return a pointer to a malloc'd copy of 'name'.  'name' may not be
    \0-terminated, but will not exceed 'maxlen' characters.  The copy *will*
    be \0-terminated.  */
 /* Return a pointer to a malloc'd copy of 'name'.  'name' may not be
    \0-terminated, but will not exceed 'maxlen' characters.  The copy *will*
    be \0-terminated.  */


@@ -1497,9 +1561,9 @@ static char *
 copy_name (abfd, name, maxlen)
      bfd *abfd;
      char *name;
 copy_name (abfd, name, maxlen)
      bfd *abfd;
      char *name;

-     int maxlen;
+     size_t maxlen;

 {
 {

-  int len;
+  size_t len;

   char *newname;
 
   for (len = 0; len < maxlen; ++len)
   char *newname;
 
   for (len = 0; len < maxlen; ++len)


@@ -1510,7 +1574,7 @@ copy_name (abfd, name, maxlen)
        }
     }
 
        }
     }
 

-  if ((newname = (PTR) bfd_alloc (abfd, len + 1)) == NULL)
+  if ((newname = (PTR) bfd_alloc (abfd, (bfd_size_type) len + 1)) == NULL)

     return (NULL);
   strncpy (newname, name, len);
   newname[len] = '\0';
     return (NULL);
   strncpy (newname, name, len);
   newname[len] = '\0';


@@ -1519,16 +1583,16 @@ copy_name (abfd, name, maxlen)
 
 /* Read in the external symbols.  */
 
 
 /* Read in the external symbols.  */
 

-boolean
+bfd_boolean

 _bfd_coff_get_external_symbols (abfd)
      bfd *abfd;
 {
   bfd_size_type symesz;
 _bfd_coff_get_external_symbols (abfd)
      bfd *abfd;
 {
   bfd_size_type symesz;

-  size_t size;
+  bfd_size_type size;

   PTR syms;
 
   if (obj_coff_external_syms (abfd) != NULL)
   PTR syms;
 
   if (obj_coff_external_syms (abfd) != NULL)

-    return true;
+    return TRUE;

 
   symesz = bfd_coff_symesz (abfd);
 
 
   symesz = bfd_coff_symesz (abfd);
 


@@ -1536,19 +1600,19 @@ _bfd_coff_get_external_symbols (abfd)
 
   syms = (PTR) bfd_malloc (size);
   if (syms == NULL && size != 0)
 
   syms = (PTR) bfd_malloc (size);
   if (syms == NULL && size != 0)

-    return false;
+    return FALSE;

 
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
 
   if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0

-      || bfd_read (syms, size, 1, abfd) != size)
+      || bfd_bread (syms, size, abfd) != size)

     {
       if (syms != NULL)
        free (syms);
     {
       if (syms != NULL)
        free (syms);

-      return false;
+      return FALSE;

     }
 
   obj_coff_external_syms (abfd) = syms;
 
     }
 
   obj_coff_external_syms (abfd) = syms;
 

-  return true;
+  return TRUE;

 }
 
 /* Read in the external strings.  The strings are not loaded until
 }
 
 /* Read in the external strings.  The strings are not loaded until


@@ -1560,8 +1624,9 @@ _bfd_coff_read_string_table (abfd)
      bfd *abfd;
 {
   char extstrsize[STRING_SIZE_SIZE];
      bfd *abfd;
 {
   char extstrsize[STRING_SIZE_SIZE];

-  size_t strsize;
+  bfd_size_type strsize;

   char *strings;
   char *strings;

+  file_ptr pos;

 
   if (obj_coff_strings (abfd) != NULL)
     return obj_coff_strings (abfd);
 
   if (obj_coff_strings (abfd) != NULL)
     return obj_coff_strings (abfd);


@@ -1572,13 +1637,13 @@ _bfd_coff_read_string_table (abfd)
       return NULL;
     }
 
       return NULL;
     }
 

-  if (bfd_seek (abfd,
-               (obj_sym_filepos (abfd)
-                + obj_raw_syment_count (abfd) * bfd_coff_symesz (abfd)),
-               SEEK_SET) != 0)
+  pos = obj_sym_filepos (abfd);
+  pos += obj_raw_syment_count (abfd) * bfd_coff_symesz (abfd);
+  if (bfd_seek (abfd, pos, SEEK_SET) != 0)

     return NULL;
     return NULL;

-    
-  if (bfd_read (extstrsize, sizeof extstrsize, 1, abfd) != sizeof extstrsize)
+
+  if (bfd_bread (extstrsize, (bfd_size_type) sizeof extstrsize, abfd)
+      != sizeof extstrsize)

     {
       if (bfd_get_error () != bfd_error_file_truncated)
        return NULL;
     {
       if (bfd_get_error () != bfd_error_file_truncated)
        return NULL;


@@ -1589,16 +1654,16 @@ _bfd_coff_read_string_table (abfd)
   else
     {
 #if STRING_SIZE_SIZE == 4
   else
     {
 #if STRING_SIZE_SIZE == 4

-      strsize = bfd_h_get_32 (abfd, (bfd_byte *) extstrsize);
+      strsize = H_GET_32 (abfd, extstrsize);

 #else
 #else

- #error Change bfd_h_get_32
+ #error Change H_GET_32

 #endif
     }
 
   if (strsize < STRING_SIZE_SIZE)
     {
       (*_bfd_error_handler)
 #endif
     }
 
   if (strsize < STRING_SIZE_SIZE)
     {
       (*_bfd_error_handler)

-       ("%s: bad string table size %lu", bfd_get_filename (abfd),
+       (_("%s: bad string table size %lu"), bfd_archive_filename (abfd),

         (unsigned long) strsize);
       bfd_set_error (bfd_error_bad_value);
       return NULL;
         (unsigned long) strsize);
       bfd_set_error (bfd_error_bad_value);
       return NULL;


@@ -1608,8 +1673,7 @@ _bfd_coff_read_string_table (abfd)
   if (strings == NULL)
     return NULL;
 
   if (strings == NULL)
     return NULL;
 

-  if (bfd_read (strings + STRING_SIZE_SIZE,
-               strsize - STRING_SIZE_SIZE, 1, abfd)
+  if (bfd_bread (strings + STRING_SIZE_SIZE, strsize - STRING_SIZE_SIZE, abfd)

       != strsize - STRING_SIZE_SIZE)
     {
       free (strings);
       != strsize - STRING_SIZE_SIZE)
     {
       free (strings);


@@ -1623,7 +1687,7 @@ _bfd_coff_read_string_table (abfd)
 
 /* Free up the external symbols and strings read from a COFF file.  */
 
 
 /* Free up the external symbols and strings read from a COFF file.  */
 

-boolean
+bfd_boolean

 _bfd_coff_free_symbols (abfd)
      bfd *abfd;
 {
 _bfd_coff_free_symbols (abfd)
      bfd *abfd;
 {


@@ -1639,7 +1703,7 @@ _bfd_coff_free_symbols (abfd)
       free (obj_coff_strings (abfd));
       obj_coff_strings (abfd) = NULL;
     }
       free (obj_coff_strings (abfd));
       obj_coff_strings (abfd) = NULL;
     }

-  return true;
+  return TRUE;

 }
 
 /* Read a symbol table into freshly bfd_allocated memory, swap it, and
 }
 
 /* Read a symbol table into freshly bfd_allocated memory, swap it, and


@@ -1655,12 +1719,12 @@ coff_get_normalized_symtab (abfd)
   combined_entry_type *internal_ptr;
   combined_entry_type *symbol_ptr;
   combined_entry_type *internal_end;
   combined_entry_type *internal_ptr;
   combined_entry_type *symbol_ptr;
   combined_entry_type *internal_end;

-  bfd_size_type symesz;
+  size_t symesz;

   char *raw_src;
   char *raw_end;
   const char *string_table = NULL;
   char *debug_section = NULL;
   char *raw_src;
   char *raw_end;
   const char *string_table = NULL;
   char *debug_section = NULL;

-  unsigned long size;
+  bfd_size_type size;

 
   if (obj_raw_syments (abfd) != NULL)
     return obj_raw_syments (abfd);
 
   if (obj_raw_syments (abfd) != NULL)
     return obj_raw_syments (abfd);


@@ -1703,7 +1767,7 @@ coff_get_normalized_symtab (abfd)
          bfd_coff_swap_aux_in (abfd, (PTR) raw_src,
                                symbol_ptr->u.syment.n_type,
                                symbol_ptr->u.syment.n_sclass,
          bfd_coff_swap_aux_in (abfd, (PTR) raw_src,
                                symbol_ptr->u.syment.n_type,
                                symbol_ptr->u.syment.n_sclass,

-                               i, symbol_ptr->u.syment.n_numaux,
+                               (int) i, symbol_ptr->u.syment.n_numaux,

                                &(internal_ptr->u.auxent));
          coff_pointerize_aux (abfd, internal, symbol_ptr, i,
                               internal_ptr);
                                &(internal_ptr->u.auxent));
          coff_pointerize_aux (abfd, internal, symbol_ptr, i,
                               internal_ptr);


@@ -1711,7 +1775,7 @@ coff_get_normalized_symtab (abfd)
     }
 
   /* Free the raw symbols, but not the strings (if we have them).  */
     }
 
   /* Free the raw symbols, but not the strings (if we have them).  */

-  obj_coff_keep_strings (abfd) = true;
+  obj_coff_keep_strings (abfd) = TRUE;

   if (! _bfd_coff_free_symbols (abfd))
     return NULL;
 
   if (! _bfd_coff_free_symbols (abfd))
     return NULL;
 


@@ -1740,10 +1804,26 @@ coff_get_normalized_symtab (abfd)
            }
          else
            {
            }
          else
            {

-             /* ordinary short filename, put into memory anyway */
-             internal_ptr->u.syment._n._n_n._n_offset = (long)
-               copy_name (abfd, (internal_ptr + 1)->u.auxent.x_file.x_fname,
-                          FILNMLEN);
+             /* Ordinary short filename, put into memory anyway.  The
+                 Microsoft PE tools sometimes store a filename in
+                 multiple AUX entries.  */
+             if (internal_ptr->u.syment.n_numaux > 1
+                 && coff_data (abfd)->pe)
+               {
+                 internal_ptr->u.syment._n._n_n._n_offset =
+                   ((long)
+                    copy_name (abfd,
+                               (internal_ptr + 1)->u.auxent.x_file.x_fname,
+                               internal_ptr->u.syment.n_numaux * symesz));
+               }
+             else
+               {
+                 internal_ptr->u.syment._n._n_n._n_offset =
+                   ((long)
+                    copy_name (abfd,
+                               (internal_ptr + 1)->u.auxent.x_file.x_fname,
+                               (size_t) bfd_coff_filnmlen (abfd)));
+               }

            }
        }
       else
            }
        }
       else


@@ -1751,23 +1831,19 @@ coff_get_normalized_symtab (abfd)
          if (internal_ptr->u.syment._n._n_n._n_zeroes != 0)
            {
              /* This is a "short" name.  Make it long.  */
          if (internal_ptr->u.syment._n._n_n._n_zeroes != 0)
            {
              /* This is a "short" name.  Make it long.  */

-             unsigned long i = 0;
-             char *newstring = NULL;
+             size_t i;
+             char *newstring;

 
              /* find the length of this string without walking into memory
                 that isn't ours.  */
              for (i = 0; i < 8; ++i)
 
              /* find the length of this string without walking into memory
                 that isn't ours.  */
              for (i = 0; i < 8; ++i)

-               {
-                 if (internal_ptr->u.syment._n._n_name[i] == '\0')
-                   {
-                     break;
-                   }           /* if end of string */
-               }               /* possible lengths of this string. */
+               if (internal_ptr->u.syment._n._n_name[i] == '\0')
+                 break;

 
 

-             if ((newstring = (PTR) bfd_alloc (abfd, ++i)) == NULL)
+             newstring = (PTR) bfd_zalloc (abfd, (bfd_size_type) (i + 1));
+             if (newstring == NULL)

                return (NULL);
                return (NULL);

-             memset (newstring, 0, i);
-             strncpy (newstring, internal_ptr->u.syment._n._n_name, i - 1);
+             strncpy (newstring, internal_ptr->u.syment._n._n_name, i);

              internal_ptr->u.syment._n._n_n._n_offset = (long int) newstring;
              internal_ptr->u.syment._n._n_n._n_zeroes = 0;
            }
              internal_ptr->u.syment._n._n_n._n_offset = (long int) newstring;
              internal_ptr->u.syment._n._n_n._n_zeroes = 0;
            }


@@ -1824,14 +1900,14 @@ asymbol *
 coff_make_empty_symbol (abfd)
      bfd *abfd;
 {
 coff_make_empty_symbol (abfd)
      bfd *abfd;
 {

-  coff_symbol_type *new = (coff_symbol_type *) bfd_alloc (abfd, sizeof (coff_symbol_type));
+  bfd_size_type amt = sizeof (coff_symbol_type);
+  coff_symbol_type *new = (coff_symbol_type *) bfd_zalloc (abfd, amt);

   if (new == NULL)
     return (NULL);
   if (new == NULL)
     return (NULL);

-  memset (new, 0, sizeof *new);

   new->symbol.section = 0;
   new->native = 0;
   new->lineno = (alent *) NULL;
   new->symbol.section = 0;
   new->native = 0;
   new->lineno = (alent *) NULL;

-  new->done_lineno = false;
+  new->done_lineno = FALSE;

   new->symbol.the_bfd = abfd;
   return &new->symbol;
 }
   new->symbol.the_bfd = abfd;
   return &new->symbol;
 }


@@ -1841,26 +1917,27 @@ coff_make_empty_symbol (abfd)
 asymbol *
 coff_bfd_make_debug_symbol (abfd, ptr, sz)
      bfd *abfd;
 asymbol *
 coff_bfd_make_debug_symbol (abfd, ptr, sz)
      bfd *abfd;

-     PTR ptr;
-     unsigned long sz;
+     PTR ptr ATTRIBUTE_UNUSED;
+     unsigned long sz ATTRIBUTE_UNUSED;

 {
 {

-  coff_symbol_type *new = (coff_symbol_type *) bfd_alloc (abfd, sizeof (coff_symbol_type));
+  bfd_size_type amt = sizeof (coff_symbol_type);
+  coff_symbol_type *new = (coff_symbol_type *) bfd_alloc (abfd, amt);

   if (new == NULL)
     return (NULL);
   /* @@ The 10 is a guess at a plausible maximum number of aux entries
      (but shouldn't be a constant).  */
   if (new == NULL)
     return (NULL);
   /* @@ The 10 is a guess at a plausible maximum number of aux entries
      (but shouldn't be a constant).  */

-  new->native = (combined_entry_type *) bfd_zalloc (abfd, sizeof (combined_entry_type) * 10);
+  amt = sizeof (combined_entry_type) * 10;
+  new->native = (combined_entry_type *) bfd_zalloc (abfd, amt);

   if (!new->native)
     return (NULL);
   new->symbol.section = bfd_abs_section_ptr;
   new->symbol.flags = BSF_DEBUGGING;
   new->lineno = (alent *) NULL;
   if (!new->native)
     return (NULL);
   new->symbol.section = bfd_abs_section_ptr;
   new->symbol.flags = BSF_DEBUGGING;
   new->lineno = (alent *) NULL;

-  new->done_lineno = false;
+  new->done_lineno = FALSE;

   new->symbol.the_bfd = abfd;
   return &new->symbol;
 }
 
   new->symbol.the_bfd = abfd;
   return &new->symbol;
 }
 

-/*ARGSUSED */

 void
 coff_get_symbol_info (abfd, symbol, ret)
      bfd *abfd;
 void
 coff_get_symbol_info (abfd, symbol, ret)
      bfd *abfd;


@@ -1871,17 +1948,14 @@ coff_get_symbol_info (abfd, symbol, ret)
   if (coffsymbol (symbol)->native != NULL
       && coffsymbol (symbol)->native->fix_value)
     {
   if (coffsymbol (symbol)->native != NULL
       && coffsymbol (symbol)->native->fix_value)
     {

-      combined_entry_type *psym;
-
-      psym = ((combined_entry_type *)
-             coffsymbol (symbol)->native->u.syment.n_value);
-      ret->value = (bfd_vma) (psym - obj_raw_syments (abfd));
+      ret->value = coffsymbol (symbol)->native->u.syment.n_value -
+       (unsigned long) obj_raw_syments (abfd);

     }
 }
 
 /* Return the COFF syment for a symbol.  */
 
     }
 }
 
 /* Return the COFF syment for a symbol.  */
 

-boolean
+bfd_boolean

 bfd_coff_get_syment (abfd, symbol, psyment)
      bfd *abfd;
      asymbol *symbol;
 bfd_coff_get_syment (abfd, symbol, psyment)
      bfd *abfd;
      asymbol *symbol;


@@ -1893,23 +1967,23 @@ bfd_coff_get_syment (abfd, symbol, psyment)
   if (csym == NULL || csym->native == NULL)
     {
       bfd_set_error (bfd_error_invalid_operation);
   if (csym == NULL || csym->native == NULL)
     {
       bfd_set_error (bfd_error_invalid_operation);

-      return false;
+      return FALSE;

     }
 
   *psyment = csym->native->u.syment;
 
   if (csym->native->fix_value)
     }
 
   *psyment = csym->native->u.syment;
 
   if (csym->native->fix_value)

-    psyment->n_value = ((combined_entry_type *) psyment->n_value
-                       - obj_raw_syments (abfd));
+    psyment->n_value = psyment->n_value -
+      (unsigned long) obj_raw_syments (abfd);

 
   /* FIXME: We should handle fix_line here.  */
 
 
   /* FIXME: We should handle fix_line here.  */
 

-  return true;
+  return TRUE;

 }
 
 /* Return the COFF auxent for a symbol.  */
 
 }
 
 /* Return the COFF auxent for a symbol.  */
 

-boolean
+bfd_boolean

 bfd_coff_get_auxent (abfd, symbol, indx, pauxent)
      bfd *abfd;
      asymbol *symbol;
 bfd_coff_get_auxent (abfd, symbol, indx, pauxent)
      bfd *abfd;
      asymbol *symbol;


@@ -1926,7 +2000,7 @@ bfd_coff_get_auxent (abfd, symbol, indx, pauxent)
       || indx >= csym->native->u.syment.n_numaux)
     {
       bfd_set_error (bfd_error_invalid_operation);
       || indx >= csym->native->u.syment.n_numaux)
     {
       bfd_set_error (bfd_error_invalid_operation);

-      return false;
+      return FALSE;

     }
 
   ent = csym->native + indx + 1;
     }
 
   ent = csym->native + indx + 1;


@@ -1948,7 +2022,7 @@ bfd_coff_get_auxent (abfd, symbol, indx, pauxent)
       ((combined_entry_type *) pauxent->x_csect.x_scnlen.p
        - obj_raw_syments (abfd));
 
       ((combined_entry_type *) pauxent->x_csect.x_scnlen.p
        - obj_raw_syments (abfd));
 

-  return true;
+  return TRUE;

 }
 
 /* Print out information about COFF symbol.  */
 }
 
 /* Print out information about COFF symbol.  */


@@ -1977,7 +2051,7 @@ coff_print_symbol (abfd, filep, symbol, how)
     case bfd_print_symbol_all:
       if (coffsymbol (symbol)->native)
        {
     case bfd_print_symbol_all:
       if (coffsymbol (symbol)->native)
        {

-         unsigned long val;
+         bfd_vma val;

          unsigned int aux;
          combined_entry_type *combined = coffsymbol (symbol)->native;
          combined_entry_type *root = obj_raw_syments (abfd);
          unsigned int aux;
          combined_entry_type *combined = coffsymbol (symbol)->native;
          combined_entry_type *root = obj_raw_syments (abfd);


@@ -1986,12 +2060,11 @@ coff_print_symbol (abfd, filep, symbol, how)
          fprintf (file, "[%3ld]", (long) (combined - root));
 
          if (! combined->fix_value)
          fprintf (file, "[%3ld]", (long) (combined - root));
 
          if (! combined->fix_value)

-           val = (unsigned long) combined->u.syment.n_value;
+           val = (bfd_vma) combined->u.syment.n_value;

          else
          else

-           val = ((unsigned long)
-                  ((combined_entry_type *) combined->u.syment.n_value
-                   - root));
+           val = combined->u.syment.n_value - (unsigned long) root;

 
 

+#ifndef XCOFF64

          fprintf (file,
                   "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x%08lx %s",
                   combined->u.syment.n_scnum,
          fprintf (file,
                   "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x%08lx %s",
                   combined->u.syment.n_scnum,


@@ -1999,8 +2072,20 @@ coff_print_symbol (abfd, filep, symbol, how)
                   combined->u.syment.n_type,
                   combined->u.syment.n_sclass,
                   combined->u.syment.n_numaux,
                   combined->u.syment.n_type,
                   combined->u.syment.n_sclass,
                   combined->u.syment.n_numaux,

+                  (unsigned long) val,
+                  symbol->name);
+#else
+         /* Print out the wide, 64 bit, symbol value */
+         fprintf (file,
+                  "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x%016llx %s",
+                  combined->u.syment.n_scnum,
+                  combined->u.syment.n_flags,
+                  combined->u.syment.n_type,
+                  combined->u.syment.n_sclass,
+                  combined->u.syment.n_numaux,

                   val,
                   symbol->name);
                   val,
                   symbol->name);

+#endif

 
          for (aux = 0; aux < combined->u.syment.n_numaux; aux++)
            {
 
          for (aux = 0; aux < combined->u.syment.n_numaux; aux++)
            {


@@ -2040,8 +2125,25 @@ coff_print_symbol (abfd, filep, symbol, how)
                                 auxp->u.auxent.x_scn.x_comdat);
                      break;
                    }
                                 auxp->u.auxent.x_scn.x_comdat);
                      break;
                    }

+                   /* else fall through */
+               case C_EXT:
+                 if (ISFCN (combined->u.syment.n_type))
+                   {
+                     long next, llnos;
+
+                     if (auxp->fix_end)
+                       next = (auxp->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.p
+                              - root);
+                     else
+                       next = auxp->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l;
+                     llnos = auxp->u.auxent.x_sym.x_fcnary.x_fcn.x_lnnoptr;
+                     fprintf (file,
+                              "AUX tagndx %ld ttlsiz 0x%lx lnnos %ld next %ld",
+                              tagndx, auxp->u.auxent.x_sym.x_misc.x_fsize,
+                              llnos, next);
+                     break;
+                   }

                  /* else fall through */
                  /* else fall through */

-

                default:
                  fprintf (file, "AUX lnno %d size 0x%x tagndx %ld",
                           auxp->u.auxent.x_sym.x_misc.x_lnsz.x_lnno,
                default:
                  fprintf (file, "AUX lnno %d size 0x%x tagndx %ld",
                           auxp->u.auxent.x_sym.x_misc.x_lnsz.x_lnno,


@@ -2072,7 +2174,7 @@ coff_print_symbol (abfd, filep, symbol, how)
        }
       else
        {
        }
       else
        {

-         bfd_print_symbol_vandf ((PTR) file, symbol);
+         bfd_print_symbol_vandf (abfd, (PTR) file, symbol);

          fprintf (file, " %-5s %s %s %s",
                   symbol->section->name,
                   coffsymbol (symbol)->native ? "n" : "g",
          fprintf (file, " %-5s %s %s %s",
                   symbol->section->name,
                   coffsymbol (symbol)->native ? "n" : "g",


@@ -2087,31 +2189,30 @@ coff_print_symbol (abfd, filep, symbol, how)
    function for the is_local_label_name entry point, but some may
    override it.  */
 
    function for the is_local_label_name entry point, but some may
    override it.  */
 

-boolean
+bfd_boolean

 _bfd_coff_is_local_label_name (abfd, name)
 _bfd_coff_is_local_label_name (abfd, name)

-     bfd *abfd;
+     bfd *abfd ATTRIBUTE_UNUSED;

      const char *name;
 {
   return name[0] == '.' && name[1] == 'L';
 }
 
      const char *name;
 {
   return name[0] == '.' && name[1] == 'L';
 }
 

-/* Provided a BFD, a section and an offset into the section, calculate
-   and return the name of the source file and the line nearest to the
-   wanted location.  */
+/* Provided a BFD, a section and an offset (in bytes, not octets) into the
+   section, calculate and return the name of the source file and the line
+   nearest to the wanted location.  */

 
 

-/*ARGSUSED*/
-boolean
+bfd_boolean

 coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
                        functionname_ptr, line_ptr)
      bfd *abfd;
      asection *section;
      asymbol **symbols;
      bfd_vma offset;
 coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
                        functionname_ptr, line_ptr)
      bfd *abfd;
      asection *section;
      asymbol **symbols;
      bfd_vma offset;

-     CONST char **filename_ptr;
-     CONST char **functionname_ptr;
+     const char **filename_ptr;
+     const char **functionname_ptr;

      unsigned int *line_ptr;
 {
      unsigned int *line_ptr;
 {

-  boolean found;
+  bfd_boolean found;

   unsigned int i;
   unsigned int line_base;
   coff_data_type *cof = coff_data (abfd);
   unsigned int i;
   unsigned int line_base;
   coff_data_type *cof = coff_data (abfd);


@@ -2120,32 +2221,41 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
   combined_entry_type *pend;
   alent *l;
   struct coff_section_tdata *sec_data;
   combined_entry_type *pend;
   alent *l;
   struct coff_section_tdata *sec_data;

+  bfd_size_type amt;

 
   /* Before looking through the symbol table, try to use a .stab
      section to find the information.  */
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
                                             &found, filename_ptr,
                                             functionname_ptr, line_ptr,
 
   /* Before looking through the symbol table, try to use a .stab
      section to find the information.  */
   if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
                                             &found, filename_ptr,
                                             functionname_ptr, line_ptr,

-                                            &coff_data (abfd)->line_info))
-    return false;
+                                            &coff_data(abfd)->line_info))
+    return FALSE;
+

   if (found)
   if (found)

-    return true;
+    return TRUE;
+
+  /* Also try examining DWARF2 debugging information.  */
+  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
+                                    filename_ptr, functionname_ptr,
+                                    line_ptr, 0,
+                                    &coff_data(abfd)->dwarf2_find_line_info))
+    return TRUE;

 
   *filename_ptr = 0;
   *functionname_ptr = 0;
   *line_ptr = 0;
 
   /* Don't try and find line numbers in a non coff file */
 
   *filename_ptr = 0;
   *functionname_ptr = 0;
   *line_ptr = 0;
 
   /* Don't try and find line numbers in a non coff file */

-  if (abfd->xvec->flavour != bfd_target_coff_flavour)
-    return false;
+  if (!bfd_family_coff (abfd))
+    return FALSE;

 
   if (cof == NULL)
 
   if (cof == NULL)

-    return false;
+    return FALSE;

 
   /* Find the first C_FILE symbol.  */
   p = cof->raw_syments;
   if (!p)
 
   /* Find the first C_FILE symbol.  */
   p = cof->raw_syments;
   if (!p)

-    return false;
+    return FALSE;

 
   pend = p + cof->raw_syment_count;
   while (p < pend)
 
   pend = p + cof->raw_syment_count;
   while (p < pend)


@@ -2157,9 +2267,11 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 
   if (p < pend)
     {
 
   if (p < pend)
     {

+      bfd_vma sec_vma;

       bfd_vma maxdiff;
 
       /* Look through the C_FILE symbols to find the best one.  */
       bfd_vma maxdiff;
 
       /* Look through the C_FILE symbols to find the best one.  */

+      sec_vma = bfd_get_section_vma (abfd, section);

       *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;
       maxdiff = (bfd_vma) 0 - (bfd_vma) 1;
       while (1)
       *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;
       maxdiff = (bfd_vma) 0 - (bfd_vma) 1;
       while (1)


@@ -2182,17 +2294,19 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
                }
            }
 
                }
            }
 

+         /* We use <= MAXDIFF here so that if we get a zero length
+             file, we actually use the next file entry.  */

          if (p2 < pend
          if (p2 < pend

-             && offset >= (bfd_vma) p2->u.syment.n_value
-             && offset - (bfd_vma) p2->u.syment.n_value < maxdiff)
+             && offset + sec_vma >= (bfd_vma) p2->u.syment.n_value
+             && offset + sec_vma - (bfd_vma) p2->u.syment.n_value <= maxdiff)

            {
              *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;
            {
              *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;

-             maxdiff = offset - p2->u.syment.n_value;
+             maxdiff = offset + sec_vma - p2->u.syment.n_value;

            }
 
          /* Avoid endless loops on erroneous files by ensuring that
             we always move forward in the file.  */
            }
 
          /* Avoid endless loops on erroneous files by ensuring that
             we always move forward in the file.  */

-         if (p - cof->raw_syments >= p->u.syment.n_value)
+         if (p >= cof->raw_syments + p->u.syment.n_value)

            break;
 
          p = cof->raw_syments + p->u.syment.n_value;
            break;
 
          p = cof->raw_syments + p->u.syment.n_value;


@@ -2221,6 +2335,8 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 
   if (section->lineno != NULL)
     {
 
   if (section->lineno != NULL)
     {

+      bfd_vma last_value = 0;
+

       l = &section->lineno[i];
 
       for (; i < section->lineno_count; i++)
       l = &section->lineno[i];
 
       for (; i < section->lineno_count; i++)


@@ -2232,6 +2348,7 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
              if (coff->symbol.value > offset)
                break;
              *functionname_ptr = coff->symbol.name;
              if (coff->symbol.value > offset)
                break;
              *functionname_ptr = coff->symbol.name;

+             last_value = coff->symbol.value;

              if (coff->native)
                {
                  combined_entry_type *s = coff->native;
              if (coff->native)
                {
                  combined_entry_type *s = coff->native;


@@ -2254,20 +2371,33 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
            }
          else
            {
            }
          else
            {

-             if (l->u.offset + bfd_get_section_vma (abfd, section) > offset)
+             if (l->u.offset > offset)

                break;
              *line_ptr = l->line_number + line_base - 1;
            }
          l++;
        }
                break;
              *line_ptr = l->line_number + line_base - 1;
            }
          l++;
        }

+
+      /* If we fell off the end of the loop, then assume that this
+        symbol has no line number info.  Otherwise, symbols with no
+        line number info get reported with the line number of the
+        last line of the last symbol which does have line number
+        info.  We use 0x100 as a slop to account for cases where the
+        last line has executable code.  */
+      if (i >= section->lineno_count
+         && last_value != 0
+         && offset - last_value > 0x100)
+       {
+         *functionname_ptr = NULL;
+         *line_ptr = 0;
+       }

     }
 
   /* Cache the results for the next call.  */
   if (sec_data == NULL && section->owner == abfd)
     {
     }
 
   /* Cache the results for the next call.  */
   if (sec_data == NULL && section->owner == abfd)
     {

-      section->used_by_bfd =
-       ((PTR) bfd_zalloc (abfd,
-                          sizeof (struct coff_section_tdata)));
+      amt = sizeof (struct coff_section_tdata);
+      section->used_by_bfd = (PTR) bfd_zalloc (abfd, amt);

       sec_data = (struct coff_section_tdata *) section->used_by_bfd;
     }
   if (sec_data != NULL)
       sec_data = (struct coff_section_tdata *) section->used_by_bfd;
     }
   if (sec_data != NULL)


@@ -2278,17 +2408,17 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
       sec_data->line_base = line_base;
     }
 
       sec_data->line_base = line_base;
     }
 

-  return true;
+  return TRUE;

 }
 
 int
 coff_sizeof_headers (abfd, reloc)
      bfd *abfd;
 }
 
 int
 coff_sizeof_headers (abfd, reloc)
      bfd *abfd;

-     boolean reloc;
+     bfd_boolean reloc;

 {
   size_t size;
 
 {
   size_t size;
 

-  if (reloc == false)
+  if (! reloc)

     {
       size = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd);
     }
     {
       size = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd);
     }


@@ -2300,3 +2430,69 @@ coff_sizeof_headers (abfd, reloc)
   size += abfd->section_count * bfd_coff_scnhsz (abfd);
   return size;
 }
   size += abfd->section_count * bfd_coff_scnhsz (abfd);
   return size;
 }

+
+/* Change the class of a coff symbol held by BFD.  */
+bfd_boolean
+bfd_coff_set_symbol_class (abfd, symbol, class)
+     bfd *         abfd;
+     asymbol *     symbol;
+     unsigned int  class;
+{
+  coff_symbol_type * csym;
+
+  csym = coff_symbol_from (abfd, symbol);
+  if (csym == NULL)
+    {
+      bfd_set_error (bfd_error_invalid_operation);
+      return FALSE;
+    }
+  else if (csym->native == NULL)
+    {
+      /* This is an alien symbol which no native coff backend data.
+        We cheat here by creating a fake native entry for it and
+        then filling in the class.  This code is based on that in
+        coff_write_alien_symbol().  */
+
+      combined_entry_type * native;
+      bfd_size_type amt = sizeof (* native);
+
+      native = (combined_entry_type *) bfd_zalloc (abfd, amt);
+      if (native == NULL)
+       return FALSE;
+
+      native->u.syment.n_type   = T_NULL;
+      native->u.syment.n_sclass = class;
+
+      if (bfd_is_und_section (symbol->section))
+       {
+         native->u.syment.n_scnum = N_UNDEF;
+         native->u.syment.n_value = symbol->value;
+       }
+      else if (bfd_is_com_section (symbol->section))
+       {
+         native->u.syment.n_scnum = N_UNDEF;
+         native->u.syment.n_value = symbol->value;
+       }
+      else
+       {
+         native->u.syment.n_scnum =
+           symbol->section->output_section->target_index;
+         native->u.syment.n_value = (symbol->value
+                                     + symbol->section->output_offset);
+         if (! obj_pe (abfd))
+           native->u.syment.n_value += symbol->section->output_section->vma;
+
+         /* Copy the any flags from the file header into the symbol.
+            FIXME: Why?  */
+         native->u.syment.n_flags = bfd_asymbol_bfd (& csym->symbol)->flags;
+       }
+
+      csym->native = native;
+    }
+  else
+    {
+      csym->native->u.syment.n_sclass = class;
+    }
+
+  return TRUE;
+}