PR binutils/15033

[deliverable/binutils-gdb.git] / binutils / rddbg.c

diff --git a/binutils/rddbg.c b/binutils/rddbg.c
index 2f6ec6e3ea1b924aca63da7012cb8cb390767829..27abd66a489bf653ed1cf1aeabb43053eae4594a 100644 (file)
--- a/binutils/rddbg.c
+++ b/binutils/rddbg.c
@@ -1,12 +1,13 @@
 /* rddbg.c -- Read debugging information into a generic form.
 /* rddbg.c -- Read debugging information into a generic form.

-   Copyright 1995, 1996, 1997, 2000, 2002 Free Software Foundation, Inc.
+   Copyright 1995, 1996, 1997, 2000, 2002, 2003, 2005, 2007, 2008,
+   2010  Free Software Foundation, Inc.

    Written by Ian Lance Taylor <ian@cygnus.com>.
 
    This file is part of GNU Binutils.
 
    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 Ian Lance Taylor <ian@cygnus.com>.
 
    This file is part of GNU Binutils.
 
    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,


@@ -16,42 +17,37 @@
 
    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., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
+   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+   02110-1301, USA.  */
+

 
 /* This file reads debugging information into a generic form.  This
    file knows how to dig the debugging information out of an object
    file.  */
 
 
 /* This file reads debugging information into a generic form.  This
    file knows how to dig the debugging information out of an object
    file.  */
 

+#include "sysdep.h"

 #include "bfd.h"
 #include "bfd.h"

-#include "bucomm.h"

 #include "libiberty.h"
 #include "libiberty.h"

+#include "bucomm.h"

 #include "debug.h"
 #include "budbg.h"
 
 static bfd_boolean read_section_stabs_debugging_info
 #include "debug.h"
 #include "budbg.h"
 
 static bfd_boolean read_section_stabs_debugging_info

-  PARAMS ((bfd *, asymbol **, long, PTR, bfd_boolean *));
+  (bfd *, asymbol **, long, void *, bfd_boolean *);

 static bfd_boolean read_symbol_stabs_debugging_info
 static bfd_boolean read_symbol_stabs_debugging_info

-  PARAMS ((bfd *, asymbol **, long, PTR, bfd_boolean *));
-static bfd_boolean read_ieee_debugging_info
-  PARAMS ((bfd *, PTR, bfd_boolean *));
-static void save_stab
-  PARAMS ((int, int, bfd_vma, const char *));
-static void stab_context
-  PARAMS ((void));
-static void free_saved_stabs
-  PARAMS ((void));
+  (bfd *, asymbol **, long, void *, bfd_boolean *);
+static bfd_boolean read_ieee_debugging_info (bfd *, void *, bfd_boolean *);
+static void save_stab (int, int, bfd_vma, const char *);
+static void stab_context (void);
+static void free_saved_stabs (void);

 
 /* Read debugging information from a BFD.  Returns a generic debugging
    pointer.  */
 
 
 /* Read debugging information from a BFD.  Returns a generic debugging
    pointer.  */
 

-PTR
-read_debugging_info (abfd, syms, symcount)
-     bfd *abfd;
-     asymbol **syms;
-     long symcount;
+void *
+read_debugging_info (bfd *abfd, asymbol **syms, long symcount, bfd_boolean no_messages)

 {
 {

-  PTR dhandle;
+  void *dhandle;

   bfd_boolean found;
 
   dhandle = debug_init ();
   bfd_boolean found;
 
   dhandle = debug_init ();


@@ -88,8 +84,9 @@ read_debugging_info (abfd, syms, symcount)
 
   if (! found)
     {
 
   if (! found)
     {

-      non_fatal (_("%s: no recognized debugging information"),
-                bfd_get_filename (abfd));
+      if (! no_messages)
+       non_fatal (_("%s: no recognized debugging information"),
+                  bfd_get_filename (abfd));

       return NULL;
     }
 
       return NULL;
     }
 


@@ -99,21 +96,22 @@ read_debugging_info (abfd, syms, symcount)
 /* Read stabs in sections debugging information from a BFD.  */
 
 static bfd_boolean
 /* Read stabs in sections debugging information from a BFD.  */
 
 static bfd_boolean

-read_section_stabs_debugging_info (abfd, syms, symcount, dhandle, pfound)
-     bfd *abfd;
-     asymbol **syms;
-     long symcount;
-     PTR dhandle;
-     bfd_boolean *pfound;
+read_section_stabs_debugging_info (bfd *abfd, asymbol **syms, long symcount,
+                                  void *dhandle, bfd_boolean *pfound)

 {
   static struct
     {
       const char *secname;
       const char *strsecname;
 {
   static struct
     {
       const char *secname;
       const char *strsecname;

-    } names[] = { { ".stab", ".stabstr" },
-                 { "LC_SYMTAB.stabs", "LC_SYMTAB.stabstr" } };
+    }
+  names[] =
+    {
+      { ".stab", ".stabstr" },
+      { "LC_SYMTAB.stabs", "LC_SYMTAB.stabstr" },
+      { "$GDB_SYMBOLS$", "$GDB_STRINGS$" }
+    };

   unsigned int i;
   unsigned int i;

-  PTR shandle;
+  void *shandle;

 
   *pfound = FALSE;
   shandle = NULL;
 
   *pfound = FALSE;
   shandle = NULL;


@@ -166,7 +164,7 @@ read_section_stabs_debugging_info (abfd, syms, symcount, dhandle, pfound)
            {
              unsigned int strx;
              int type;
            {
              unsigned int strx;
              int type;

-             int other;
+             int other ATTRIBUTE_UNUSED;

              int desc;
              bfd_vma value;
 
              int desc;
              bfd_vma value;
 


@@ -261,14 +259,10 @@ read_section_stabs_debugging_info (abfd, syms, symcount, dhandle, pfound)
 /* Read stabs in the symbol table.  */
 
 static bfd_boolean
 /* Read stabs in the symbol table.  */
 
 static bfd_boolean

-read_symbol_stabs_debugging_info (abfd, syms, symcount, dhandle, pfound)
-     bfd *abfd;
-     asymbol **syms;
-     long symcount;
-     PTR dhandle;
-     bfd_boolean *pfound;
+read_symbol_stabs_debugging_info (bfd *abfd, asymbol **syms, long symcount,
+                                 void *dhandle, bfd_boolean *pfound)

 {
 {

-  PTR shandle;
+  void *shandle;

   asymbol **ps, **symend;
 
   shandle = NULL;
   asymbol **ps, **symend;
 
   shandle = NULL;


@@ -341,10 +335,7 @@ read_symbol_stabs_debugging_info (abfd, syms, symcount, dhandle, pfound)
 /* Read IEEE debugging information.  */
 
 static bfd_boolean
 /* Read IEEE debugging information.  */
 
 static bfd_boolean

-read_ieee_debugging_info (abfd, dhandle, pfound)
-     bfd *abfd;
-     PTR dhandle;
-     bfd_boolean *pfound;
+read_ieee_debugging_info (bfd *abfd, void *dhandle, bfd_boolean *pfound)

 {
   asection *dsec;
   bfd_size_type size;
 {
   asection *dsec;
   bfd_size_type size;


@@ -390,11 +381,7 @@ static int saved_stabs_index;
 /* Save a stabs string.  */
 
 static void
 /* Save a stabs string.  */
 
 static void

-save_stab (type, desc, value, string)
-     int type;
-     int desc;
-     bfd_vma value;
-     const char *string;
+save_stab (int type, int desc, bfd_vma value, const char *string)

 {
   if (saved_stabs[saved_stabs_index].string != NULL)
     free (saved_stabs[saved_stabs_index].string);
 {
   if (saved_stabs[saved_stabs_index].string != NULL)
     free (saved_stabs[saved_stabs_index].string);


@@ -408,7 +395,7 @@ save_stab (type, desc, value, string)
 /* Provide context for an error.  */
 
 static void
 /* Provide context for an error.  */
 
 static void

-stab_context ()
+stab_context (void)

 {
   int i;
 
 {
   int i;
 


@@ -446,7 +433,7 @@ stab_context ()
 /* Free the saved stab strings.  */
 
 static void
 /* Free the saved stab strings.  */
 
 static void

-free_saved_stabs ()
+free_saved_stabs (void)

 {
   int i;
 
 {
   int i;