gas: run the hwcaps-bump tests with 64-bit sparc objects only.

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

diff --git a/binutils/debug.c b/binutils/debug.c
index 3d7d48e2bbf98d183492d8d70411945917ff7558..0744f3e7e7cb62d00a21fadd2e85cbc3eb2f0df7 100644 (file)
--- a/binutils/debug.c
+++ b/binutils/debug.c
@@ -1,12 +1,12 @@
 /* debug.c -- Handle generic debugging information.
 /* debug.c -- Handle generic debugging information.

-   Copyright 1995, 1996, 1997, 1998, 2000, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1995-2016 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,21 +16,21 @@
 
    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 implements a generic debugging format.  We may eventually
    have readers which convert different formats into this generic
    format, and writers which write it out.  The initial impetus for
 
 /* This file implements a generic debugging format.  We may eventually
    have readers which convert different formats into this generic
    format, and writers which write it out.  The initial impetus for

-   this was writing a convertor from stabs to HP IEEE-695 debugging
+   this was writing a converter from stabs to HP IEEE-695 debugging

    format.  */
 
    format.  */
 

-#include <stdio.h>
+#include "sysdep.h"

 #include <assert.h>
 #include <assert.h>

-

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

-#include "bucomm.h"

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

+#include "filenames.h"

 #include "debug.h"
 
 /* Global information we keep for debugging.  A pointer to this
 #include "debug.h"
 
 /* Global information we keep for debugging.  A pointer to this


@@ -96,7 +96,7 @@ struct debug_file
 
 /* A type.  */
 
 
 /* A type.  */
 

-struct debug_type
+struct debug_type_s

 {
   /* Kind of type.  */
   enum debug_type_kind kind;
 {
   /* Kind of type.  */
   enum debug_type_kind kind;


@@ -118,11 +118,11 @@ struct debug_type
       /* DEBUG_KIND_ENUM.  */
       struct debug_enum_type *kenum;
       /* DEBUG_KIND_POINTER.  */
       /* DEBUG_KIND_ENUM.  */
       struct debug_enum_type *kenum;
       /* DEBUG_KIND_POINTER.  */

-      struct debug_type *kpointer;
+      struct debug_type_s *kpointer;

       /* DEBUG_KIND_FUNCTION.  */
       struct debug_function_type *kfunction;
       /* DEBUG_KIND_REFERENCE.  */
       /* DEBUG_KIND_FUNCTION.  */
       struct debug_function_type *kfunction;
       /* DEBUG_KIND_REFERENCE.  */

-      struct debug_type *kreference;
+      struct debug_type_s *kreference;

       /* DEBUG_KIND_RANGE.  */
       struct debug_range_type *krange;
       /* DEBUG_KIND_ARRAY.  */
       /* DEBUG_KIND_RANGE.  */
       struct debug_range_type *krange;
       /* DEBUG_KIND_ARRAY.  */


@@ -134,9 +134,9 @@ struct debug_type
       /* DEBUG_KIND_METHOD.  */
       struct debug_method_type *kmethod;
       /* DEBUG_KIND_CONST.  */
       /* DEBUG_KIND_METHOD.  */
       struct debug_method_type *kmethod;
       /* DEBUG_KIND_CONST.  */

-      struct debug_type *kconst;
+      struct debug_type_s *kconst;

       /* DEBUG_KIND_VOLATILE.  */
       /* DEBUG_KIND_VOLATILE.  */

-      struct debug_type *kvolatile;
+      struct debug_type_s *kvolatile;

       /* DEBUG_KIND_NAMED, DEBUG_KIND_TAGGED.  */
       struct debug_named_type *knamed;
     } u;
       /* DEBUG_KIND_NAMED, DEBUG_KIND_TAGGED.  */
       struct debug_named_type *knamed;
     } u;


@@ -271,12 +271,12 @@ struct debug_named_type
 
 /* A field in a struct or union.  */
 
 
 /* A field in a struct or union.  */
 

-struct debug_field
+struct debug_field_s

 {
   /* Name of the field.  */
   const char *name;
   /* Type of the field.  */
 {
   /* Name of the field.  */
   const char *name;
   /* Type of the field.  */

-  struct debug_type *type;
+  struct debug_type_s *type;

   /* Visibility of the field.  */
   enum debug_visibility visibility;
   /* Whether this is a static member.  */
   /* Visibility of the field.  */
   enum debug_visibility visibility;
   /* Whether this is a static member.  */


@@ -301,37 +301,37 @@ struct debug_field
 
 /* A base class for an object.  */
 
 
 /* A base class for an object.  */
 

-struct debug_baseclass
+struct debug_baseclass_s

 {
   /* Type of the base class.  */
 {
   /* Type of the base class.  */

-  struct debug_type *type;
+  struct debug_type_s *type;

   /* Bit position of the base class in the object.  */
   unsigned int bitpos;
   /* Whether the base class is virtual.  */
   /* Bit position of the base class in the object.  */
   unsigned int bitpos;
   /* Whether the base class is virtual.  */

-  bfd_boolean virtual;
+  bfd_boolean is_virtual;

   /* Visibility of the base class.  */
   enum debug_visibility visibility;
 };
 
 /* A method of an object.  */
 
   /* Visibility of the base class.  */
   enum debug_visibility visibility;
 };
 
 /* A method of an object.  */
 

-struct debug_method
+struct debug_method_s

 {
   /* The name of the method.  */
   const char *name;
   /* A NULL terminated array of different types of variants.  */
 {
   /* The name of the method.  */
   const char *name;
   /* A NULL terminated array of different types of variants.  */

-  struct debug_method_variant **variants;
+  struct debug_method_variant_s **variants;

 };
 
 /* The variants of a method function of an object.  These indicate
    which method to run.  */
 
 };
 
 /* The variants of a method function of an object.  These indicate
    which method to run.  */
 

-struct debug_method_variant
+struct debug_method_variant_s

 {
   /* The physical name of the function.  */
   const char *physname;
   /* The type of the function.  */
 {
   /* The physical name of the function.  */
   const char *physname;
   /* The type of the function.  */

-  struct debug_type *type;
+  struct debug_type_s *type;

   /* The visibility of the function.  */
   enum debug_visibility visibility;
   /* Whether the function is const.  */
   /* The visibility of the function.  */
   enum debug_visibility visibility;
   /* Whether the function is const.  */


@@ -343,7 +343,7 @@ struct debug_method_variant
   /* If voffset is VOFFSET_STATIC_METHOD, this is a static method.  */
 #define VOFFSET_STATIC_METHOD ((bfd_vma) -1)
   /* Context of a virtual method function.  */
   /* If voffset is VOFFSET_STATIC_METHOD, this is a static method.  */
 #define VOFFSET_STATIC_METHOD ((bfd_vma) -1)
   /* Context of a virtual method function.  */

-  struct debug_type *context;
+  struct debug_type_s *context;

 };
 
 /* A variable.  This is the information we keep for a variable object.
 };
 
 /* A variable.  This is the information we keep for a variable object.


@@ -500,9 +500,9 @@ struct debug_name
   union
     {
       /* DEBUG_OBJECT_TYPE.  */
   union
     {
       /* DEBUG_OBJECT_TYPE.  */

-      struct debug_type *type;
+      struct debug_type_s *type;

       /* DEBUG_OBJECT_TAG.  */
       /* DEBUG_OBJECT_TAG.  */

-      struct debug_type *tag;
+      struct debug_type_s *tag;

       /* DEBUG_OBJECT_VARIABLE.  */
       struct debug_variable *variable;
       /* DEBUG_OBJECT_FUNCTION.  */
       /* DEBUG_OBJECT_VARIABLE.  */
       struct debug_variable *variable;
       /* DEBUG_OBJECT_FUNCTION.  */


@@ -524,7 +524,7 @@ struct debug_class_id
   /* Next ID number.  */
   struct debug_class_id *next;
   /* The type with the ID.  */
   /* Next ID number.  */
   struct debug_class_id *next;
   /* The type with the ID.  */

-  struct debug_type *type;
+  struct debug_type_s *type;

   /* The tag; NULL if no tag.  */
   const char *tag;
 };
   /* The tag; NULL if no tag.  */
   const char *tag;
 };


@@ -537,8 +537,8 @@ struct debug_type_compare_list
   /* Next type on list.  */
   struct debug_type_compare_list *next;
   /* The types we are comparing.  */
   /* Next type on list.  */
   struct debug_type_compare_list *next;
   /* The types we are comparing.  */

-  struct debug_type *t1;
-  struct debug_type *t2;
+  struct debug_type_s *t1;
+  struct debug_type_s *t2;

 };
 
 /* During debug_get_real_type, a linked list of these structures is
 };
 
 /* During debug_get_real_type, a linked list of these structures is


@@ -549,53 +549,50 @@ struct debug_type_real_list
   /* Next type on list.  */
   struct debug_type_real_list *next;
   /* The type we are checking.  */
   /* Next type on list.  */
   struct debug_type_real_list *next;
   /* The type we are checking.  */

-  struct debug_type *t;
+  struct debug_type_s *t;

 };
 
 /* Local functions.  */
 
 };
 
 /* Local functions.  */
 

-static void debug_error
-  PARAMS ((const char *));
+static void debug_error (const char *);

 static struct debug_name *debug_add_to_namespace
 static struct debug_name *debug_add_to_namespace

-  PARAMS ((struct debug_handle *, struct debug_namespace **, const char *,
-          enum debug_object_kind, enum debug_object_linkage));
+  (struct debug_handle *, struct debug_namespace **, const char *,
+   enum debug_object_kind, enum debug_object_linkage);

 static struct debug_name *debug_add_to_current_namespace
 static struct debug_name *debug_add_to_current_namespace

-  PARAMS ((struct debug_handle *, const char *, enum debug_object_kind,
-          enum debug_object_linkage));
-static struct debug_type *debug_make_type
-  PARAMS ((struct debug_handle *, enum debug_type_kind, unsigned int));
-static struct debug_type *debug_get_real_type
-  PARAMS ((PTR, debug_type, struct debug_type_real_list *));
+  (struct debug_handle *, const char *, enum debug_object_kind,
+   enum debug_object_linkage);
+static struct debug_type_s *debug_make_type
+  (struct debug_handle *, enum debug_type_kind, unsigned int);
+static struct debug_type_s *debug_get_real_type
+  (void *, debug_type, struct debug_type_real_list *);

 static bfd_boolean debug_write_name
 static bfd_boolean debug_write_name

-  PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
-          struct debug_name *));
+  (struct debug_handle *, const struct debug_write_fns *, void *,
+   struct debug_name *);

 static bfd_boolean debug_write_type
 static bfd_boolean debug_write_type

-  PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
-          struct debug_type *, struct debug_name *));
+  (struct debug_handle *, const struct debug_write_fns *, void *,
+   struct debug_type_s *, struct debug_name *);

 static bfd_boolean debug_write_class_type
 static bfd_boolean debug_write_class_type

-  PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
-          struct debug_type *, const char *));
+  (struct debug_handle *, const struct debug_write_fns *, void *,
+   struct debug_type_s *, const char *);

 static bfd_boolean debug_write_function
 static bfd_boolean debug_write_function

-  PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
-          const char *, enum debug_object_linkage, struct debug_function *));
+  (struct debug_handle *, const struct debug_write_fns *, void *,
+   const char *, enum debug_object_linkage, struct debug_function *);

 static bfd_boolean debug_write_block
 static bfd_boolean debug_write_block

-  PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
-          struct debug_block *));
+  (struct debug_handle *, const struct debug_write_fns *, void *,
+   struct debug_block *);

 static bfd_boolean debug_write_linenos
 static bfd_boolean debug_write_linenos

-  PARAMS ((struct debug_handle *, const struct debug_write_fns *, PTR,
-          bfd_vma));
+  (struct debug_handle *, const struct debug_write_fns *, void *, bfd_vma);

 static bfd_boolean debug_set_class_id
 static bfd_boolean debug_set_class_id

-  PARAMS ((struct debug_handle *, const char *, struct debug_type *));
+  (struct debug_handle *, const char *, struct debug_type_s *);

 static bfd_boolean debug_type_samep
 static bfd_boolean debug_type_samep

-  PARAMS ((struct debug_handle *, struct debug_type *, struct debug_type *));
+  (struct debug_handle *, struct debug_type_s *, struct debug_type_s *);

 static bfd_boolean debug_class_type_samep
 static bfd_boolean debug_class_type_samep

-  PARAMS ((struct debug_handle *, struct debug_type *, struct debug_type *));
+  (struct debug_handle *, struct debug_type_s *, struct debug_type_s *);

 \f
 /* Issue an error message.  */
 
 static void
 \f
 /* Issue an error message.  */
 
 static void

-debug_error (message)
-     const char *message;
+debug_error (const char *message)

 {
   fprintf (stderr, "%s\n", message);
 }
 {
   fprintf (stderr, "%s\n", message);
 }


@@ -603,12 +600,10 @@ debug_error (message)
 /* Add an object to a namespace.  */
 
 static struct debug_name *
 /* Add an object to a namespace.  */
 
 static struct debug_name *

-debug_add_to_namespace (info, nsp, name, kind, linkage)
-     struct debug_handle *info ATTRIBUTE_UNUSED;
-     struct debug_namespace **nsp;
-     const char *name;
-     enum debug_object_kind kind;
-     enum debug_object_linkage linkage;
+debug_add_to_namespace (struct debug_handle *info ATTRIBUTE_UNUSED,
+                       struct debug_namespace **nsp, const char *name,
+                       enum debug_object_kind kind,
+                       enum debug_object_linkage linkage)

 {
   struct debug_name *n;
   struct debug_namespace *ns;
 {
   struct debug_name *n;
   struct debug_namespace *ns;


@@ -640,11 +635,9 @@ debug_add_to_namespace (info, nsp, name, kind, linkage)
 /* Add an object to the current namespace.  */
 
 static struct debug_name *
 /* Add an object to the current namespace.  */
 
 static struct debug_name *

-debug_add_to_current_namespace (info, name, kind, linkage)
-     struct debug_handle *info;
-     const char *name;
-     enum debug_object_kind kind;
-     enum debug_object_linkage linkage;
+debug_add_to_current_namespace (struct debug_handle *info, const char *name,
+                               enum debug_object_kind kind,
+                               enum debug_object_linkage linkage)

 {
   struct debug_namespace **nsp;
 
 {
   struct debug_namespace **nsp;
 


@@ -665,23 +658,21 @@ debug_add_to_current_namespace (info, name, kind, linkage)
 \f
 /* Return a handle for debugging information.  */
 
 \f
 /* Return a handle for debugging information.  */
 

-PTR
-debug_init ()
+void *
+debug_init (void)

 {
   struct debug_handle *ret;
 
   ret = (struct debug_handle *) xmalloc (sizeof *ret);
   memset (ret, 0, sizeof *ret);
 {
   struct debug_handle *ret;
 
   ret = (struct debug_handle *) xmalloc (sizeof *ret);
   memset (ret, 0, sizeof *ret);

-  return (PTR) ret;
+  return (void *) ret;

 }
 
 /* Set the source filename.  This implicitly starts a new compilation
    unit.  */
 
 bfd_boolean
 }
 
 /* Set the source filename.  This implicitly starts a new compilation
    unit.  */
 
 bfd_boolean

-debug_set_filename (handle, name)
-     PTR handle;
-     const char *name;
+debug_set_filename (void *handle, const char *name)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_file *nfile;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_file *nfile;


@@ -722,9 +713,7 @@ debug_set_filename (handle, name)
    include files in a single compilation unit.  */
 
 bfd_boolean
    include files in a single compilation unit.  */
 
 bfd_boolean

-debug_start_source (handle, name)
-     PTR handle;
-     const char *name;
+debug_start_source (void *handle, const char *name)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_file *f, **pf;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_file *f, **pf;


@@ -740,9 +729,7 @@ debug_start_source (handle, name)
 
   for (f = info->current_unit->files; f != NULL; f = f->next)
     {
 
   for (f = info->current_unit->files; f != NULL; f = f->next)
     {

-      if (f->filename[0] == name[0]
-         && f->filename[1] == name[1]
-         && strcmp (f->filename, name) == 0)
+      if (filename_cmp (f->filename, name) == 0)

        {
          info->current_file = f;
          return TRUE;
        {
          info->current_file = f;
          return TRUE;


@@ -774,12 +761,9 @@ debug_start_source (handle, name)
    functions.  */
 
 bfd_boolean
    functions.  */
 
 bfd_boolean

-debug_record_function (handle, name, return_type, global, addr)
-     PTR handle;
-     const char *name;
-     debug_type return_type;
-     bfd_boolean global;
-     bfd_vma addr;
+debug_record_function (void *handle, const char *name,
+                      debug_type return_type, bfd_boolean global,
+                      bfd_vma addr)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_function *f;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_function *f;


@@ -833,12 +817,8 @@ debug_record_function (handle, name, return_type, global, addr)
 /* Record a parameter for the current function.  */
 
 bfd_boolean
 /* Record a parameter for the current function.  */
 
 bfd_boolean

-debug_record_parameter (handle, name, type, kind, val)
-     PTR handle;
-     const char *name;
-     debug_type type;
-     enum debug_parm_kind kind;
-     bfd_vma val;
+debug_record_parameter (void *handle, const char *name, debug_type type,
+                       enum debug_parm_kind kind, bfd_vma val)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_parameter *p, **pp;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_parameter *p, **pp;


@@ -873,9 +853,7 @@ debug_record_parameter (handle, name, type, kind, val)
 /* End a function.  FIXME: This should handle function nesting.  */
 
 bfd_boolean
 /* End a function.  FIXME: This should handle function nesting.  */
 
 bfd_boolean

-debug_end_function (handle, addr)
-     PTR handle;
-     bfd_vma addr;
+debug_end_function (void *handle, bfd_vma addr)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 
 {
   struct debug_handle *info = (struct debug_handle *) handle;
 


@@ -907,9 +885,7 @@ debug_end_function (handle, addr)
    argument is the address at which this block starts.  */
 
 bfd_boolean
    argument is the address at which this block starts.  */
 
 bfd_boolean

-debug_start_block (handle, addr)
-     PTR handle;
-     bfd_vma addr;
+debug_start_block (void *handle, bfd_vma addr)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_block *b, **pb;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_block *b, **pb;


@@ -947,9 +923,7 @@ debug_start_block (handle, addr)
    ends.  */
 
 bfd_boolean
    ends.  */
 
 bfd_boolean

-debug_end_block (handle, addr)
-     PTR handle;
-     bfd_vma addr;
+debug_end_block (void *handle, bfd_vma addr)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_block *parent;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_block *parent;


@@ -979,10 +953,7 @@ debug_end_block (handle, addr)
    with a given address.  */
 
 bfd_boolean
    with a given address.  */
 
 bfd_boolean

-debug_record_line (handle, lineno, addr)
-     PTR handle;
-     unsigned long lineno;
-     bfd_vma addr;
+debug_record_line (void *handle, unsigned long lineno, bfd_vma addr)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_lineno *l;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_lineno *l;


@@ -1039,9 +1010,8 @@ debug_record_line (handle, lineno, addr)
    move in memory.  */
 
 bfd_boolean
    move in memory.  */
 
 bfd_boolean

-debug_start_common_block (handle, name)
-     PTR handle ATTRIBUTE_UNUSED;
-     const char *name ATTRIBUTE_UNUSED;
+debug_start_common_block (void *handle ATTRIBUTE_UNUSED,
+                         const char *name ATTRIBUTE_UNUSED)

 {
   /* FIXME */
   debug_error (_("debug_start_common_block: not implemented"));
 {
   /* FIXME */
   debug_error (_("debug_start_common_block: not implemented"));


@@ -1051,9 +1021,8 @@ debug_start_common_block (handle, name)
 /* End a named common block.  */
 
 bfd_boolean
 /* End a named common block.  */
 
 bfd_boolean

-debug_end_common_block (handle, name)
-     PTR handle ATTRIBUTE_UNUSED;
-     const char *name ATTRIBUTE_UNUSED;
+debug_end_common_block (void *handle ATTRIBUTE_UNUSED,
+                       const char *name ATTRIBUTE_UNUSED)

 {
   /* FIXME */
   debug_error (_("debug_end_common_block: not implemented"));
 {
   /* FIXME */
   debug_error (_("debug_end_common_block: not implemented"));


@@ -1063,10 +1032,7 @@ debug_end_common_block (handle, name)
 /* Record a named integer constant.  */
 
 bfd_boolean
 /* Record a named integer constant.  */
 
 bfd_boolean

-debug_record_int_const (handle, name, val)
-     PTR handle;
-     const char *name;
-     bfd_vma val;
+debug_record_int_const (void *handle, const char *name, bfd_vma val)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;


@@ -1087,10 +1053,7 @@ debug_record_int_const (handle, name, val)
 /* Record a named floating point constant.  */
 
 bfd_boolean
 /* Record a named floating point constant.  */
 
 bfd_boolean

-debug_record_float_const (handle, name, val)
-     PTR handle;
-     const char *name;
-     double val;
+debug_record_float_const (void *handle, const char *name, double val)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;


@@ -1111,11 +1074,8 @@ debug_record_float_const (handle, name, val)
 /* Record a typed constant with an integral value.  */
 
 bfd_boolean
 /* Record a typed constant with an integral value.  */
 
 bfd_boolean

-debug_record_typed_const (handle, name, type, val)
-     PTR handle;
-     const char *name;
-     debug_type type;
-     bfd_vma val;
+debug_record_typed_const (void *handle, const char *name, debug_type type,
+                         bfd_vma val)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_name *n;


@@ -1143,11 +1103,10 @@ debug_record_typed_const (handle, name, type, val)
 /* Record a label.  */
 
 bfd_boolean
 /* Record a label.  */
 
 bfd_boolean

-debug_record_label (handle, name, type, addr)
-     PTR handle ATTRIBUTE_UNUSED;
-     const char *name ATTRIBUTE_UNUSED;
-     debug_type type ATTRIBUTE_UNUSED;
-     bfd_vma addr ATTRIBUTE_UNUSED;
+debug_record_label (void *handle ATTRIBUTE_UNUSED,
+                   const char *name ATTRIBUTE_UNUSED,
+                   debug_type type ATTRIBUTE_UNUSED,
+                   bfd_vma addr ATTRIBUTE_UNUSED)

 {
   /* FIXME.  */
   debug_error (_("debug_record_label: not implemented"));
 {
   /* FIXME.  */
   debug_error (_("debug_record_label: not implemented"));


@@ -1157,12 +1116,8 @@ debug_record_label (handle, name, type, addr)
 /* Record a variable.  */
 
 bfd_boolean
 /* Record a variable.  */
 
 bfd_boolean

-debug_record_variable (handle, name, type, kind, val)
-     PTR handle;
-     const char *name;
-     debug_type type;
-     enum debug_var_kind kind;
-     bfd_vma val;
+debug_record_variable (void *handle, const char *name, debug_type type,
+                      enum debug_var_kind kind, bfd_vma val)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_namespace **nsp;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_namespace **nsp;


@@ -1215,15 +1170,13 @@ debug_record_variable (handle, name, type, kind, val)
 
 /* Make a type with a given kind and size.  */
 
 
 /* Make a type with a given kind and size.  */
 

-static struct debug_type *
-debug_make_type (info, kind, size)
-     struct debug_handle *info ATTRIBUTE_UNUSED;
-     enum debug_type_kind kind;
-     unsigned int size;
+static struct debug_type_s *
+debug_make_type (struct debug_handle *info ATTRIBUTE_UNUSED,
+                enum debug_type_kind kind, unsigned int size)

 {
 {

-  struct debug_type *t;
+  struct debug_type_s *t;

 
 

-  t = (struct debug_type *) xmalloc (sizeof *t);
+  t = (struct debug_type_s *) xmalloc (sizeof *t);

   memset (t, 0, sizeof *t);
 
   t->kind = kind;
   memset (t, 0, sizeof *t);
 
   t->kind = kind;


@@ -1236,13 +1189,10 @@ debug_make_type (info, kind, size)
    which is referenced before it is defined.  */
 
 debug_type
    which is referenced before it is defined.  */
 
 debug_type

-debug_make_indirect_type (handle, slot, tag)
-     PTR handle;
-     debug_type *slot;
-     const char *tag;
+debug_make_indirect_type (void *handle, debug_type *slot, const char *tag)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_indirect_type *i;
 
   t = debug_make_type (info, DEBUG_KIND_INDIRECT, 0);
   struct debug_indirect_type *i;
 
   t = debug_make_type (info, DEBUG_KIND_INDIRECT, 0);


@@ -1263,8 +1213,7 @@ debug_make_indirect_type (handle, slot, tag)
 /* Make a void type.  There is only one of these.  */
 
 debug_type
 /* Make a void type.  There is only one of these.  */
 
 debug_type

-debug_make_void_type (handle)
-     PTR handle;
+debug_make_void_type (void *handle)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 
 {
   struct debug_handle *info = (struct debug_handle *) handle;
 


@@ -1275,13 +1224,10 @@ debug_make_void_type (handle)
    if the integer is unsigned.  */
 
 debug_type
    if the integer is unsigned.  */
 
 debug_type

-debug_make_int_type (handle, size, unsignedp)
-     PTR handle;
-     unsigned int size;
-     bfd_boolean unsignedp;
+debug_make_int_type (void *handle, unsigned int size, bfd_boolean unsignedp)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

 
   t = debug_make_type (info, DEBUG_KIND_INT, size);
   if (t == NULL)
 
   t = debug_make_type (info, DEBUG_KIND_INT, size);
   if (t == NULL)


@@ -1297,9 +1243,7 @@ debug_make_int_type (handle, size, unsignedp)
    the format.  */
 
 debug_type
    the format.  */
 
 debug_type

-debug_make_float_type (handle, size)
-     PTR handle;
-     unsigned int size;
+debug_make_float_type (void *handle, unsigned int size)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 
 {
   struct debug_handle *info = (struct debug_handle *) handle;
 


@@ -1309,9 +1253,7 @@ debug_make_float_type (handle, size)
 /* Make a boolean type of a given size.  */
 
 debug_type
 /* Make a boolean type of a given size.  */
 
 debug_type

-debug_make_bool_type (handle, size)
-     PTR handle;
-     unsigned int size;
+debug_make_bool_type (void *handle, unsigned int size)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 
 {
   struct debug_handle *info = (struct debug_handle *) handle;
 


@@ -1321,9 +1263,7 @@ debug_make_bool_type (handle, size)
 /* Make a complex type of a given size.  */
 
 debug_type
 /* Make a complex type of a given size.  */
 
 debug_type

-debug_make_complex_type (handle, size)
-     PTR handle;
-     unsigned int size;
+debug_make_complex_type (void *handle, unsigned int size)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 
 {
   struct debug_handle *info = (struct debug_handle *) handle;
 


@@ -1335,14 +1275,11 @@ debug_make_complex_type (handle, size)
    The fourth argument is a NULL terminated array of fields.  */
 
 debug_type
    The fourth argument is a NULL terminated array of fields.  */
 
 debug_type

-debug_make_struct_type (handle, structp, size, fields)
-     PTR handle;
-     bfd_boolean structp;
-     bfd_vma size;
-     debug_field *fields;
+debug_make_struct_type (void *handle, bfd_boolean structp, bfd_vma size,
+                       debug_field *fields)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_class_type *c;
 
   t = debug_make_type (info,
   struct debug_class_type *c;
 
   t = debug_make_type (info,


@@ -1369,19 +1306,13 @@ debug_make_struct_type (handle, structp, size, fields)
    object has its own virtual function table.  */
 
 debug_type
    object has its own virtual function table.  */
 
 debug_type

-debug_make_object_type (handle, structp, size, fields, baseclasses,
-                       methods, vptrbase, ownvptr)
-     PTR handle;
-     bfd_boolean structp;
-     bfd_vma size;
-     debug_field *fields;
-     debug_baseclass *baseclasses;
-     debug_method *methods;
-     debug_type vptrbase;
-     bfd_boolean ownvptr;
+debug_make_object_type (void *handle, bfd_boolean structp, bfd_vma size,
+                       debug_field *fields, debug_baseclass *baseclasses,
+                       debug_method *methods, debug_type vptrbase,
+                       bfd_boolean ownvptr)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_class_type *c;
 
   t = debug_make_type (info,
   struct debug_class_type *c;
 
   t = debug_make_type (info,


@@ -1410,13 +1341,11 @@ debug_make_object_type (handle, structp, size, fields, baseclasses,
    array of strings, and an array of corresponding values.  */
 
 debug_type
    array of strings, and an array of corresponding values.  */
 
 debug_type

-debug_make_enum_type (handle, names, values)
-     PTR handle;
-     const char **names;
-     bfd_signed_vma *values;
+debug_make_enum_type (void *handle, const char **names,
+                     bfd_signed_vma *values)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_enum_type *e;
 
   t = debug_make_type (info, DEBUG_KIND_ENUM, 0);
   struct debug_enum_type *e;
 
   t = debug_make_type (info, DEBUG_KIND_ENUM, 0);


@@ -1437,12 +1366,10 @@ debug_make_enum_type (handle, names, values)
 /* Make a pointer to a given type.  */
 
 debug_type
 /* Make a pointer to a given type.  */
 
 debug_type

-debug_make_pointer_type (handle, type)
-     PTR handle;
-     debug_type type;
+debug_make_pointer_type (void *handle, debug_type type)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

 
   if (type == NULL)
     return DEBUG_TYPE_NULL;
 
   if (type == NULL)
     return DEBUG_TYPE_NULL;


@@ -1465,14 +1392,11 @@ debug_make_pointer_type (handle, type)
    to record the parameter types.  */
 
 debug_type
    to record the parameter types.  */
 
 debug_type

-debug_make_function_type (handle, type, arg_types, varargs)
-     PTR handle;
-     debug_type type;
-     debug_type *arg_types;
-     bfd_boolean varargs;
+debug_make_function_type (void *handle, debug_type type,
+                         debug_type *arg_types, bfd_boolean varargs)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_function_type *f;
 
   if (type == NULL)
   struct debug_function_type *f;
 
   if (type == NULL)


@@ -1497,12 +1421,10 @@ debug_make_function_type (handle, type, arg_types, varargs)
 /* Make a reference to a given type.  */
 
 debug_type
 /* Make a reference to a given type.  */
 
 debug_type

-debug_make_reference_type (handle, type)
-     PTR handle;
-     debug_type type;
+debug_make_reference_type (void *handle, debug_type type)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

 
   if (type == NULL)
     return DEBUG_TYPE_NULL;
 
   if (type == NULL)
     return DEBUG_TYPE_NULL;


@@ -1519,14 +1441,11 @@ debug_make_reference_type (handle, type)
 /* Make a range of a given type from a lower to an upper bound.  */
 
 debug_type
 /* Make a range of a given type from a lower to an upper bound.  */
 
 debug_type

-debug_make_range_type (handle, type, lower, upper)
-     PTR handle;
-     debug_type type;
-     bfd_signed_vma lower;
-     bfd_signed_vma upper;
+debug_make_range_type (void *handle, debug_type type, bfd_signed_vma lower,
+                      bfd_signed_vma upper)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_range_type *r;
 
   if (type == NULL)
   struct debug_range_type *r;
 
   if (type == NULL)


@@ -1555,17 +1474,12 @@ debug_make_range_type (handle, type, lower, upper)
    actually a string, as in C.  */
 
 debug_type
    actually a string, as in C.  */
 
 debug_type

-debug_make_array_type (handle, element_type, range_type, lower, upper,
-                      stringp)
-     PTR handle;
-     debug_type element_type;
-     debug_type range_type;
-     bfd_signed_vma lower;
-     bfd_signed_vma upper;
-     bfd_boolean stringp;
+debug_make_array_type (void *handle, debug_type element_type,
+                      debug_type range_type, bfd_signed_vma lower,
+                      bfd_signed_vma upper, bfd_boolean stringp)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_array_type *a;
 
   if (element_type == NULL || range_type == NULL)
   struct debug_array_type *a;
 
   if (element_type == NULL || range_type == NULL)


@@ -1594,13 +1508,10 @@ debug_make_array_type (handle, element_type, range_type, lower, upper,
    CHILL.  */
 
 debug_type
    CHILL.  */
 
 debug_type

-debug_make_set_type (handle, type, bitstringp)
-     PTR handle;
-     debug_type type;
-     bfd_boolean bitstringp;
+debug_make_set_type (void *handle, debug_type type, bfd_boolean bitstringp)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_set_type *s;
 
   if (type == NULL)
   struct debug_set_type *s;
 
   if (type == NULL)


@@ -1627,13 +1538,11 @@ debug_make_set_type (handle, type, bitstringp)
    to.  */
 
 debug_type
    to.  */
 
 debug_type

-debug_make_offset_type (handle, base_type, target_type)
-     PTR handle;
-     debug_type base_type;
-     debug_type target_type;
+debug_make_offset_type (void *handle, debug_type base_type,
+                       debug_type target_type)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_offset_type *o;
 
   if (base_type == NULL || target_type == NULL)
   struct debug_offset_type *o;
 
   if (base_type == NULL || target_type == NULL)


@@ -1659,15 +1568,12 @@ debug_make_offset_type (handle, base_type, target_type)
    argument is a NULL terminated array of argument types.  */
 
 debug_type
    argument is a NULL terminated array of argument types.  */
 
 debug_type

-debug_make_method_type (handle, return_type, domain_type, arg_types, varargs)
-     PTR handle;
-     debug_type return_type;
-     debug_type domain_type;
-     debug_type *arg_types;
-     bfd_boolean varargs;
+debug_make_method_type (void *handle, debug_type return_type,
+                       debug_type domain_type, debug_type *arg_types,
+                       bfd_boolean varargs)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_method_type *m;
 
   if (return_type == NULL)
   struct debug_method_type *m;
 
   if (return_type == NULL)


@@ -1693,12 +1599,10 @@ debug_make_method_type (handle, return_type, domain_type, arg_types, varargs)
 /* Make a const qualified version of a given type.  */
 
 debug_type
 /* Make a const qualified version of a given type.  */
 
 debug_type

-debug_make_const_type (handle, type)
-     PTR handle;
-     debug_type type;
+debug_make_const_type (void *handle, debug_type type)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

 
   if (type == NULL)
     return DEBUG_TYPE_NULL;
 
   if (type == NULL)
     return DEBUG_TYPE_NULL;


@@ -1715,12 +1619,10 @@ debug_make_const_type (handle, type)
 /* Make a volatile qualified version of a given type.  */
 
 debug_type
 /* Make a volatile qualified version of a given type.  */
 
 debug_type

-debug_make_volatile_type (handle, type)
-     PTR handle;
-     debug_type type;
+debug_make_volatile_type (void *handle, debug_type type)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

 
   if (type == NULL)
     return DEBUG_TYPE_NULL;
 
   if (type == NULL)
     return DEBUG_TYPE_NULL;


@@ -1738,13 +1640,11 @@ debug_make_volatile_type (handle, type)
    been mentioned, but not defined.  */
 
 debug_type
    been mentioned, but not defined.  */
 
 debug_type

-debug_make_undefined_tagged_type (handle, name, kind)
-     PTR handle;
-     const char *name;
-     enum debug_type_kind kind;
+debug_make_undefined_tagged_type (void *handle, const char *name,
+                                 enum debug_type_kind kind)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

 
   if (name == NULL)
     return DEBUG_TYPE_NULL;
 
   if (name == NULL)
     return DEBUG_TYPE_NULL;


@@ -1777,21 +1677,18 @@ debug_make_undefined_tagged_type (handle, name, kind)
    argument is the visibility of the base class.  */
 
 debug_baseclass
    argument is the visibility of the base class.  */
 
 debug_baseclass

-debug_make_baseclass (handle, type, bitpos, virtual, visibility)
-     PTR handle ATTRIBUTE_UNUSED;
-     debug_type type;
-     bfd_vma bitpos;
-     bfd_boolean virtual;
-     enum debug_visibility visibility;
+debug_make_baseclass (void *handle ATTRIBUTE_UNUSED, debug_type type,
+                     bfd_vma bitpos, bfd_boolean is_virtual,
+                     enum debug_visibility visibility)

 {
 {

-  struct debug_baseclass *b;
+  struct debug_baseclass_s *b;

 
 

-  b = (struct debug_baseclass *) xmalloc (sizeof *b);
+  b = (struct debug_baseclass_s *) xmalloc (sizeof *b);

   memset (b, 0, sizeof *b);
 
   b->type = type;
   b->bitpos = bitpos;
   memset (b, 0, sizeof *b);
 
   b->type = type;
   b->bitpos = bitpos;

-  b->virtual = virtual;
+  b->is_virtual = is_virtual;

   b->visibility = visibility;
 
   return b;
   b->visibility = visibility;
 
   return b;


@@ -1804,17 +1701,13 @@ debug_make_baseclass (handle, type, bitpos, virtual, visibility)
    of the field.  */
 
 debug_field
    of the field.  */
 
 debug_field

-debug_make_field (handle, name, type, bitpos, bitsize, visibility)
-     PTR handle ATTRIBUTE_UNUSED;
-     const char *name;
-     debug_type type;
-     bfd_vma bitpos;
-     bfd_vma bitsize;
-     enum debug_visibility visibility;
+debug_make_field (void *handle ATTRIBUTE_UNUSED, const char *name,
+                 debug_type type, bfd_vma bitpos, bfd_vma bitsize,
+                 enum debug_visibility visibility)

 {
 {

-  struct debug_field *f;
+  struct debug_field_s *f;

 
 

-  f = (struct debug_field *) xmalloc (sizeof *f);
+  f = (struct debug_field_s *) xmalloc (sizeof *f);

   memset (f, 0, sizeof *f);
 
   f->name = name;
   memset (f, 0, sizeof *f);
 
   f->name = name;


@@ -1834,16 +1727,13 @@ debug_make_field (handle, name, type, bitpos, bitsize, visibility)
    member.  */
 
 debug_field
    member.  */
 
 debug_field

-debug_make_static_member (handle, name, type, physname, visibility)
-     PTR handle ATTRIBUTE_UNUSED;
-     const char *name;
-     debug_type type;
-     const char *physname;
-     enum debug_visibility visibility;
+debug_make_static_member (void *handle ATTRIBUTE_UNUSED, const char *name,
+                         debug_type type, const char *physname,
+                         enum debug_visibility visibility)

 {
 {

-  struct debug_field *f;
+  struct debug_field_s *f;

 
 

-  f = (struct debug_field *) xmalloc (sizeof *f);
+  f = (struct debug_field_s *) xmalloc (sizeof *f);

   memset (f, 0, sizeof *f);
 
   f->name = name;
   memset (f, 0, sizeof *f);
 
   f->name = name;


@@ -1859,14 +1749,12 @@ debug_make_static_member (handle, name, type, physname, visibility)
    argument is a NULL terminated array of method variants.  */
 
 debug_method
    argument is a NULL terminated array of method variants.  */
 
 debug_method

-debug_make_method (handle, name, variants)
-     PTR handle ATTRIBUTE_UNUSED;
-     const char *name;
-     debug_method_variant *variants;
+debug_make_method (void *handle ATTRIBUTE_UNUSED, const char *name,
+                  debug_method_variant *variants)

 {
 {

-  struct debug_method *m;
+  struct debug_method_s *m;

 
 

-  m = (struct debug_method *) xmalloc (sizeof *m);
+  m = (struct debug_method_s *) xmalloc (sizeof *m);

   memset (m, 0, sizeof *m);
 
   m->name = name;
   memset (m, 0, sizeof *m);
 
   m->name = name;


@@ -1885,20 +1773,15 @@ debug_make_method (handle, name, variants)
    necessary?  Could we just use debug_make_const_type?  */
 
 debug_method_variant
    necessary?  Could we just use debug_make_const_type?  */
 
 debug_method_variant

-debug_make_method_variant (handle, physname, type, visibility, constp,
-                          volatilep, voffset, context)
-     PTR handle ATTRIBUTE_UNUSED;
-     const char *physname;
-     debug_type type;
-     enum debug_visibility visibility;
-     bfd_boolean constp;
-     bfd_boolean volatilep;
-     bfd_vma voffset;
-     debug_type context;
-{
-  struct debug_method_variant *m;
-
-  m = (struct debug_method_variant *) xmalloc (sizeof *m);
+debug_make_method_variant (void *handle ATTRIBUTE_UNUSED,
+                          const char *physname, debug_type type,
+                          enum debug_visibility visibility,
+                          bfd_boolean constp, bfd_boolean volatilep,
+                          bfd_vma voffset, debug_type context)
+{
+  struct debug_method_variant_s *m;
+
+  m = (struct debug_method_variant_s *) xmalloc (sizeof *m);

   memset (m, 0, sizeof *m);
 
   m->physname = physname;
   memset (m, 0, sizeof *m);
 
   m->physname = physname;


@@ -1917,18 +1800,14 @@ debug_make_method_variant (handle, physname, type, visibility, constp,
    since a static method can not also be virtual.  */
 
 debug_method_variant
    since a static method can not also be virtual.  */
 
 debug_method_variant

-debug_make_static_method_variant (handle, physname, type, visibility,
-                                 constp, volatilep)
-     PTR handle ATTRIBUTE_UNUSED;
-     const char *physname;
-     debug_type type;
-     enum debug_visibility visibility;
-     bfd_boolean constp;
-     bfd_boolean volatilep;
-{
-  struct debug_method_variant *m;
-
-  m = (struct debug_method_variant *) xmalloc (sizeof *m);
+debug_make_static_method_variant (void *handle ATTRIBUTE_UNUSED,
+                                 const char *physname, debug_type type,
+                                 enum debug_visibility visibility,
+                                 bfd_boolean constp, bfd_boolean volatilep)
+{
+  struct debug_method_variant_s *m;
+
+  m = (struct debug_method_variant_s *) xmalloc (sizeof *m);

   memset (m, 0, sizeof *m);
 
   m->physname = physname;
   memset (m, 0, sizeof *m);
 
   m->physname = physname;


@@ -1944,13 +1823,10 @@ debug_make_static_method_variant (handle, physname, type, visibility,
 /* Name a type.  */
 
 debug_type
 /* Name a type.  */
 
 debug_type

-debug_name_type (handle, name, type)
-     PTR handle;
-     const char *name;
-     debug_type type;
+debug_name_type (void *handle, const char *name, debug_type type)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_named_type *n;
   struct debug_name *nm;
 
   struct debug_named_type *n;
   struct debug_name *nm;
 


@@ -1993,13 +1869,10 @@ debug_name_type (handle, name, type)
 /* Tag a type.  */
 
 debug_type
 /* Tag a type.  */
 
 debug_type

-debug_tag_type (handle, name, type)
-     PTR handle;
-     const char *name;
-     debug_type type;
+debug_tag_type (void *handle, const char *name, debug_type type)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
 {
   struct debug_handle *info = (struct debug_handle *) handle;

-  struct debug_type *t;
+  struct debug_type_s *t;

   struct debug_named_type *n;
   struct debug_name *nm;
 
   struct debug_named_type *n;
   struct debug_name *nm;
 


@@ -2049,10 +1922,8 @@ debug_tag_type (handle, name, type)
 /* Record the size of a given type.  */
 
 bfd_boolean
 /* Record the size of a given type.  */
 
 bfd_boolean

-debug_record_type_size (handle, type, size)
-     PTR handle ATTRIBUTE_UNUSED;
-     debug_type type;
-     unsigned int size;
+debug_record_type_size (void *handle ATTRIBUTE_UNUSED, debug_type type,
+                       unsigned int size)

 {
   if (type->size != 0 && type->size != size)
     fprintf (stderr, _("Warning: changing type size from %d to %d\n"),
 {
   if (type->size != 0 && type->size != size)
     fprintf (stderr, _("Warning: changing type size from %d to %d\n"),


@@ -2066,9 +1937,7 @@ debug_record_type_size (handle, type, size)
 /* Find a named type.  */
 
 debug_type
 /* Find a named type.  */
 
 debug_type

-debug_find_named_type (handle, name)
-     PTR handle;
-     const char *name;
+debug_find_named_type (void *handle, const char *name)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_block *b;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_block *b;


@@ -2121,10 +1990,8 @@ debug_find_named_type (handle, name)
 /* Find a tagged type.  */
 
 debug_type
 /* Find a tagged type.  */
 
 debug_type

-debug_find_tagged_type (handle, name, kind)
-     PTR handle;
-     const char *name;
-     enum debug_type_kind kind;
+debug_find_tagged_type (void *handle, const char *name,
+                       enum debug_type_kind kind)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_unit *u;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_unit *u;


@@ -2161,11 +2028,9 @@ debug_find_tagged_type (handle, name, kind)
 /* Get a base type.  We build a linked list on the stack to avoid
    crashing if the type is defined circularly.  */
 
 /* Get a base type.  We build a linked list on the stack to avoid
    crashing if the type is defined circularly.  */
 

-static struct debug_type *
-debug_get_real_type (handle, type, list)
-     PTR handle;
-     debug_type type;
-     struct debug_type_real_list *list;
+static struct debug_type_s *
+debug_get_real_type (void *handle, debug_type type,
+                    struct debug_type_real_list *list)

 {
   struct debug_type_real_list *l;
   struct debug_type_real_list rl;
 {
   struct debug_type_real_list *l;
   struct debug_type_real_list rl;


@@ -2213,9 +2078,7 @@ debug_get_real_type (handle, type, list)
 /* Get the kind of a type.  */
 
 enum debug_type_kind
 /* Get the kind of a type.  */
 
 enum debug_type_kind

-debug_get_type_kind (handle, type)
-     PTR handle;
-     debug_type type;
+debug_get_type_kind (void *handle, debug_type type)

 {
   if (type == NULL)
     return DEBUG_KIND_ILLEGAL;
 {
   if (type == NULL)
     return DEBUG_KIND_ILLEGAL;


@@ -2228,9 +2091,7 @@ debug_get_type_kind (handle, type)
 /* Get the name of a type.  */
 
 const char *
 /* Get the name of a type.  */
 
 const char *

-debug_get_type_name (handle, type)
-     PTR handle;
-     debug_type type;
+debug_get_type_name (void *handle, debug_type type)

 {
   if (type->kind == DEBUG_KIND_INDIRECT)
     {
 {
   if (type->kind == DEBUG_KIND_INDIRECT)
     {


@@ -2247,9 +2108,7 @@ debug_get_type_name (handle, type)
 /* Get the size of a type.  */
 
 bfd_vma
 /* Get the size of a type.  */
 
 bfd_vma

-debug_get_type_size (handle, type)
-     PTR handle;
-     debug_type type;
+debug_get_type_size (void *handle, debug_type type)

 {
   if (type == NULL)
     return 0;
 {
   if (type == NULL)
     return 0;


@@ -2278,9 +2137,7 @@ debug_get_type_size (handle, type)
 /* Get the return type of a function or method type.  */
 
 debug_type
 /* Get the return type of a function or method type.  */
 
 debug_type

-debug_get_return_type (handle, type)
-     PTR handle;
-     debug_type type;
+debug_get_return_type (void *handle, debug_type type)

 {
   if (type == NULL)
     return DEBUG_TYPE_NULL;
 {
   if (type == NULL)
     return DEBUG_TYPE_NULL;


@@ -2305,10 +2162,8 @@ debug_get_return_type (handle, type)
    we don't currently store the parameter types of a function).  */
 
 const debug_type *
    we don't currently store the parameter types of a function).  */
 
 const debug_type *

-debug_get_parameter_types (handle, type, pvarargs)
-     PTR handle;
-     debug_type type;
-     bfd_boolean *pvarargs;
+debug_get_parameter_types (void *handle, debug_type type,
+                          bfd_boolean *pvarargs)

 {
   if (type == NULL)
     return NULL;
 {
   if (type == NULL)
     return NULL;


@@ -2334,9 +2189,7 @@ debug_get_parameter_types (handle, type, pvarargs)
 /* Get the target type of a type.  */
 
 debug_type
 /* Get the target type of a type.  */
 
 debug_type

-debug_get_target_type (handle, type)
-     PTR handle;
-     debug_type type;
+debug_get_target_type (void *handle, debug_type type)

 {
   if (type == NULL)
     return NULL;
 {
   if (type == NULL)
     return NULL;


@@ -2365,9 +2218,7 @@ debug_get_target_type (handle, type)
    class.  */
 
 const debug_field *
    class.  */
 
 const debug_field *

-debug_get_fields (handle, type)
-     PTR handle;
-     debug_type type;
+debug_get_fields (void *handle, debug_type type)

 {
   if (type == NULL)
     return NULL;
 {
   if (type == NULL)
     return NULL;


@@ -2392,9 +2243,7 @@ debug_get_fields (handle, type)
 /* Get the type of a field.  */
 
 debug_type
 /* Get the type of a field.  */
 
 debug_type

-debug_get_field_type (handle, field)
-     PTR handle ATTRIBUTE_UNUSED;
-     debug_field field;
+debug_get_field_type (void *handle ATTRIBUTE_UNUSED, debug_field field)

 {
   if (field == NULL)
     return NULL;
 {
   if (field == NULL)
     return NULL;


@@ -2404,9 +2253,7 @@ debug_get_field_type (handle, field)
 /* Get the name of a field.  */
 
 const char *
 /* Get the name of a field.  */
 
 const char *

-debug_get_field_name (handle, field)
-     PTR handle ATTRIBUTE_UNUSED;
-     debug_field field;
+debug_get_field_name (void *handle ATTRIBUTE_UNUSED, debug_field field)

 {
   if (field == NULL)
     return NULL;
 {
   if (field == NULL)
     return NULL;


@@ -2416,9 +2263,7 @@ debug_get_field_name (handle, field)
 /* Get the bit position of a field.  */
 
 bfd_vma
 /* Get the bit position of a field.  */
 
 bfd_vma

-debug_get_field_bitpos (handle, field)
-     PTR handle ATTRIBUTE_UNUSED;
-     debug_field field;
+debug_get_field_bitpos (void *handle ATTRIBUTE_UNUSED, debug_field field)

 {
   if (field == NULL || field->static_member)
     return (bfd_vma) -1;
 {
   if (field == NULL || field->static_member)
     return (bfd_vma) -1;


@@ -2428,9 +2273,7 @@ debug_get_field_bitpos (handle, field)
 /* Get the bit size of a field.  */
 
 bfd_vma
 /* Get the bit size of a field.  */
 
 bfd_vma

-debug_get_field_bitsize (handle, field)
-     PTR handle ATTRIBUTE_UNUSED;
-     debug_field field;
+debug_get_field_bitsize (void *handle ATTRIBUTE_UNUSED, debug_field field)

 {
   if (field == NULL || field->static_member)
     return (bfd_vma) -1;
 {
   if (field == NULL || field->static_member)
     return (bfd_vma) -1;


@@ -2440,9 +2283,7 @@ debug_get_field_bitsize (handle, field)
 /* Get the visibility of a field.  */
 
 enum debug_visibility
 /* Get the visibility of a field.  */
 
 enum debug_visibility

-debug_get_field_visibility (handle, field)
-     PTR handle ATTRIBUTE_UNUSED;
-     debug_field field;
+debug_get_field_visibility (void *handle ATTRIBUTE_UNUSED, debug_field field)

 {
   if (field == NULL)
     return DEBUG_VISIBILITY_IGNORE;
 {
   if (field == NULL)
     return DEBUG_VISIBILITY_IGNORE;


@@ -2452,9 +2293,7 @@ debug_get_field_visibility (handle, field)
 /* Get the physical name of a field.  */
 
 const char *
 /* Get the physical name of a field.  */
 
 const char *

-debug_get_field_physname (handle, field)
-     PTR handle ATTRIBUTE_UNUSED;
-     debug_field field;
+debug_get_field_physname (void *handle ATTRIBUTE_UNUSED, debug_field field)

 {
   if (field == NULL || ! field->static_member)
     return NULL;
 {
   if (field == NULL || ! field->static_member)
     return NULL;


@@ -2465,10 +2304,7 @@ debug_get_field_physname (handle, field)
    debugging information, and a set of function pointers to call.  */
 
 bfd_boolean
    debugging information, and a set of function pointers to call.  */
 
 bfd_boolean

-debug_write (handle, fns, fhandle)
-     PTR handle;
-     const struct debug_write_fns *fns;
-     PTR fhandle;
+debug_write (void *handle, const struct debug_write_fns *fns, void *fhandle)

 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_unit *u;
 {
   struct debug_handle *info = (struct debug_handle *) handle;
   struct debug_unit *u;


@@ -2527,11 +2363,9 @@ debug_write (handle, fns, fhandle)
 /* Write out an element in a namespace.  */
 
 static bfd_boolean
 /* Write out an element in a namespace.  */
 
 static bfd_boolean

-debug_write_name (info, fns, fhandle, n)
-     struct debug_handle *info;
-     const struct debug_write_fns *fns;
-     PTR fhandle;
-     struct debug_name *n;
+debug_write_name (struct debug_handle *info,
+                 const struct debug_write_fns *fns, void *fhandle,
+                 struct debug_name *n)

 {
   switch (n->kind)
     {
 {
   switch (n->kind)
     {


@@ -2577,12 +2411,9 @@ debug_write_name (info, fns, fhandle, n)
    points to this one.  */
 
 static bfd_boolean
    points to this one.  */
 
 static bfd_boolean

-debug_write_type (info, fns, fhandle, type, name)
-     struct debug_handle *info;
-     const struct debug_write_fns *fns;
-     PTR fhandle;
-     struct debug_type *type;
-     struct debug_name *name;
+debug_write_type (struct debug_handle *info,
+                 const struct debug_write_fns *fns, void *fhandle,
+                 struct debug_type_s *type, struct debug_name *name)

 {
   unsigned int i;
   int is;
 {
   unsigned int i;
   int is;


@@ -2601,10 +2432,10 @@ debug_write_type (info, fns, fhandle, type, name)
        return (*fns->typedef_type) (fhandle, type->u.knamed->name->name);
       else
        {
        return (*fns->typedef_type) (fhandle, type->u.knamed->name->name);
       else
        {

-         struct debug_type *real;
+         struct debug_type_s *real;

          unsigned int id;
 
          unsigned int id;
 

-         real = debug_get_real_type ((PTR) info, type, NULL);
+         real = debug_get_real_type ((void *) info, type, NULL);

          if (real == NULL)
            return (*fns->empty_type) (fhandle);
          id = 0;
          if (real == NULL)
            return (*fns->empty_type) (fhandle);
          id = 0;


@@ -2698,7 +2529,7 @@ debug_write_type (info, fns, fhandle, type, name)
        {
          for (i = 0; type->u.kclass->fields[i] != NULL; i++)
            {
        {
          for (i = 0; type->u.kclass->fields[i] != NULL; i++)
            {

-             struct debug_field *f;
+             struct debug_field_s *f;

 
              f = type->u.kclass->fields[i];
              if (! debug_write_type (info, fns, fhandle, f->type,
 
              f = type->u.kclass->fields[i];
              if (! debug_write_type (info, fns, fhandle, f->type,


@@ -2825,16 +2656,13 @@ debug_write_type (info, fns, fhandle, type, name)
 /* Write out a class type.  */
 
 static bfd_boolean
 /* Write out a class type.  */
 
 static bfd_boolean

-debug_write_class_type (info, fns, fhandle, type, tag)
-     struct debug_handle *info;
-     const struct debug_write_fns *fns;
-     PTR fhandle;
-     struct debug_type *type;
-     const char *tag;
+debug_write_class_type (struct debug_handle *info,
+                       const struct debug_write_fns *fns, void *fhandle,
+                       struct debug_type_s *type, const char *tag)

 {
   unsigned int i;
   unsigned int id;
 {
   unsigned int i;
   unsigned int id;

-  struct debug_type *vptrbase;
+  struct debug_type_s *vptrbase;

 
   if (type->u.kclass == NULL)
     {
 
   if (type->u.kclass == NULL)
     {


@@ -2883,7 +2711,7 @@ debug_write_class_type (info, fns, fhandle, type, tag)
        {
          for (i = 0; type->u.kclass->fields[i] != NULL; i++)
            {
        {
          for (i = 0; type->u.kclass->fields[i] != NULL; i++)
            {

-             struct debug_field *f;
+             struct debug_field_s *f;

 
              f = type->u.kclass->fields[i];
              if (! debug_write_type (info, fns, fhandle, f->type,
 
              f = type->u.kclass->fields[i];
              if (! debug_write_type (info, fns, fhandle, f->type,


@@ -2909,13 +2737,13 @@ debug_write_class_type (info, fns, fhandle, type, tag)
        {
          for (i = 0; type->u.kclass->baseclasses[i] != NULL; i++)
            {
        {
          for (i = 0; type->u.kclass->baseclasses[i] != NULL; i++)
            {

-             struct debug_baseclass *b;
+             struct debug_baseclass_s *b;

 
              b = type->u.kclass->baseclasses[i];
              if (! debug_write_type (info, fns, fhandle, b->type,
                                      (struct debug_name *) NULL))
                return FALSE;
 
              b = type->u.kclass->baseclasses[i];
              if (! debug_write_type (info, fns, fhandle, b->type,
                                      (struct debug_name *) NULL))
                return FALSE;

-             if (! (*fns->class_baseclass) (fhandle, b->bitpos, b->virtual,
+             if (! (*fns->class_baseclass) (fhandle, b->bitpos, b->is_virtual,

                                             b->visibility))
                return FALSE;
            }
                                             b->visibility))
                return FALSE;
            }


@@ -2925,7 +2753,7 @@ debug_write_class_type (info, fns, fhandle, type, tag)
        {
          for (i = 0; type->u.kclass->methods[i] != NULL; i++)
            {
        {
          for (i = 0; type->u.kclass->methods[i] != NULL; i++)
            {

-             struct debug_method *m;
+             struct debug_method_s *m;

              unsigned int j;
 
              m = type->u.kclass->methods[i];
              unsigned int j;
 
              m = type->u.kclass->methods[i];


@@ -2933,7 +2761,7 @@ debug_write_class_type (info, fns, fhandle, type, tag)
                return FALSE;
              for (j = 0; m->variants[j] != NULL; j++)
                {
                return FALSE;
              for (j = 0; m->variants[j] != NULL; j++)
                {

-                 struct debug_method_variant *v;
+                 struct debug_method_variant_s *v;

 
                  v = m->variants[j];
                  if (v->context != NULL)
 
                  v = m->variants[j];
                  if (v->context != NULL)


@@ -2977,13 +2805,10 @@ debug_write_class_type (info, fns, fhandle, type, tag)
 /* Write out information for a function.  */
 
 static bfd_boolean
 /* Write out information for a function.  */
 
 static bfd_boolean

-debug_write_function (info, fns, fhandle, name, linkage, function)
-     struct debug_handle *info;
-     const struct debug_write_fns *fns;
-     PTR fhandle;
-     const char *name;
-     enum debug_object_linkage linkage;
-     struct debug_function *function;
+debug_write_function (struct debug_handle *info,
+                     const struct debug_write_fns *fns, void *fhandle,
+                     const char *name, enum debug_object_linkage linkage,
+                     struct debug_function *function)

 {
   struct debug_parameter *p;
   struct debug_block *b;
 {
   struct debug_parameter *p;
   struct debug_block *b;


@@ -3019,11 +2844,9 @@ debug_write_function (info, fns, fhandle, name, linkage, function)
 /* Write out information for a block.  */
 
 static bfd_boolean
 /* Write out information for a block.  */
 
 static bfd_boolean

-debug_write_block (info, fns, fhandle, block)
-     struct debug_handle *info;
-     const struct debug_write_fns *fns;
-     PTR fhandle;
-     struct debug_block *block;
+debug_write_block (struct debug_handle *info,
+                  const struct debug_write_fns *fns, void *fhandle,
+                  struct debug_block *block)

 {
   struct debug_name *n;
   struct debug_block *b;
 {
   struct debug_name *n;
   struct debug_block *b;


@@ -3069,11 +2892,9 @@ debug_write_block (info, fns, fhandle, block)
 /* Write out line number information up to ADDRESS.  */
 
 static bfd_boolean
 /* Write out line number information up to ADDRESS.  */
 
 static bfd_boolean

-debug_write_linenos (info, fns, fhandle, address)
-     struct debug_handle *info;
-     const struct debug_write_fns *fns;
-     PTR fhandle;
-     bfd_vma address;
+debug_write_linenos (struct debug_handle *info,
+                    const struct debug_write_fns *fns, void *fhandle,
+                    bfd_vma address)

 {
   while (info->current_write_lineno != NULL)
     {
 {
   while (info->current_write_lineno != NULL)
     {


@@ -3111,10 +2932,8 @@ debug_write_linenos (info, fns, fhandle, address)
    same struct will be defined by multiple compilation units.  */
 
 static bfd_boolean
    same struct will be defined by multiple compilation units.  */
 
 static bfd_boolean

-debug_set_class_id (info, tag, type)
-     struct debug_handle *info;
-     const char *tag;
-     struct debug_type *type;
+debug_set_class_id (struct debug_handle *info, const char *tag,
+                   struct debug_type_s *type)

 {
   struct debug_class_type *c;
   struct debug_class_id *l;
 {
   struct debug_class_type *c;
   struct debug_class_id *l;


@@ -3175,10 +2994,8 @@ debug_set_class_id (info, tag, type)
    tags and the like.  */
 
 static bfd_boolean
    tags and the like.  */
 
 static bfd_boolean

-debug_type_samep (info, t1, t2)
-     struct debug_handle *info;
-     struct debug_type *t1;
-     struct debug_type *t2;
+debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
+                 struct debug_type_s *t2)

 {
   struct debug_type_compare_list *l;
   struct debug_type_compare_list top;
 {
   struct debug_type_compare_list *l;
   struct debug_type_compare_list top;


@@ -3314,7 +3131,7 @@ debug_type_samep (info, t1, t2)
        ret = TRUE;
       else
        {
        ret = TRUE;
       else
        {

-         struct debug_type **a1, **a2;
+         struct debug_type_s **a1, **a2;

 
          a1 = t1->u.kfunction->arg_types;
          a2 = t2->u.kfunction->arg_types;
 
          a1 = t1->u.kfunction->arg_types;
          a2 = t2->u.kfunction->arg_types;


@@ -3338,6 +3155,7 @@ debug_type_samep (info, t1, t2)
             && t1->u.krange->upper == t2->u.krange->upper
             && debug_type_samep (info, t1->u.krange->type,
                                  t2->u.krange->type));
             && t1->u.krange->upper == t2->u.krange->upper
             && debug_type_samep (info, t1->u.krange->type,
                                  t2->u.krange->type));

+      break;

 
     case DEBUG_KIND_ARRAY:
       ret = (t1->u.karray->lower == t2->u.karray->lower
 
     case DEBUG_KIND_ARRAY:
       ret = (t1->u.karray->lower == t2->u.karray->lower


@@ -3372,7 +3190,7 @@ debug_type_samep (info, t1, t2)
        ret = TRUE;
       else
        {
        ret = TRUE;
       else
        {

-         struct debug_type **a1, **a2;
+         struct debug_type_s **a1, **a2;

 
          a1 = t1->u.kmethod->arg_types;
          a2 = t2->u.kmethod->arg_types;
 
          a1 = t1->u.kmethod->arg_types;
          a2 = t2->u.kmethod->arg_types;


@@ -3412,10 +3230,8 @@ debug_type_samep (info, t1, t2)
    debug_type_samep.  */
 
 static bfd_boolean
    debug_type_samep.  */
 
 static bfd_boolean

-debug_class_type_samep (info, t1, t2)
-     struct debug_handle *info;
-     struct debug_type *t1;
-     struct debug_type *t2;
+debug_class_type_samep (struct debug_handle *info, struct debug_type_s *t1,
+                       struct debug_type_s *t2)

 {
   struct debug_class_type *c1, *c2;
 
 {
   struct debug_class_type *c1, *c2;
 


@@ -3430,13 +3246,13 @@ debug_class_type_samep (info, t1, t2)
 
   if (c1->fields != NULL)
     {
 
   if (c1->fields != NULL)
     {

-      struct debug_field **pf1, **pf2;
+      struct debug_field_s **pf1, **pf2;

 
       for (pf1 = c1->fields, pf2 = c2->fields;
           *pf1 != NULL && *pf2 != NULL;
           pf1++, pf2++)
        {
 
       for (pf1 = c1->fields, pf2 = c2->fields;
           *pf1 != NULL && *pf2 != NULL;
           pf1++, pf2++)
        {

-         struct debug_field *f1, *f2;
+         struct debug_field_s *f1, *f2;

 
          f1 = *pf1;
          f2 = *pf2;
 
          f1 = *pf1;
          f2 = *pf2;


@@ -3461,9 +3277,9 @@ debug_class_type_samep (info, t1, t2)
              typedefs and we really don't care.  */
          if (strcmp (f1->name, f2->name) != 0
              || ! debug_type_samep (info,
              typedefs and we really don't care.  */
          if (strcmp (f1->name, f2->name) != 0
              || ! debug_type_samep (info,

-                                    debug_get_real_type ((PTR) info,
+                                    debug_get_real_type ((void *) info,

                                                          f1->type, NULL),
                                                          f1->type, NULL),

-                                    debug_get_real_type ((PTR) info,
+                                    debug_get_real_type ((void *) info,

                                                          f2->type, NULL)))
            return FALSE;
        }
                                                          f2->type, NULL)))
            return FALSE;
        }


@@ -3479,18 +3295,18 @@ debug_class_type_samep (info, t1, t2)
 
   if (c1->baseclasses != NULL)
     {
 
   if (c1->baseclasses != NULL)
     {

-      struct debug_baseclass **pb1, **pb2;
+      struct debug_baseclass_s **pb1, **pb2;

 
       for (pb1 = c1->baseclasses, pb2 = c2->baseclasses;
           *pb1 != NULL && *pb2 != NULL;
           ++pb1, ++pb2)
        {
 
       for (pb1 = c1->baseclasses, pb2 = c2->baseclasses;
           *pb1 != NULL && *pb2 != NULL;
           ++pb1, ++pb2)
        {

-         struct debug_baseclass *b1, *b2;
+         struct debug_baseclass_s *b1, *b2;

 
          b1 = *pb1;
          b2 = *pb2;
          if (b1->bitpos != b2->bitpos
 
          b1 = *pb1;
          b2 = *pb2;
          if (b1->bitpos != b2->bitpos

-             || b1->virtual != b2->virtual
+             || b1->is_virtual != b2->is_virtual

              || b1->visibility != b2->visibility
              || ! debug_type_samep (info, b1->type, b2->type))
            return FALSE;
              || b1->visibility != b2->visibility
              || ! debug_type_samep (info, b1->type, b2->type))
            return FALSE;


@@ -3501,13 +3317,13 @@ debug_class_type_samep (info, t1, t2)
 
   if (c1->methods != NULL)
     {
 
   if (c1->methods != NULL)
     {

-      struct debug_method **pm1, **pm2;
+      struct debug_method_s **pm1, **pm2;

 
       for (pm1 = c1->methods, pm2 = c2->methods;
           *pm1 != NULL && *pm2 != NULL;
           ++pm1, ++pm2)
        {
 
       for (pm1 = c1->methods, pm2 = c2->methods;
           *pm1 != NULL && *pm2 != NULL;
           ++pm1, ++pm2)
        {

-         struct debug_method *m1, *m2;
+         struct debug_method_s *m1, *m2;

 
          m1 = *pm1;
          m2 = *pm2;
 
          m1 = *pm1;
          m2 = *pm2;


@@ -3517,13 +3333,13 @@ debug_class_type_samep (info, t1, t2)
            return FALSE;
          if (m1->variants == NULL)
            {
            return FALSE;
          if (m1->variants == NULL)
            {

-             struct debug_method_variant **pv1, **pv2;
+             struct debug_method_variant_s **pv1, **pv2;

 
              for (pv1 = m1->variants, pv2 = m2->variants;
                   *pv1 != NULL && *pv2 != NULL;
                   ++pv1, ++pv2)
                {
 
              for (pv1 = m1->variants, pv2 = m2->variants;
                   *pv1 != NULL && *pv2 != NULL;
                   ++pv1, ++pv2)
                {

-                 struct debug_method_variant *v1, *v2;
+                 struct debug_method_variant_s *v1, *v2;

 
                  v1 = *pv1;
                  v2 = *pv2;
 
                  v1 = *pv1;
                  v2 = *pv2;