Update ARC instruction data-base.

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

diff --git a/bfd/syms.c b/bfd/syms.c
index 17c4ce80400e51f48d2d28473af35113c3023ae3..5a22c0b38b8b325ebe1a9eeae7f9318c2abc7c8c 100644 (file)
--- a/bfd/syms.c
+++ b/bfd/syms.c
@@ -1,14 +1,12 @@
 /* Generic symbol-table support for the BFD library.
 /* Generic symbol-table support for the BFD library.

-   Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   Copyright (C) 1990-2016 Free Software Foundation, Inc.

    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    Written by Cygnus Support.
 
    This file is part of BFD, the Binary File Descriptor library.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,7 +16,8 @@
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
 
    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software

-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */

 
 /*
 SECTION
 
 /*
 SECTION


@@ -76,7 +75,7 @@ SUBSECTION
 |
 |        if (storage_needed == 0)
 |          return;
 |
 |        if (storage_needed == 0)
 |          return;

-|        
+|

 |        symbol_table = xmalloc (storage_needed);
 |          ...
 |        number_of_symbols =
 |        symbol_table = xmalloc (storage_needed);
 |          ...
 |        number_of_symbols =


@@ -106,6 +105,7 @@ SUBSECTION
        which has been created using <<bfd_make_empty_symbol>>.  Here is an
        example showing the creation of a symbol table with only one element:
 
        which has been created using <<bfd_make_empty_symbol>>.  Here is an
        example showing the creation of a symbol table with only one element:
 

+|      #include "sysdep.h"

 |      #include "bfd.h"
 |      int main (void)
 |      {
 |      #include "bfd.h"
 |      int main (void)
 |      {


@@ -204,97 +204,108 @@ CODE_FRAGMENT
 .  symvalue value;
 .
 .  {* Attributes of a symbol.  *}
 .  symvalue value;
 .
 .  {* Attributes of a symbol.  *}

-.#define BSF_NO_FLAGS    0x00
+.#define BSF_NO_FLAGS          0x00

 .
 .  {* The symbol has local scope; <<static>> in <<C>>. The value
 .     is the offset into the section of the data.  *}
 .
 .  {* The symbol has local scope; <<static>> in <<C>>. The value
 .     is the offset into the section of the data.  *}

-.#define BSF_LOCAL     0x01
+.#define BSF_LOCAL             (1 << 0)

 .
 .  {* The symbol has global scope; initialized data in <<C>>. The
 .     value is the offset into the section of the data.  *}
 .
 .  {* The symbol has global scope; initialized data in <<C>>. The
 .     value is the offset into the section of the data.  *}

-.#define BSF_GLOBAL    0x02
+.#define BSF_GLOBAL            (1 << 1)

 .
 .  {* The symbol has global scope and is exported. The value is
 .     the offset into the section of the data.  *}
 .#define BSF_EXPORT    BSF_GLOBAL {* No real difference.  *}
 .
 .  {* A normal C symbol would be one of:
 .
 .  {* The symbol has global scope and is exported. The value is
 .     the offset into the section of the data.  *}
 .#define BSF_EXPORT    BSF_GLOBAL {* No real difference.  *}
 .
 .  {* A normal C symbol would be one of:

-.     <<BSF_LOCAL>>, <<BSF_FORT_COMM>>,  <<BSF_UNDEFINED>> or
-.     <<BSF_GLOBAL>>.  *}
+.     <<BSF_LOCAL>>, <<BSF_UNDEFINED>> or <<BSF_GLOBAL>>.  *}

 .
 .  {* The symbol is a debugging record. The value has an arbitrary
 .     meaning, unless BSF_DEBUGGING_RELOC is also set.  *}
 .
 .  {* The symbol is a debugging record. The value has an arbitrary
 .     meaning, unless BSF_DEBUGGING_RELOC is also set.  *}

-.#define BSF_DEBUGGING 0x08
+.#define BSF_DEBUGGING         (1 << 2)

 .
 .  {* The symbol denotes a function entry point.  Used in ELF,
 .     perhaps others someday.  *}
 .
 .  {* The symbol denotes a function entry point.  Used in ELF,
 .     perhaps others someday.  *}

-.#define BSF_FUNCTION    0x10
+.#define BSF_FUNCTION          (1 << 3)

 .
 .  {* Used by the linker.  *}
 .
 .  {* Used by the linker.  *}

-.#define BSF_KEEP        0x20
-.#define BSF_KEEP_G      0x40
+.#define BSF_KEEP              (1 << 5)
+.
+.  {* An ELF common symbol.  *}
+.#define BSF_ELF_COMMON                (1 << 6)

 .
 .  {* A weak global symbol, overridable without warnings by
 .     a regular global symbol of the same name.  *}
 .
 .  {* A weak global symbol, overridable without warnings by
 .     a regular global symbol of the same name.  *}

-.#define BSF_WEAK        0x80
+.#define BSF_WEAK              (1 << 7)

 .
 .  {* This symbol was created to point to a section, e.g. ELF's
 .     STT_SECTION symbols.  *}
 .
 .  {* This symbol was created to point to a section, e.g. ELF's
 .     STT_SECTION symbols.  *}

-.#define BSF_SECTION_SYM 0x100
+.#define BSF_SECTION_SYM       (1 << 8)

 .
 .  {* The symbol used to be a common symbol, but now it is
 .     allocated.  *}
 .
 .  {* The symbol used to be a common symbol, but now it is
 .     allocated.  *}

-.#define BSF_OLD_COMMON  0x200
-.
-.  {* The default value for common data.  *}
-.#define BFD_FORT_COMM_DEFAULT_VALUE 0
+.#define BSF_OLD_COMMON                (1 << 9)

 .
 .  {* In some files the type of a symbol sometimes alters its
 .     location in an output file - ie in coff a <<ISFCN>> symbol
 .     which is also <<C_EXT>> symbol appears where it was
 .     declared and not at the end of a section.  This bit is set
 .     by the target BFD part to convey this information.  *}
 .
 .  {* In some files the type of a symbol sometimes alters its
 .     location in an output file - ie in coff a <<ISFCN>> symbol
 .     which is also <<C_EXT>> symbol appears where it was
 .     declared and not at the end of a section.  This bit is set
 .     by the target BFD part to convey this information.  *}

-.#define BSF_NOT_AT_END    0x400
+.#define BSF_NOT_AT_END                (1 << 10)

 .
 .  {* Signal that the symbol is the label of constructor section.  *}
 .
 .  {* Signal that the symbol is the label of constructor section.  *}

-.#define BSF_CONSTRUCTOR   0x800
+.#define BSF_CONSTRUCTOR       (1 << 11)

 .
 .  {* Signal that the symbol is a warning symbol.  The name is a
 .     warning.  The name of the next symbol is the one to warn about;
 .     if a reference is made to a symbol with the same name as the next
 .     symbol, a warning is issued by the linker.  *}
 .
 .  {* Signal that the symbol is a warning symbol.  The name is a
 .     warning.  The name of the next symbol is the one to warn about;
 .     if a reference is made to a symbol with the same name as the next
 .     symbol, a warning is issued by the linker.  *}

-.#define BSF_WARNING       0x1000
+.#define BSF_WARNING           (1 << 12)

 .
 .  {* Signal that the symbol is indirect.  This symbol is an indirect
 .     pointer to the symbol with the same name as the next symbol.  *}
 .
 .  {* Signal that the symbol is indirect.  This symbol is an indirect
 .     pointer to the symbol with the same name as the next symbol.  *}

-.#define BSF_INDIRECT      0x2000
+.#define BSF_INDIRECT          (1 << 13)

 .
 .  {* BSF_FILE marks symbols that contain a file name.  This is used
 .     for ELF STT_FILE symbols.  *}
 .
 .  {* BSF_FILE marks symbols that contain a file name.  This is used
 .     for ELF STT_FILE symbols.  *}

-.#define BSF_FILE          0x4000
+.#define BSF_FILE              (1 << 14)

 .
 .  {* Symbol is from dynamic linking information.  *}
 .
 .  {* Symbol is from dynamic linking information.  *}

-.#define BSF_DYNAMIC      0x8000
+.#define BSF_DYNAMIC           (1 << 15)

 .
 .  {* The symbol denotes a data object.  Used in ELF, and perhaps
 .     others someday.  *}
 .
 .  {* The symbol denotes a data object.  Used in ELF, and perhaps
 .     others someday.  *}

-.#define BSF_OBJECT       0x10000
+.#define BSF_OBJECT            (1 << 16)

 .
 .  {* This symbol is a debugging symbol.  The value is the offset
 .     into the section of the data.  BSF_DEBUGGING should be set
 .     as well.  *}
 .
 .  {* This symbol is a debugging symbol.  The value is the offset
 .     into the section of the data.  BSF_DEBUGGING should be set
 .     as well.  *}

-.#define BSF_DEBUGGING_RELOC 0x20000
+.#define BSF_DEBUGGING_RELOC   (1 << 17)

 .
 .  {* This symbol is thread local.  Used in ELF.  *}
 .
 .  {* This symbol is thread local.  Used in ELF.  *}

-.#define BSF_THREAD_LOCAL  0x40000
+.#define BSF_THREAD_LOCAL      (1 << 18)

 .
 .  {* This symbol represents a complex relocation expression,
 .     with the expression tree serialized in the symbol name.  *}
 .
 .  {* This symbol represents a complex relocation expression,
 .     with the expression tree serialized in the symbol name.  *}

-.#define BSF_RELC 0x80000
+.#define BSF_RELC              (1 << 19)

 .
 .  {* This symbol represents a signed complex relocation expression,
 .     with the expression tree serialized in the symbol name.  *}
 .
 .  {* This symbol represents a signed complex relocation expression,
 .     with the expression tree serialized in the symbol name.  *}

-.#define BSF_SRELC 0x100000
+.#define BSF_SRELC             (1 << 20)
+.
+.  {* This symbol was created by bfd_get_synthetic_symtab.  *}
+.#define BSF_SYNTHETIC         (1 << 21)
+.
+.  {* This symbol is an indirect code object.  Unrelated to BSF_INDIRECT.
+.     The dynamic linker will compute the value of this symbol by
+.     calling the function that it points to.  BSF_FUNCTION must
+.     also be also set.  *}
+.#define BSF_GNU_INDIRECT_FUNCTION (1 << 22)
+.  {* This symbol is a globally unique data object.  The dynamic linker
+.     will make sure that in the entire process there is just one symbol
+.     with this name and type in use.  BSF_OBJECT must also be set.  *}
+.#define BSF_GNU_UNIQUE                (1 << 23)

 .
 .  flagword flags;
 .
 .
 .  flagword flags;
 .


@@ -315,8 +326,8 @@ CODE_FRAGMENT
 .
 */
 
 .
 */
 

-#include "bfd.h"

 #include "sysdep.h"
 #include "sysdep.h"

+#include "bfd.h"

 #include "libbfd.h"
 #include "safe-ctype.h"
 #include "bfdlink.h"
 #include "libbfd.h"
 #include "safe-ctype.h"
 #include "bfdlink.h"


@@ -463,7 +474,7 @@ DESCRIPTION
 void
 bfd_print_symbol_vandf (bfd *abfd, void *arg, asymbol *symbol)
 {
 void
 bfd_print_symbol_vandf (bfd *abfd, void *arg, asymbol *symbol)
 {

-  FILE *file = arg;
+  FILE *file = (FILE *) arg;

 
   flagword type = symbol->flags;
 
 
   flagword type = symbol->flags;
 


@@ -478,11 +489,12 @@ bfd_print_symbol_vandf (bfd *abfd, void *arg, asymbol *symbol)
   fprintf (file, " %c%c%c%c%c%c%c",
           ((type & BSF_LOCAL)
            ? (type & BSF_GLOBAL) ? '!' : 'l'
   fprintf (file, " %c%c%c%c%c%c%c",
           ((type & BSF_LOCAL)
            ? (type & BSF_GLOBAL) ? '!' : 'l'

-           : (type & BSF_GLOBAL) ? 'g' : ' '),
+           : (type & BSF_GLOBAL) ? 'g'
+           : (type & BSF_GNU_UNIQUE) ? 'u' : ' '),

           (type & BSF_WEAK) ? 'w' : ' ',
           (type & BSF_CONSTRUCTOR) ? 'C' : ' ',
           (type & BSF_WARNING) ? 'W' : ' ',
           (type & BSF_WEAK) ? 'w' : ' ',
           (type & BSF_CONSTRUCTOR) ? 'C' : ' ',
           (type & BSF_WARNING) ? 'W' : ' ',

-          (type & BSF_INDIRECT) ? 'I' : ' ',
+          (type & BSF_INDIRECT) ? 'I' : (type & BSF_GNU_INDIRECT_FUNCTION) ? 'i' : ' ',

           (type & BSF_DEBUGGING) ? 'd' : (type & BSF_DYNAMIC) ? 'D' : ' ',
           ((type & BSF_FUNCTION)
            ? 'F'
           (type & BSF_DEBUGGING) ? 'd' : (type & BSF_DYNAMIC) ? 'D' : ' ',
           ((type & BSF_FUNCTION)
            ? 'F'


@@ -527,10 +539,10 @@ asymbol *
 _bfd_generic_make_empty_symbol (bfd *abfd)
 {
   bfd_size_type amt = sizeof (asymbol);
 _bfd_generic_make_empty_symbol (bfd *abfd)
 {
   bfd_size_type amt = sizeof (asymbol);

-  asymbol *new = bfd_zalloc (abfd, amt);
-  if (new)
-    new->the_bfd = abfd;
-  return new;
+  asymbol *new_symbol = (asymbol *) bfd_zalloc (abfd, amt);
+  if (new_symbol)
+    new_symbol->the_bfd = abfd;
+  return new_symbol;

 }
 
 /*
 }
 
 /*


@@ -650,7 +662,7 @@ bfd_decode_symclass (asymbol *symbol)
 {
   char c;
 
 {
   char c;
 

-  if (bfd_is_com_section (symbol->section))
+  if (symbol->section && bfd_is_com_section (symbol->section))

     return 'C';
   if (bfd_is_und_section (symbol->section))
     {
     return 'C';
   if (bfd_is_und_section (symbol->section))
     {


@@ -668,6 +680,8 @@ bfd_decode_symclass (asymbol *symbol)
     }
   if (bfd_is_ind_section (symbol->section))
     return 'I';
     }
   if (bfd_is_ind_section (symbol->section))
     return 'I';

+  if (symbol->flags & BSF_GNU_INDIRECT_FUNCTION)
+    return 'i';

   if (symbol->flags & BSF_WEAK)
     {
       /* If weak, determine if it's specifically an object
   if (symbol->flags & BSF_WEAK)
     {
       /* If weak, determine if it's specifically an object


@@ -677,6 +691,8 @@ bfd_decode_symclass (asymbol *symbol)
       else
        return 'W';
     }
       else
        return 'W';
     }

+  if (symbol->flags & BSF_GNU_UNIQUE)
+    return 'u';

   if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL)))
     return '?';
 
   if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL)))
     return '?';
 


@@ -795,7 +811,7 @@ _bfd_generic_read_minisymbols (bfd *abfd,
   if (storage == 0)
     return 0;
 
   if (storage == 0)
     return 0;
 

-  syms = bfd_malloc (storage);
+  syms = (asymbol **) bfd_malloc (storage);

   if (syms == NULL)
     goto error_return;
 
   if (syms == NULL)
     goto error_return;
 


@@ -808,6 +824,7 @@ _bfd_generic_read_minisymbols (bfd *abfd,
 
   *minisymsp = syms;
   *sizep = sizeof (asymbol *);
 
   *minisymsp = syms;
   *sizep = sizeof (asymbol *);

+

   return symcount;
 
  error_return:
   return symcount;
 
  error_return:


@@ -862,8 +879,8 @@ struct indexentry
 static int
 cmpindexentry (const void *a, const void *b)
 {
 static int
 cmpindexentry (const void *a, const void *b)
 {

-  const struct indexentry *contestantA = a;
-  const struct indexentry *contestantB = b;
+  const struct indexentry *contestantA = (const struct indexentry *) a;
+  const struct indexentry *contestantB = (const struct indexentry *) b;

 
   if (contestantA->val < contestantB->val)
     return -1;
 
   if (contestantA->val < contestantB->val)
     return -1;


@@ -917,12 +934,11 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
   struct stab_find_info *info;
   bfd_size_type stabsize, strsize;
   bfd_byte *stab, *str;
   struct stab_find_info *info;
   bfd_size_type stabsize, strsize;
   bfd_byte *stab, *str;

-  bfd_byte *last_stab = NULL;
+  bfd_byte *nul_fun, *nul_str;

   bfd_size_type stroff;
   struct indexentry *indexentry;
   char *file_name;
   char *directory_name;
   bfd_size_type stroff;
   struct indexentry *indexentry;
   char *file_name;
   char *directory_name;

-  int saw_fun;

   bfd_boolean saw_line, saw_func;
 
   *pfound = FALSE;
   bfd_boolean saw_line, saw_func;
 
   *pfound = FALSE;


@@ -950,7 +966,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
 #define VALOFF (8)
 #define STABSIZE (12)
 
 #define VALOFF (8)
 #define STABSIZE (12)
 

-  info = *pinfo;
+  info = (struct stab_find_info *) *pinfo;

   if (info != NULL)
     {
       if (info->stabsec == NULL || info->strsec == NULL)
   if (info != NULL)
     {
       if (info->stabsec == NULL || info->strsec == NULL)


@@ -971,11 +987,10 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
       long reloc_size, reloc_count;
       arelent **reloc_vector;
       int i;
       long reloc_size, reloc_count;
       arelent **reloc_vector;
       int i;

-      char *name;

       char *function_name;
       bfd_size_type amt = sizeof *info;
 
       char *function_name;
       bfd_size_type amt = sizeof *info;
 

-      info = bfd_zalloc (abfd, amt);
+      info = (struct stab_find_info *) bfd_zalloc (abfd, amt);

       if (info == NULL)
        return FALSE;
 
       if (info == NULL)
        return FALSE;
 


@@ -988,21 +1003,29 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
 
       if (info->stabsec == NULL || info->strsec == NULL)
        {
 
       if (info->stabsec == NULL || info->strsec == NULL)
        {

-         /* No stabs debugging information.  Set *pinfo so that we
-             can return quickly in the info != NULL case above.  */
-         *pinfo = info;
-         return TRUE;
+         /* Try SOM section names.  */
+         info->stabsec = bfd_get_section_by_name (abfd, "$GDB_SYMBOLS$");
+         info->strsec  = bfd_get_section_by_name (abfd, "$GDB_STRINGS$");
+
+         if (info->stabsec == NULL || info->strsec == NULL)
+           {
+             /* No stabs debugging information.  Set *pinfo so that we
+                can return quickly in the info != NULL case above.  */
+             *pinfo = info;
+             return TRUE;
+           }

        }
 
       stabsize = (info->stabsec->rawsize
                  ? info->stabsec->rawsize
                  : info->stabsec->size);
        }
 
       stabsize = (info->stabsec->rawsize
                  ? info->stabsec->rawsize
                  : info->stabsec->size);

+      stabsize = (stabsize / STABSIZE) * STABSIZE;

       strsize = (info->strsec->rawsize
                 ? info->strsec->rawsize
                 : info->strsec->size);
 
       strsize = (info->strsec->rawsize
                 ? info->strsec->rawsize
                 : info->strsec->size);
 

-      info->stabs = bfd_alloc (abfd, stabsize);
-      info->strs = bfd_alloc (abfd, strsize);
+      info->stabs = (bfd_byte *) bfd_alloc (abfd, stabsize);
+      info->strs = (bfd_byte *) bfd_alloc (abfd, strsize);

       if (info->stabs == NULL || info->strs == NULL)
        return FALSE;
 
       if (info->stabs == NULL || info->strs == NULL)
        return FALSE;
 


@@ -1019,7 +1042,7 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
       reloc_size = bfd_get_reloc_upper_bound (abfd, info->stabsec);
       if (reloc_size < 0)
        return FALSE;
       reloc_size = bfd_get_reloc_upper_bound (abfd, info->stabsec);
       if (reloc_size < 0)
        return FALSE;

-      reloc_vector = bfd_malloc (reloc_size);
+      reloc_vector = (arelent **) bfd_malloc (reloc_size);

       if (reloc_vector == NULL && reloc_size != 0)
        return FALSE;
       reloc_count = bfd_canonicalize_reloc (abfd, info->stabsec, reloc_vector,
       if (reloc_vector == NULL && reloc_size != 0)
        return FALSE;
       reloc_count = bfd_canonicalize_reloc (abfd, info->stabsec, reloc_vector,


@@ -1060,11 +1083,13 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
                  return FALSE;
                }
 
                  return FALSE;
                }
 

-             val = bfd_get_32 (abfd, info->stabs + r->address);
+             val = bfd_get_32 (abfd, info->stabs
+                               + r->address * bfd_octets_per_byte (abfd));

              val &= r->howto->src_mask;
              sym = *r->sym_ptr_ptr;
              val += sym->value + sym->section->vma + r->addend;
              val &= r->howto->src_mask;
              sym = *r->sym_ptr_ptr;
              val += sym->value + sym->section->vma + r->addend;

-             bfd_put_32 (abfd, (bfd_vma) val, info->stabs + r->address);
+             bfd_put_32 (abfd, (bfd_vma) val, info->stabs
+                         + r->address * bfd_octets_per_byte (abfd));

            }
        }
 
            }
        }
 


@@ -1078,36 +1103,37 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
         table.  */
 
       info->indextablesize = 0;
         table.  */
 
       info->indextablesize = 0;

-      saw_fun = 1;
+      nul_fun = NULL;

       for (stab = info->stabs; stab < info->stabs + stabsize; stab += STABSIZE)
        {
          if (stab[TYPEOFF] == (bfd_byte) N_SO)
            {
       for (stab = info->stabs; stab < info->stabs + stabsize; stab += STABSIZE)
        {
          if (stab[TYPEOFF] == (bfd_byte) N_SO)
            {

-             /* N_SO with null name indicates EOF */
-             if (bfd_get_32 (abfd, stab + STRDXOFF) == 0)
-               continue;
-

              /* if we did not see a function def, leave space for one.  */
              /* if we did not see a function def, leave space for one.  */

-             if (saw_fun == 0)
+             if (nul_fun != NULL)

                ++info->indextablesize;
 
                ++info->indextablesize;
 

-             saw_fun = 0;
-
-             /* two N_SO's in a row is a filename and directory. Skip */
-             if (stab + STABSIZE < info->stabs + stabsize
-                 && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO)
+             /* N_SO with null name indicates EOF */
+             if (bfd_get_32 (abfd, stab + STRDXOFF) == 0)
+               nul_fun = NULL;
+             else

                {
                {

-                 stab += STABSIZE;
+                 nul_fun = stab;
+
+                 /* two N_SO's in a row is a filename and directory. Skip */
+                 if (stab + STABSIZE + TYPEOFF < info->stabs + stabsize
+                     && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO)
+                   stab += STABSIZE;

                }
            }
                }
            }

-         else if (stab[TYPEOFF] == (bfd_byte) N_FUN)
+         else if (stab[TYPEOFF] == (bfd_byte) N_FUN
+                  && bfd_get_32 (abfd, stab + STRDXOFF) != 0)

            {
            {

-             saw_fun = 1;
+             nul_fun = NULL;

              ++info->indextablesize;
            }
        }
 
              ++info->indextablesize;
            }
        }
 

-      if (saw_fun == 0)
+      if (nul_fun != NULL)

        ++info->indextablesize;
 
       if (info->indextablesize == 0)
        ++info->indextablesize;
 
       if (info->indextablesize == 0)


@@ -1116,15 +1142,16 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
 
       amt = info->indextablesize;
       amt *= sizeof (struct indexentry);
 
       amt = info->indextablesize;
       amt *= sizeof (struct indexentry);

-      info->indextable = bfd_alloc (abfd, amt);
+      info->indextable = (struct indexentry *) bfd_alloc (abfd, amt);

       if (info->indextable == NULL)
        return FALSE;
 
       file_name = NULL;
       directory_name = NULL;
       if (info->indextable == NULL)
        return FALSE;
 
       file_name = NULL;
       directory_name = NULL;

-      saw_fun = 1;
+      nul_fun = NULL;
+      stroff = 0;

 
 

-      for (i = 0, stroff = 0, stab = info->stabs, str = info->strs;
+      for (i = 0, stab = info->stabs, nul_str = str = info->strs;

           i < info->indextablesize && stab < info->stabs + stabsize;
           stab += STABSIZE)
        {
           i < info->indextablesize && stab < info->stabs + stabsize;
           stab += STABSIZE)
        {


@@ -1146,34 +1173,32 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
                 Note that a N_SO without a file name is an EOF and
                 there could be 2 N_SO following it with the new filename
                 and directory.  */
                 Note that a N_SO without a file name is an EOF and
                 there could be 2 N_SO following it with the new filename
                 and directory.  */

-             if (saw_fun == 0)
+             if (nul_fun != NULL)

                {
                {

-                 info->indextable[i].val = bfd_get_32 (abfd, last_stab + VALOFF);
-                 info->indextable[i].stab = last_stab;
-                 info->indextable[i].str = str;
+                 info->indextable[i].val = bfd_get_32 (abfd, nul_fun + VALOFF);
+                 info->indextable[i].stab = nul_fun;
+                 info->indextable[i].str = nul_str;

                  info->indextable[i].directory_name = directory_name;
                  info->indextable[i].file_name = file_name;
                  info->indextable[i].function_name = NULL;
                  ++i;
                }
                  info->indextable[i].directory_name = directory_name;
                  info->indextable[i].file_name = file_name;
                  info->indextable[i].function_name = NULL;
                  ++i;
                }

-             saw_fun = 0;

 
 

+             directory_name = NULL;

              file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
              file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);

-             if (*file_name == '\0')
+             if (file_name == (char *) str)

                {
                {

-                 directory_name = NULL;

                  file_name = NULL;
                  file_name = NULL;

-                 saw_fun = 1;
+                 nul_fun = NULL;

                }
              else
                {
                }
              else
                {

-                 last_stab = stab;
-                 if (stab + STABSIZE >= info->stabs + stabsize
-                     || *(stab + STABSIZE + TYPEOFF) != (bfd_byte) N_SO)
-                   {
-                     directory_name = NULL;
-                   }
-                 else
+                 nul_fun = stab;
+                 nul_str = str;
+                 if (file_name >= (char *) info->strs + strsize || file_name < (char *) str)
+                   file_name = NULL;
+                 if (stab + STABSIZE + TYPEOFF < info->stabs + stabsize
+                     && *(stab + STABSIZE + TYPEOFF) == (bfd_byte) N_SO)

                    {
                      /* Two consecutive N_SOs are a directory and a
                         file name.  */
                    {
                      /* Two consecutive N_SOs are a directory and a
                         file name.  */


@@ -1181,6 +1206,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
                      directory_name = file_name;
                      file_name = ((char *) str
                                   + bfd_get_32 (abfd, stab + STRDXOFF));
                      directory_name = file_name;
                      file_name = ((char *) str
                                   + bfd_get_32 (abfd, stab + STRDXOFF));

+                     if (file_name >= (char *) info->strs + strsize || file_name < (char *) str)
+                       file_name = NULL;

                    }
                }
              break;
                    }
                }
              break;


@@ -1188,21 +1215,21 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
            case N_SOL:
              /* The name of an include file.  */
              file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
            case N_SOL:
              /* The name of an include file.  */
              file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);

+             /* PR 17512: file: 0c680a1f.  */
+             /* PR 17512: file: 5da8aec4.  */
+             if (file_name >= (char *) info->strs + strsize || file_name < (char *) str)
+               file_name = NULL;

              break;
 
            case N_FUN:
              /* A function name.  */
              break;
 
            case N_FUN:
              /* A function name.  */

-             saw_fun = 1;
-             name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
-
-             if (*name == '\0')
-               name = NULL;
-
-             function_name = name;
-
-             if (name == NULL)
+             function_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
+             if (function_name == (char *) str)

                continue;
                continue;

+             if (function_name >= (char *) info->strs + strsize)
+               function_name = NULL;

 
 

+             nul_fun = NULL;

              info->indextable[i].val = bfd_get_32 (abfd, stab + VALOFF);
              info->indextable[i].stab = stab;
              info->indextable[i].str = str;
              info->indextable[i].val = bfd_get_32 (abfd, stab + VALOFF);
              info->indextable[i].stab = stab;
              info->indextable[i].str = str;


@@ -1214,11 +1241,11 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
            }
        }
 
            }
        }
 

-      if (saw_fun == 0)
+      if (nul_fun != NULL)

        {
        {

-         info->indextable[i].val = bfd_get_32 (abfd, last_stab + VALOFF);
-         info->indextable[i].stab = last_stab;
-         info->indextable[i].str = str;
+         info->indextable[i].val = bfd_get_32 (abfd, nul_fun + VALOFF);
+         info->indextable[i].stab = nul_fun;
+         info->indextable[i].str = nul_str;

          info->indextable[i].directory_name = directory_name;
          info->indextable[i].file_name = file_name;
          info->indextable[i].function_name = NULL;
          info->indextable[i].directory_name = directory_name;
          info->indextable[i].file_name = file_name;
          info->indextable[i].function_name = NULL;


@@ -1308,6 +1335,8 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
          if (val <= offset)
            {
              file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
          if (val <= offset)
            {
              file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);

+             if (file_name >= (char *) info->strs + strsize || file_name < (char *) str)
+               file_name = NULL;

              *pline = 0;
            }
          break;
              *pline = 0;
            }
          break;


@@ -1363,15 +1392,16 @@ _bfd_stab_section_find_nearest_line (bfd *abfd,
 
       dirlen = strlen (directory_name);
       if (info->filename == NULL
 
       dirlen = strlen (directory_name);
       if (info->filename == NULL

-         || strncmp (info->filename, directory_name, dirlen) != 0
-         || strcmp (info->filename + dirlen, file_name) != 0)
+         || filename_ncmp (info->filename, directory_name, dirlen) != 0
+         || filename_cmp (info->filename + dirlen, file_name) != 0)

        {
          size_t len;
 
        {
          size_t len;
 

-         if (info->filename != NULL)
-           free (info->filename);
+         /* Don't free info->filename here.  objdump and other
+            apps keep a copy of a previously returned file name
+            pointer.  */

          len = strlen (file_name) + 1;
          len = strlen (file_name) + 1;

-         info->filename = bfd_malloc (dirlen + len);
+         info->filename = (char *) bfd_alloc (abfd, dirlen + len);

          if (info->filename == NULL)
            return FALSE;
          memcpy (info->filename, directory_name, dirlen);
          if (info->filename == NULL)
            return FALSE;
          memcpy (info->filename, directory_name, dirlen);