2008-08-21 Sterling Augustine <sterling@tensilica.com>

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

diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index bd0e124bc0d09685957d7c0fc6c4e061f347779d..4f9841982b78e391a109dbf06bf3cc34a11699e1 100644 (file)
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -1,7 +1,9 @@
 /* Read a symbol table in ECOFF format (Third-Eye).
 /* Read a symbol table in ECOFF format (Third-Eye).

-   Copyright 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
-   1997, 1998, 1999, 2000, 2001, 2002, 2003
+
+   Copyright (C) 1986, 1987, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
+   1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007, 2008

    Free Software Foundation, Inc.
    Free Software Foundation, Inc.

+

    Original version contributed by Alessandro Forin (af@cs.cmu.edu) at
    CMU.  Major work by Per Bothner, John Gilmore and Ian Lance Taylor
    at Cygnus Support.
    Original version contributed by Alessandro Forin (af@cs.cmu.edu) at
    CMU.  Major work by Per Bothner, John Gilmore and Ian Lance Taylor
    at Cygnus Support.


@@ -10,7 +12,7 @@
 
    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
 
    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,


@@ -19,9 +21,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    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.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* This module provides the function mdebug_build_psymtabs.  It reads
    ECOFF debugging information into partial symbol tables.  The
 
 /* This module provides the function mdebug_build_psymtabs.  It reads
    ECOFF debugging information into partial symbol tables.  The


@@ -45,7 +45,6 @@
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"
 #include "symtab.h"
 #include "gdbtypes.h"
 #include "gdbcore.h"

-#include "symfile.h"

 #include "objfiles.h"
 #include "gdb_obstack.h"
 #include "buildsym.h"
 #include "objfiles.h"
 #include "gdb_obstack.h"
 #include "buildsym.h"


@@ -53,30 +52,9 @@
 #include "complaints.h"
 #include "demangle.h"
 #include "gdb_assert.h"
 #include "complaints.h"
 #include "demangle.h"
 #include "gdb_assert.h"

-
-/* These are needed if the tm.h file does not contain the necessary
-   mips specific definitions.  */
-
-#ifndef MIPS_EFI_SYMBOL_NAME
-#define MIPS_EFI_SYMBOL_NAME "__GDB_EFI_INFO__"
-extern void ecoff_relocate_efi (struct symbol *, CORE_ADDR);
-#include "coff/sym.h"
-#include "coff/symconst.h"
-typedef struct mips_extra_func_info
-  {
-    long numargs;
-    PDR pdr;
-  }
- *mips_extra_func_info_t;
-#ifndef RA_REGNUM
-#define RA_REGNUM 0
-#endif
-#endif
-
-#ifdef USG
-#include <sys/types.h>
-#endif
-
+#include "block.h"
+#include "dictionary.h"
+#include "mdebugread.h"

 #include "gdb_stat.h"
 #include "gdb_string.h"
 
 #include "gdb_stat.h"
 #include "gdb_string.h"
 


@@ -89,7 +67,6 @@ typedef struct mips_extra_func_info
 #include "aout/stab_gnu.h"     /* STABS information */
 
 #include "expression.h"
 #include "aout/stab_gnu.h"     /* STABS information */
 
 #include "expression.h"

-#include "language.h"          /* For local_hex_string() */

 
 extern void _initialize_mdebugread (void);
 
 
 extern void _initialize_mdebugread (void);
 


@@ -145,39 +122,39 @@ struct symloc
 static void
 index_complaint (const char *arg1)
 {
 static void
 index_complaint (const char *arg1)
 {

-  complaint (&symfile_complaints, "bad aux index at symbol %s", arg1);
+  complaint (&symfile_complaints, _("bad aux index at symbol %s"), arg1);

 }
 
 static void
 unknown_ext_complaint (const char *arg1)
 {
 }
 
 static void
 unknown_ext_complaint (const char *arg1)
 {

-  complaint (&symfile_complaints, "unknown external symbol %s", arg1);
+  complaint (&symfile_complaints, _("unknown external symbol %s"), arg1);

 }
 
 static void
 basic_type_complaint (int arg1, const char *arg2)
 {
 }
 
 static void
 basic_type_complaint (int arg1, const char *arg2)
 {

-  complaint (&symfile_complaints, "cannot map ECOFF basic type 0x%x for %s",
+  complaint (&symfile_complaints, _("cannot map ECOFF basic type 0x%x for %s"),

             arg1, arg2);
 }
 
 static void
 bad_tag_guess_complaint (const char *arg1)
 {
             arg1, arg2);
 }
 
 static void
 bad_tag_guess_complaint (const char *arg1)
 {

-  complaint (&symfile_complaints, "guessed tag type of %s incorrectly", arg1);
+  complaint (&symfile_complaints, _("guessed tag type of %s incorrectly"), arg1);

 }
 
 static void
 bad_rfd_entry_complaint (const char *arg1, int arg2, int arg3)
 {
 }
 
 static void
 bad_rfd_entry_complaint (const char *arg1, int arg2, int arg3)
 {

-  complaint (&symfile_complaints, "bad rfd entry for %s: file %d, index %d",
+  complaint (&symfile_complaints, _("bad rfd entry for %s: file %d, index %d"),

             arg1, arg2, arg3);
 }
 
 static void
 unexpected_type_code_complaint (const char *arg1)
 {
             arg1, arg2, arg3);
 }
 
 static void
 unexpected_type_code_complaint (const char *arg1)
 {

-  complaint (&symfile_complaints, "unexpected type code for %s", arg1);
+  complaint (&symfile_complaints, _("unexpected type code for %s"), arg1);

 }
 
 /* Macros and extra defs */
 }
 
 /* Macros and extra defs */


@@ -258,11 +235,6 @@ static struct type *mdebug_type_fixed_dec;
 static struct type *mdebug_type_float_dec;
 static struct type *mdebug_type_string;
 
 static struct type *mdebug_type_float_dec;
 static struct type *mdebug_type_string;
 

-/* Types for symbols from files compiled without debugging info.  */
-
-static struct type *nodebug_func_symbol_type;
-static struct type *nodebug_var_symbol_type;
-

 /* Nonzero if we have seen ecoff debugging info for a file.  */
 
 static int found_ecoff_debugging_info;
 /* Nonzero if we have seen ecoff debugging info for a file.  */
 
 static int found_ecoff_debugging_info;


@@ -283,9 +255,11 @@ static struct symbol *new_symbol (char *);
 
 static struct type *new_type (char *);
 
 
 static struct type *new_type (char *);
 

-static struct block *new_block (int);
+enum block_type { FUNCTION_BLOCK, NON_FUNCTION_BLOCK };
+
+static struct block *new_block (enum block_type);

 
 

-static struct symtab *new_symtab (char *, int, int, struct objfile *);
+static struct symtab *new_symtab (char *, int, struct objfile *);

 
 static struct linetable *new_linetable (int);
 
 
 static struct linetable *new_linetable (int);
 


@@ -294,11 +268,9 @@ static struct blockvector *new_bvect (int);
 static struct type *parse_type (int, union aux_ext *, unsigned int, int *,
                                int, char *);
 
 static struct type *parse_type (int, union aux_ext *, unsigned int, int *,
                                int, char *);
 

-static struct symbol *mylookup_symbol (char *, struct block *, namespace_enum,
+static struct symbol *mylookup_symbol (char *, struct block *, domain_enum,

                                       enum address_class);
 
                                       enum address_class);
 

-static struct block *shrink_block (struct block *, struct symtab *);
-

 static void sort_blocks (struct symtab *);
 
 static struct partial_symtab *new_psymtab (char *, struct objfile *);
 static void sort_blocks (struct symtab *);
 
 static struct partial_symtab *new_psymtab (char *, struct objfile *);


@@ -307,7 +279,7 @@ static void psymtab_to_symtab_1 (struct partial_symtab *, char *);
 
 static void add_block (struct block *, struct symtab *);
 
 
 static void add_block (struct block *, struct symtab *);
 

-static void add_symbol (struct symbol *, struct block *);
+static void add_symbol (struct symbol *, struct symtab *, struct block *);

 
 static int add_line (struct linetable *, int, CORE_ADDR, int);
 
 
 static int add_line (struct linetable *, int, CORE_ADDR, int);
 


@@ -318,21 +290,6 @@ static void handle_psymbol_enumerators (struct objfile *, FDR *, int,
 
 static char *mdebug_next_symbol_text (struct objfile *);
 \f
 
 static char *mdebug_next_symbol_text (struct objfile *);
 \f

-/* Address bounds for the signal trampoline in inferior, if any */
-
-CORE_ADDR sigtramp_address, sigtramp_end;
-
-/* Allocate zeroed memory */
-
-static void *
-xzalloc (unsigned int size)
-{
-  void *p = xmalloc (size);
-
-  memset (p, 0, size);
-  return p;
-}
-

 /* Exported procedure: Builds a symtab from the PST partial one.
    Restores the environment in effect when PST was created, delegates
    most of the work to an ancillary procedure, and sorts
 /* Exported procedure: Builds a symtab from the PST partial one.
    Restores the environment in effect when PST was created, delegates
    most of the work to an ancillary procedure, and sorts


@@ -347,7 +304,7 @@ mdebug_psymtab_to_symtab (struct partial_symtab *pst)
 
   if (info_verbose)
     {
 
   if (info_verbose)
     {

-      printf_filtered ("Reading in symbols for %s...", pst->filename);
+      printf_filtered (_("Reading in symbols for %s..."), pst->filename);

       gdb_flush (gdb_stdout);
     }
 
       gdb_flush (gdb_stdout);
     }
 


@@ -360,7 +317,7 @@ mdebug_psymtab_to_symtab (struct partial_symtab *pst)
   scan_file_globals (pst->objfile);
 
   if (info_verbose)
   scan_file_globals (pst->objfile);
 
   if (info_verbose)

-    printf_filtered ("done.\n");
+    printf_filtered (_("done.\n"));

 }
 \f
 /* File-level interface functions */
 }
 \f
 /* File-level interface functions */


@@ -371,7 +328,7 @@ static FDR *
 get_rfd (int cf, int rf)
 {
   FDR *fdrs;
 get_rfd (int cf, int rf)
 {
   FDR *fdrs;

-  register FDR *f;
+  FDR *f;

   RFDT rfd;
 
   fdrs = debug_info->fdr;
   RFDT rfd;
 
   fdrs = debug_info->fdr;


@@ -424,7 +381,7 @@ mdebug_build_psymtabs (struct objfile *objfile,
       char *fdr_end;
       FDR *fdr_ptr;
 
       char *fdr_end;
       FDR *fdr_ptr;
 

-      info->fdr = (FDR *) obstack_alloc (&objfile->psymbol_obstack,
+      info->fdr = (FDR *) obstack_alloc (&objfile->objfile_obstack,

                                         (info->symbolic_header.ifdMax
                                          * sizeof (FDR)));
       fdr_src = info->external_fdr;
                                         (info->symbolic_header.ifdMax
                                          * sizeof (FDR)));
       fdr_src = info->external_fdr;


@@ -443,9 +400,9 @@ mdebug_build_psymtabs (struct objfile *objfile,
   if (compare_glevel (max_glevel, GLEVEL_2) < 0)
     {
       if (max_gdbinfo == 0)
   if (compare_glevel (max_glevel, GLEVEL_2) < 0)
     {
       if (max_gdbinfo == 0)

-       printf_unfiltered ("\n%s not compiled with -g, debugging support is limited.\n",
+       printf_unfiltered (_("\n%s not compiled with -g, debugging support is limited.\n"),

                           objfile->name);
                           objfile->name);

-      printf_unfiltered ("You should compile with -g2 or -g3 for best debugging support.\n");
+      printf_unfiltered (_("You should compile with -g2 or -g3 for best debugging support.\n"));

       gdb_flush (gdb_stdout);
     }
 #endif
       gdb_flush (gdb_stdout);
     }
 #endif


@@ -482,7 +439,6 @@ static struct parse_stack
 
     int blocktype;
 
 
     int blocktype;
 

-    int maxsyms;               /* Max symbols in this block. */

     struct type *cur_type;     /* Type we parse fields for. */
     int cur_field;             /* Field number in cur_type. */
     CORE_ADDR procadr;         /* Start addres of this procedure */
     struct type *cur_type;     /* Type we parse fields for. */
     int cur_field;             /* Field number in cur_type. */
     CORE_ADDR procadr;         /* Start addres of this procedure */


@@ -507,7 +463,7 @@ push_parse_stack (void)
   /* Initialize new frame with previous content */
   if (top_stack)
     {
   /* Initialize new frame with previous content */
   if (top_stack)
     {

-      register struct parse_stack *prev = new->prev;
+      struct parse_stack *prev = new->prev;

 
       *new = *top_stack;
       top_stack->prev = new;
 
       *new = *top_stack;
       top_stack->prev = new;


@@ -543,9 +499,9 @@ struct mdebug_pending
 
 
 /* The pending information is kept for an entire object file, and used
 
 
 /* The pending information is kept for an entire object file, and used

-   to be in the sym_private field.  I took it out when I split
-   mdebugread from mipsread, because this might not be the only type
-   of symbols read from an object file.  Instead, we allocate the
+   to be in the deprecated_sym_private field.  I took it out when I
+   split mdebugread from mipsread, because this might not be the only
+   type of symbols read from an object file.  Instead, we allocate the

    pending information table when we create the partial symbols, and
    we store a pointer to the single table in each psymtab.  */
 
    pending information table when we create the partial symbols, and
    we store a pointer to the single table in each psymtab.  */
 


@@ -557,7 +513,7 @@ static struct mdebug_pending *
 is_pending_symbol (FDR *fh, char *sh)
 {
   int f_idx = fh - debug_info->fdr;
 is_pending_symbol (FDR *fh, char *sh)
 {
   int f_idx = fh - debug_info->fdr;

-  register struct mdebug_pending *p;
+  struct mdebug_pending *p;

 
   /* Linear search is ok, list is typically no more than 10 deep */
   for (p = pending_list[f_idx]; p; p = p->next)
 
   /* Linear search is ok, list is typically no more than 10 deep */
   for (p = pending_list[f_idx]; p; p = p->next)


@@ -578,7 +534,7 @@ add_pending (FDR *fh, char *sh, struct type *t)
   if (!p)
     {
       p = ((struct mdebug_pending *)
   if (!p)
     {
       p = ((struct mdebug_pending *)

-          obstack_alloc (&current_objfile->psymbol_obstack,
+          obstack_alloc (&current_objfile->objfile_obstack,

                          sizeof (struct mdebug_pending)));
       p->s = sh;
       p->t = t;
                          sizeof (struct mdebug_pending)));
       p->s = sh;
       p->t = t;


@@ -603,6 +559,7 @@ static int
 parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
              struct section_offsets *section_offsets, struct objfile *objfile)
 {
 parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
              struct section_offsets *section_offsets, struct objfile *objfile)
 {

+  struct gdbarch *gdbarch = get_objfile_arch (objfile);

   const bfd_size_type external_sym_size = debug_swap->external_sym_size;
   void (*const swap_sym_in) (bfd *, void *, SYMR *) = debug_swap->swap_sym_in;
   char *name;
   const bfd_size_type external_sym_size = debug_swap->external_sym_size;
   void (*const swap_sym_in) (bfd *, void *, SYMR *) = debug_swap->swap_sym_in;
   char *name;


@@ -669,7 +626,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
          /* It is a FORTRAN common block.  At least for SGI Fortran the
             address is not in the symbol; we need to fix it later in
             scan_file_globals.  */
          /* It is a FORTRAN common block.  At least for SGI Fortran the
             address is not in the symbol; we need to fix it later in
             scan_file_globals.  */

-         int bucket = hashname (SYMBOL_NAME (s));
+         int bucket = hashname (DEPRECATED_SYMBOL_NAME (s));

          SYMBOL_VALUE_CHAIN (s) = global_sym_chain[bucket];
          global_sym_chain[bucket] = s;
        }
          SYMBOL_VALUE_CHAIN (s) = global_sym_chain[bucket];
          global_sym_chain[bucket] = s;
        }


@@ -681,7 +638,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
       if (sh->sc == scRegister)
        {
          class = LOC_REGISTER;
       if (sh->sc == scRegister)
        {
          class = LOC_REGISTER;

-         svalue = ECOFF_REG_TO_REGNUM (svalue);
+         svalue = gdbarch_ecoff_reg_to_regnum (current_gdbarch, svalue);

        }
       else
        class = LOC_LOCAL;
        }
       else
        class = LOC_LOCAL;


@@ -690,14 +647,14 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
       SYMBOL_VALUE (s) = svalue;
 
     data:                      /* Common code for symbols describing data */
       SYMBOL_VALUE (s) = svalue;
 
     data:                      /* Common code for symbols describing data */

-      SYMBOL_NAMESPACE (s) = VAR_NAMESPACE;
+      SYMBOL_DOMAIN (s) = VAR_DOMAIN;

       SYMBOL_CLASS (s) = class;
       SYMBOL_CLASS (s) = class;

-      add_symbol (s, b);
+      add_symbol (s, top_stack->cur_st, b);

 
       /* Type could be missing if file is compiled without debugging info.  */
       if (SC_IS_UNDEF (sh->sc)
          || sh->sc == scNil || sh->index == indexNil)
 
       /* Type could be missing if file is compiled without debugging info.  */
       if (SC_IS_UNDEF (sh->sc)
          || sh->sc == scNil || sh->index == indexNil)

-       SYMBOL_TYPE (s) = nodebug_var_symbol_type;
+       SYMBOL_TYPE (s) = builtin_type (gdbarch)->nodebug_data_symbol;

       else
        SYMBOL_TYPE (s) = parse_type (cur_fd, ax, sh->index, 0, bigend, name);
       /* Value of a data symbol is its memory address */
       else
        SYMBOL_TYPE (s) = parse_type (cur_fd, ax, sh->index, 0, bigend, name);
       /* Value of a data symbol is its memory address */


@@ -713,13 +670,14 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
        name = "this";          /* FIXME, not alloc'd in obstack */
       s = new_symbol (name);
 
        name = "this";          /* FIXME, not alloc'd in obstack */
       s = new_symbol (name);
 

-      SYMBOL_NAMESPACE (s) = VAR_NAMESPACE;
+      SYMBOL_DOMAIN (s) = VAR_DOMAIN;
+      SYMBOL_IS_ARGUMENT (s) = 1;

       switch (sh->sc)
        {
        case scRegister:
          /* Pass by value in register.  */
       switch (sh->sc)
        {
        case scRegister:
          /* Pass by value in register.  */

-         SYMBOL_CLASS (s) = LOC_REGPARM;
-         svalue = ECOFF_REG_TO_REGNUM (svalue);
+         SYMBOL_CLASS (s) = LOC_REGISTER;
+         svalue = gdbarch_ecoff_reg_to_regnum (current_gdbarch, svalue);

          break;
        case scVar:
          /* Pass by reference on stack.  */
          break;
        case scVar:
          /* Pass by reference on stack.  */


@@ -728,7 +686,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
        case scVarRegister:
          /* Pass by reference in register.  */
          SYMBOL_CLASS (s) = LOC_REGPARM_ADDR;
        case scVarRegister:
          /* Pass by reference in register.  */
          SYMBOL_CLASS (s) = LOC_REGPARM_ADDR;

-         svalue = ECOFF_REG_TO_REGNUM (svalue);
+         svalue = gdbarch_ecoff_reg_to_regnum (current_gdbarch, svalue);

          break;
        default:
          /* Pass by value on stack.  */
          break;
        default:
          /* Pass by value on stack.  */


@@ -737,16 +695,16 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
        }
       SYMBOL_VALUE (s) = svalue;
       SYMBOL_TYPE (s) = parse_type (cur_fd, ax, sh->index, 0, bigend, name);
        }
       SYMBOL_VALUE (s) = svalue;
       SYMBOL_TYPE (s) = parse_type (cur_fd, ax, sh->index, 0, bigend, name);

-      add_symbol (s, top_stack->cur_block);
+      add_symbol (s, top_stack->cur_st, top_stack->cur_block);

       break;
 
     case stLabel:              /* label, goes into current block */
       s = new_symbol (name);
       break;
 
     case stLabel:              /* label, goes into current block */
       s = new_symbol (name);

-      SYMBOL_NAMESPACE (s) = VAR_NAMESPACE;    /* so that it can be used */
+      SYMBOL_DOMAIN (s) = VAR_DOMAIN;  /* so that it can be used */

       SYMBOL_CLASS (s) = LOC_LABEL;    /* but not misused */
       SYMBOL_VALUE_ADDRESS (s) = (CORE_ADDR) sh->value;
       SYMBOL_TYPE (s) = mdebug_type_int;
       SYMBOL_CLASS (s) = LOC_LABEL;    /* but not misused */
       SYMBOL_VALUE_ADDRESS (s) = (CORE_ADDR) sh->value;
       SYMBOL_TYPE (s) = mdebug_type_int;

-      add_symbol (s, top_stack->cur_block);
+      add_symbol (s, top_stack->cur_st, top_stack->cur_block);

       break;
 
     case stProc:               /* Procedure, usually goes into global block */
       break;
 
     case stProc:               /* Procedure, usually goes into global block */


@@ -777,14 +735,14 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
                     break;
                   default:
                     complaint (&symfile_complaints,
                     break;
                   default:
                     complaint (&symfile_complaints,

-                               "unknown symbol type 0x%x", sh->st);
+                               _("unknown symbol type 0x%x"), sh->st);

                     break;
                 }
             }
           break;
         }
       s = new_symbol (name);
                     break;
                 }
             }
           break;
         }
       s = new_symbol (name);

-      SYMBOL_NAMESPACE (s) = VAR_NAMESPACE;
+      SYMBOL_DOMAIN (s) = VAR_DOMAIN;

       SYMBOL_CLASS (s) = LOC_BLOCK;
       /* Type of the return value */
       if (SC_IS_UNDEF (sh->sc) || sh->sc == scNil)
       SYMBOL_CLASS (s) = LOC_BLOCK;
       /* Type of the return value */
       if (SC_IS_UNDEF (sh->sc) || sh->sc == scNil)


@@ -792,7 +750,8 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
       else
        {
          t = parse_type (cur_fd, ax, sh->index + 1, 0, bigend, name);
       else
        {
          t = parse_type (cur_fd, ax, sh->index + 1, 0, bigend, name);

-         if (STREQ (name, "malloc") && TYPE_CODE (t) == TYPE_CODE_VOID)
+         if (strcmp (name, "malloc") == 0
+             && TYPE_CODE (t) == TYPE_CODE_VOID)

            {
              /* I don't know why, but, at least under Alpha GNU/Linux,
                 when linking against a malloc without debugging
            {
              /* I don't know why, but, at least under Alpha GNU/Linux,
                 when linking against a malloc without debugging


@@ -813,7 +772,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
          struct blockvector *bv = BLOCKVECTOR (top_stack->cur_st);
          /* The next test should normally be true, but provides a
             hook for nested functions (which we don't want to make
          struct blockvector *bv = BLOCKVECTOR (top_stack->cur_st);
          /* The next test should normally be true, but provides a
             hook for nested functions (which we don't want to make

-            global). */
+            global).  */

          if (b == BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK))
            b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
          /* Irix 5 sometimes has duplicate names for the same
          if (b == BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK))
            b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
          /* Irix 5 sometimes has duplicate names for the same


@@ -822,7 +781,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
          else if (sh->value == top_stack->procadr)
            b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
        }
          else if (sh->value == top_stack->procadr)
            b = BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK);
        }

-      add_symbol (s, b);
+      add_symbol (s, top_stack->cur_st, b);

 
       /* Make a type for the procedure itself */
       SYMBOL_TYPE (s) = lookup_function_type (t);
 
       /* Make a type for the procedure itself */
       SYMBOL_TYPE (s) = lookup_function_type (t);


@@ -833,7 +792,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
        TYPE_FLAGS (SYMBOL_TYPE (s)) |= TYPE_FLAG_PROTOTYPED;
 
       /* Create and enter a new lexical context */
        TYPE_FLAGS (SYMBOL_TYPE (s)) |= TYPE_FLAG_PROTOTYPED;
 
       /* Create and enter a new lexical context */

-      b = new_block (top_stack->maxsyms);
+      b = new_block (FUNCTION_BLOCK);

       SYMBOL_BLOCK_VALUE (s) = b;
       BLOCK_FUNCTION (b) = s;
       BLOCK_START (b) = BLOCK_END (b) = sh->value;
       SYMBOL_BLOCK_VALUE (s) = b;
       BLOCK_FUNCTION (b) = s;
       BLOCK_START (b) = BLOCK_END (b) = sh->value;


@@ -915,9 +874,13 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
                    method whose name is identical to the class name
                    (in particular constructor method names are different
                    from the class name).  There is therefore no risk that
                    method whose name is identical to the class name
                    (in particular constructor method names are different
                    from the class name).  There is therefore no risk that

-                   this check stops the count on the StEnd of a method.  */
-                if (strcmp (debug_info->ss + cur_fdr->issBase + tsym.iss,
-                            name) == 0)
+                   this check stops the count on the StEnd of a method.
+                  
+                  Also, assume that we're really at the end when tsym.iss
+                  is 0 (issNull).  */
+                if (tsym.iss == issNull
+                   || strcmp (debug_info->ss + cur_fdr->issBase + tsym.iss,
+                               name) == 0)

                   goto end_of_fields;
                 break;
 
                   goto end_of_fields;
                 break;
 


@@ -989,7 +952,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
 
              default:
                complaint (&symfile_complaints,
 
              default:
                complaint (&symfile_complaints,

-                          "declaration block contains unhandled symbol type %d",
+                          _("declaration block contains unhandled symbol type %d"),

                           tsym.st);
              }
          }
                           tsym.st);
              }
          }


@@ -1052,7 +1015,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
        if (sh->iss == 0 || name[0] == '.' || name[0] == '\0')
          TYPE_TAG_NAME (t) = NULL;
        else
        if (sh->iss == 0 || name[0] == '.' || name[0] == '\0')
          TYPE_TAG_NAME (t) = NULL;
        else

-         TYPE_TAG_NAME (t) = obconcat (&current_objfile->symbol_obstack,
+         TYPE_TAG_NAME (t) = obconcat (&current_objfile->objfile_obstack,

                                        "", "", name);
 
        TYPE_CODE (t) = type_code;
                                        "", "", name);
 
        TYPE_CODE (t) = type_code;


@@ -1078,7 +1041,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
               that too.  */
            if (TYPE_LENGTH (t) == TYPE_NFIELDS (t)
                || TYPE_LENGTH (t) == 0)
               that too.  */
            if (TYPE_LENGTH (t) == TYPE_NFIELDS (t)
                || TYPE_LENGTH (t) == 0)

-             TYPE_LENGTH (t) = TARGET_INT_BIT / HOST_CHAR_BIT;
+             TYPE_LENGTH (t) = gdbarch_int_bit (gdbarch) / HOST_CHAR_BIT;

            for (ext_tsym = ext_sh + external_sym_size;
                 ;
                 ext_tsym += external_sym_size)
            for (ext_tsym = ext_sh + external_sym_size;
                 ;
                 ext_tsym += external_sym_size)


@@ -1098,19 +1061,19 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
                FIELD_STATIC_KIND (*f) = 0;
 
                enum_sym = ((struct symbol *)
                FIELD_STATIC_KIND (*f) = 0;
 
                enum_sym = ((struct symbol *)

-                           obstack_alloc (&current_objfile->symbol_obstack,
+                           obstack_alloc (&current_objfile->objfile_obstack,

                                           sizeof (struct symbol)));
                memset (enum_sym, 0, sizeof (struct symbol));
                                           sizeof (struct symbol)));
                memset (enum_sym, 0, sizeof (struct symbol));

-               SYMBOL_NAME (enum_sym) =
+               DEPRECATED_SYMBOL_NAME (enum_sym) =

                  obsavestring (f->name, strlen (f->name),
                  obsavestring (f->name, strlen (f->name),

-                               &current_objfile->symbol_obstack);
+                               &current_objfile->objfile_obstack);

                SYMBOL_CLASS (enum_sym) = LOC_CONST;
                SYMBOL_TYPE (enum_sym) = t;
                SYMBOL_CLASS (enum_sym) = LOC_CONST;
                SYMBOL_TYPE (enum_sym) = t;

-               SYMBOL_NAMESPACE (enum_sym) = VAR_NAMESPACE;
+               SYMBOL_DOMAIN (enum_sym) = VAR_DOMAIN;

                SYMBOL_VALUE (enum_sym) = tsym.value;
                if (SYMBOL_VALUE (enum_sym) < 0)
                  unsigned_enum = 0;
                SYMBOL_VALUE (enum_sym) = tsym.value;
                if (SYMBOL_VALUE (enum_sym) < 0)
                  unsigned_enum = 0;

-               add_symbol (enum_sym, top_stack->cur_block);
+               add_symbol (enum_sym, top_stack->cur_st, top_stack->cur_block);

 
                /* Skip the stMembers that we've handled. */
                count++;
 
                /* Skip the stMembers that we've handled. */
                count++;


@@ -1136,11 +1099,11 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
          }
 
        s = new_symbol (name);
          }
 
        s = new_symbol (name);

-       SYMBOL_NAMESPACE (s) = STRUCT_NAMESPACE;
+       SYMBOL_DOMAIN (s) = STRUCT_DOMAIN;

        SYMBOL_CLASS (s) = LOC_TYPEDEF;
        SYMBOL_VALUE (s) = 0;
        SYMBOL_TYPE (s) = t;
        SYMBOL_CLASS (s) = LOC_TYPEDEF;
        SYMBOL_VALUE (s) = 0;
        SYMBOL_TYPE (s) = t;

-       add_symbol (s, top_stack->cur_block);
+       add_symbol (s, top_stack->cur_st, top_stack->cur_block);

        break;
 
        /* End of local variables shared by struct, union, enum, and
        break;
 
        /* End of local variables shared by struct, union, enum, and


@@ -1164,7 +1127,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
        }
 
       top_stack->blocktype = stBlock;
        }
 
       top_stack->blocktype = stBlock;

-      b = new_block (top_stack->maxsyms);
+      b = new_block (NON_FUNCTION_BLOCK);

       BLOCK_START (b) = sh->value + top_stack->procadr;
       BLOCK_SUPERBLOCK (b) = top_stack->cur_block;
       top_stack->cur_block = b;
       BLOCK_START (b) = sh->value + top_stack->procadr;
       BLOCK_SUPERBLOCK (b) = top_stack->cur_block;
       top_stack->cur_block = b;


@@ -1183,29 +1146,26 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
        {
          /* Finished with procedure */
          struct blockvector *bv = BLOCKVECTOR (top_stack->cur_st);
        {
          /* Finished with procedure */
          struct blockvector *bv = BLOCKVECTOR (top_stack->cur_st);

-         struct mips_extra_func_info *e;
-         struct block *b;
+         struct mdebug_extra_func_info *e;
+         struct block *b = top_stack->cur_block;

          struct type *ftype = top_stack->cur_type;
          int i;
 
          BLOCK_END (top_stack->cur_block) += sh->value;        /* size */
 
          /* Make up special symbol to contain procedure specific info */
          struct type *ftype = top_stack->cur_type;
          int i;
 
          BLOCK_END (top_stack->cur_block) += sh->value;        /* size */
 
          /* Make up special symbol to contain procedure specific info */

-         s = new_symbol (MIPS_EFI_SYMBOL_NAME);
-         SYMBOL_NAMESPACE (s) = LABEL_NAMESPACE;
+         s = new_symbol (MDEBUG_EFI_SYMBOL_NAME);
+         SYMBOL_DOMAIN (s) = LABEL_DOMAIN;

          SYMBOL_CLASS (s) = LOC_CONST;
          SYMBOL_TYPE (s) = mdebug_type_void;
          SYMBOL_CLASS (s) = LOC_CONST;
          SYMBOL_TYPE (s) = mdebug_type_void;

-         e = ((struct mips_extra_func_info *)
-              obstack_alloc (&current_objfile->symbol_obstack,
-                             sizeof (struct mips_extra_func_info)));
-         memset (e, 0, sizeof (struct mips_extra_func_info));
+         e = ((struct mdebug_extra_func_info *)
+              obstack_alloc (&current_objfile->objfile_obstack,
+                             sizeof (struct mdebug_extra_func_info)));
+         memset (e, 0, sizeof (struct mdebug_extra_func_info));

          SYMBOL_VALUE (s) = (long) e;
          e->numargs = top_stack->numargs;
          e->pdr.framereg = -1;
          SYMBOL_VALUE (s) = (long) e;
          e->numargs = top_stack->numargs;
          e->pdr.framereg = -1;

-         add_symbol (s, top_stack->cur_block);
-
-         /* Reallocate symbols, saving memory */
-         b = shrink_block (top_stack->cur_block, top_stack->cur_st);
+         add_symbol (s, top_stack->cur_st, top_stack->cur_block);

 
          /* f77 emits proc-level with address bounds==[0,0],
             So look for such child blocks, and patch them.  */
 
          /* f77 emits proc-level with address bounds==[0,0],
             So look for such child blocks, and patch them.  */


@@ -1231,25 +1191,22 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
 
              if (nparams > 0)
                {
 
              if (nparams > 0)
                {

+                 struct dict_iterator iter;

                  TYPE_NFIELDS (ftype) = nparams;
                  TYPE_FIELDS (ftype) = (struct field *)
                    TYPE_ALLOC (ftype, nparams * sizeof (struct field));
 
                  TYPE_NFIELDS (ftype) = nparams;
                  TYPE_FIELDS (ftype) = (struct field *)
                    TYPE_ALLOC (ftype, nparams * sizeof (struct field));
 

-                 for (i = iparams = 0; iparams < nparams; i++)
+                 iparams = 0;
+                 ALL_BLOCK_SYMBOLS (b, iter, sym)

                    {
                    {

-                     sym = BLOCK_SYM (b, i);
-                     switch (SYMBOL_CLASS (sym))
+                     if (iparams == nparams)
+                       break;
+
+                     if (SYMBOL_IS_ARGUMENT (sym))

                        {
                        {

-                       case LOC_ARG:
-                       case LOC_REF_ARG:
-                       case LOC_REGPARM:
-                       case LOC_REGPARM_ADDR:

                          TYPE_FIELD_TYPE (ftype, iparams) = SYMBOL_TYPE (sym);
                          TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
                          iparams++;
                          TYPE_FIELD_TYPE (ftype, iparams) = SYMBOL_TYPE (sym);
                          TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
                          iparams++;

-                         break;
-                       default:
-                         break;

                        }
                    }
                }
                        }
                    }
                }


@@ -1261,7 +1218,6 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
             displacement from the procedure`s start address of the
             end of this block. */
          BLOCK_END (top_stack->cur_block) = sh->value + top_stack->procadr;
             displacement from the procedure`s start address of the
             end of this block. */
          BLOCK_END (top_stack->cur_block) = sh->value + top_stack->procadr;

-         shrink_block (top_stack->cur_block, top_stack->cur_st);

        }
       else if (sh->sc == scText && top_stack->blocktype == stNil)
        {
        }
       else if (sh->sc == scText && top_stack->blocktype == stNil)
        {


@@ -1277,7 +1233,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
        }
       else
        complaint (&symfile_complaints,
        }
       else
        complaint (&symfile_complaints,

-                  "stEnd with storage class %d not handled", sh->sc);
+                  _("stEnd with storage class %d not handled"), sh->sc);

 
       pop_parse_stack ();      /* restore previous lexical context */
       break;
 
       pop_parse_stack ();      /* restore previous lexical context */
       break;


@@ -1337,11 +1293,11 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
       if (has_opaque_xref (cur_fdr, sh))
        break;
       s = new_symbol (name);
       if (has_opaque_xref (cur_fdr, sh))
        break;
       s = new_symbol (name);

-      SYMBOL_NAMESPACE (s) = VAR_NAMESPACE;
+      SYMBOL_DOMAIN (s) = VAR_DOMAIN;

       SYMBOL_CLASS (s) = LOC_TYPEDEF;
       SYMBOL_BLOCK_VALUE (s) = top_stack->cur_block;
       SYMBOL_TYPE (s) = t;
       SYMBOL_CLASS (s) = LOC_TYPEDEF;
       SYMBOL_BLOCK_VALUE (s) = top_stack->cur_block;
       SYMBOL_TYPE (s) = t;

-      add_symbol (s, top_stack->cur_block);
+      add_symbol (s, top_stack->cur_st, top_stack->cur_block);

 
       /* Incomplete definitions of structs should not get a name.  */
       if (TYPE_NAME (SYMBOL_TYPE (s)) == NULL
 
       /* Incomplete definitions of structs should not get a name.  */
       if (TYPE_NAME (SYMBOL_TYPE (s)) == NULL


@@ -1372,7 +1328,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
                 for anything except pointers or functions.  */
            }
          else
                 for anything except pointers or functions.  */
            }
          else

-           TYPE_NAME (SYMBOL_TYPE (s)) = SYMBOL_NAME (s);
+           TYPE_NAME (SYMBOL_TYPE (s)) = DEPRECATED_SYMBOL_NAME (s);

        }
       break;
 
        }
       break;
 


@@ -1389,7 +1345,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
     case stConstant:
       break;                   /* constant */
     default:
     case stConstant:
       break;                   /* constant */
     default:

-      complaint (&symfile_complaints, "unknown symbol type 0x%x", sh->st);
+      complaint (&symfile_complaints, _("unknown symbol type 0x%x"), sh->st);

       break;
     }
 
       break;
     }
 


@@ -1517,9 +1473,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
   if (t->fBitfield)
     {
       int width = AUX_GET_WIDTH (bigend, ax);
   if (t->fBitfield)
     {
       int width = AUX_GET_WIDTH (bigend, ax);

-
-      /* Inhibit core dumps with some cfront generated objects that
-         corrupt the TIR.  */
+      /* Inhibit core dumps if TIR is corrupted.  */

       if (bs == (int *) NULL)
        {
          /* Alpha cc -migrate encodes char and unsigned char types
       if (bs == (int *) NULL)
        {
          /* Alpha cc -migrate encodes char and unsigned char types


@@ -1532,7 +1486,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
          else if (t->bt == btEnum)
            ;
          else
          else if (t->bt == btEnum)
            ;
          else

-           complaint (&symfile_complaints, "can't handle TIR fBitfield for %s",
+           complaint (&symfile_complaints, _("can't handle TIR fBitfield for %s"),

                       sym_name);
        }
       else
                       sym_name);
        }
       else


@@ -1562,7 +1516,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
       if (rf == -1)
        {
          complaint (&symfile_complaints,
       if (rf == -1)
        {
          complaint (&symfile_complaints,

-                    "unable to cross ref btIndirect for %s", sym_name);
+                    _("unable to cross ref btIndirect for %s"), sym_name);

          return mdebug_type_int;
        }
       xref_fh = get_rfd (fd, rf);
          return mdebug_type_int;
        }
       xref_fh = get_rfd (fd, rf);


@@ -1629,9 +1583,9 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
          if (name[0] == '.' || name[0] == '\0')
            TYPE_TAG_NAME (tp) = NULL;
          else if (TYPE_TAG_NAME (tp) == NULL
          if (name[0] == '.' || name[0] == '\0')
            TYPE_TAG_NAME (tp) = NULL;
          else if (TYPE_TAG_NAME (tp) == NULL

-                  || !STREQ (TYPE_TAG_NAME (tp), name))
+                  || strcmp (TYPE_TAG_NAME (tp), name) != 0)

            TYPE_TAG_NAME (tp) = obsavestring (name, strlen (name),
            TYPE_TAG_NAME (tp) = obsavestring (name, strlen (name),

-                                           &current_objfile->type_obstack);
+                                           &current_objfile->objfile_obstack);

        }
     }
 
        }
     }
 


@@ -1664,9 +1618,10 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
              bad_tag_guess_complaint (sym_name);
              TYPE_CODE (tp) = type_code;
            }
              bad_tag_guess_complaint (sym_name);
              TYPE_CODE (tp) = type_code;
            }

-         if (TYPE_NAME (tp) == NULL || !STREQ (TYPE_NAME (tp), name))
+         if (TYPE_NAME (tp) == NULL
+             || strcmp (TYPE_NAME (tp), name) != 0)

            TYPE_NAME (tp) = obsavestring (name, strlen (name),
            TYPE_NAME (tp) = obsavestring (name, strlen (name),

-                                          &current_objfile->type_obstack);
+                                          &current_objfile->objfile_obstack);

        }
     }
   if (t->bt == btTypedef)
        }
     }
   if (t->bt == btTypedef)


@@ -1678,7 +1633,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
       if (tp == (struct type *) NULL)
        {
          complaint (&symfile_complaints,
       if (tp == (struct type *) NULL)
        {
          complaint (&symfile_complaints,

-                    "unable to cross ref btTypedef for %s", sym_name);
+                    _("unable to cross ref btTypedef for %s"), sym_name);

          tp = mdebug_type_int;
        }
     }
          tp = mdebug_type_int;
        }
     }


@@ -1690,11 +1645,11 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
       TYPE_FIELDS (tp) = ((struct field *)
                          TYPE_ALLOC (tp, 2 * sizeof (struct field)));
       TYPE_FIELD_NAME (tp, 0) = obsavestring ("Low", strlen ("Low"),
       TYPE_FIELDS (tp) = ((struct field *)
                          TYPE_ALLOC (tp, 2 * sizeof (struct field)));
       TYPE_FIELD_NAME (tp, 0) = obsavestring ("Low", strlen ("Low"),

-                                           &current_objfile->type_obstack);
+                                           &current_objfile->objfile_obstack);

       TYPE_FIELD_BITPOS (tp, 0) = AUX_GET_DNLOW (bigend, ax);
       ax++;
       TYPE_FIELD_NAME (tp, 1) = obsavestring ("High", strlen ("High"),
       TYPE_FIELD_BITPOS (tp, 0) = AUX_GET_DNLOW (bigend, ax);
       ax++;
       TYPE_FIELD_NAME (tp, 1) = obsavestring ("High", strlen ("High"),

-                                           &current_objfile->type_obstack);
+                                           &current_objfile->objfile_obstack);

       TYPE_FIELD_BITPOS (tp, 1) = AUX_GET_DNHIGH (bigend, ax);
       ax++;
     }
       TYPE_FIELD_BITPOS (tp, 1) = AUX_GET_DNHIGH (bigend, ax);
       ax++;
     }


@@ -1728,7 +1683,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs,
 
   /* Complain for illegal continuations due to corrupt aux entries.  */
   if (t->continued)
 
   /* Complain for illegal continuations due to corrupt aux entries.  */
   if (t->continued)

-    complaint (&symfile_complaints, "illegal TIR continued for %s", sym_name);
+    complaint (&symfile_complaints, _("illegal TIR continued for %s"), sym_name);

 
   return tp;
 }
 
   return tp;
 }


@@ -1791,7 +1746,7 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend,
       if (TYPE_CODE (indx) != TYPE_CODE_INT)
        {
          complaint (&symfile_complaints,
       if (TYPE_CODE (indx) != TYPE_CODE_INT)
        {
          complaint (&symfile_complaints,

-                    "illegal array index type for %s, assuming int", sym_name);
+                    _("illegal array index type for %s, assuming int"), sym_name);

          indx = mdebug_type_int;
        }
 
          indx = mdebug_type_int;
        }
 


@@ -1841,7 +1796,7 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend,
       return 0;
 
     default:
       return 0;
 
     default:

-      complaint (&symfile_complaints, "unknown type qualifier 0x%x", tq);
+      complaint (&symfile_complaints, _("unknown type qualifier 0x%x"), tq);

       return 0;
     }
 }
       return 0;
     }
 }


@@ -1849,13 +1804,13 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend,
 
 /* Parse a procedure descriptor record PR.  Note that the procedure is
    parsed _after_ the local symbols, now we just insert the extra
 
 /* Parse a procedure descriptor record PR.  Note that the procedure is
    parsed _after_ the local symbols, now we just insert the extra

-   information we need into a MIPS_EFI_SYMBOL_NAME symbol that has
+   information we need into a MDEBUG_EFI_SYMBOL_NAME symbol that has

    already been placed in the procedure's main block.  Note also that
    images that have been partially stripped (ld -x) have been deprived
    of local symbols, and we have to cope with them here.  FIRST_OFF is
    the offset of the first procedure for this FDR; we adjust the
    address by this amount, but I don't know why.  SEARCH_SYMTAB is the symtab
    already been placed in the procedure's main block.  Note also that
    images that have been partially stripped (ld -x) have been deprived
    of local symbols, and we have to cope with them here.  FIRST_OFF is
    the offset of the first procedure for this FDR; we adjust the
    address by this amount, but I don't know why.  SEARCH_SYMTAB is the symtab

-   to look for the function which contains the MIPS_EFI_SYMBOL_NAME symbol
+   to look for the function which contains the MDEBUG_EFI_SYMBOL_NAME symbol

    in question, or NULL to use top_stack->cur_block.  */
 
 static void parse_procedure (PDR *, struct symtab *, struct partial_symtab *);
    in question, or NULL to use top_stack->cur_block.  */
 
 static void parse_procedure (PDR *, struct symtab *, struct partial_symtab *);


@@ -1864,9 +1819,10 @@ static void
 parse_procedure (PDR *pr, struct symtab *search_symtab,
                 struct partial_symtab *pst)
 {
 parse_procedure (PDR *pr, struct symtab *search_symtab,
                 struct partial_symtab *pst)
 {

+  struct gdbarch *gdbarch = get_objfile_arch (pst->objfile);

   struct symbol *s, *i;
   struct block *b;
   struct symbol *s, *i;
   struct block *b;

-  struct mips_extra_func_info *e;
+  struct mdebug_extra_func_info *e;

   char *sh_name;
 
   /* Simple rule to find files linked "-x" */
   char *sh_name;
 
   /* Simple rule to find files linked "-x" */


@@ -1877,7 +1833,7 @@ parse_procedure (PDR *pr, struct symtab *search_symtab,
          /* Static procedure at address pr->adr.  Sigh. */
          /* FIXME-32x64.  assuming pr->adr fits in long.  */
          complaint (&symfile_complaints,
          /* Static procedure at address pr->adr.  Sigh. */
          /* FIXME-32x64.  assuming pr->adr fits in long.  */
          complaint (&symfile_complaints,

-                    "can't handle PDR for static proc at 0x%lx",
+                    _("can't handle PDR for static proc at 0x%lx"),

                     (unsigned long) pr->adr);
          return;
        }
                     (unsigned long) pr->adr);
          return;
        }


@@ -1918,19 +1874,19 @@ parse_procedure (PDR *pr, struct symtab *search_symtab,
          the same name exists, lookup_symbol will eventually read in the symtab
          for the global function and clobber cur_fdr.  */
       FDR *save_cur_fdr = cur_fdr;
          the same name exists, lookup_symbol will eventually read in the symtab
          for the global function and clobber cur_fdr.  */
       FDR *save_cur_fdr = cur_fdr;

-      s = lookup_symbol (sh_name, NULL, VAR_NAMESPACE, 0, NULL);
+      s = lookup_symbol (sh_name, NULL, VAR_DOMAIN, 0);

       cur_fdr = save_cur_fdr;
 #else
       s = mylookup_symbol
        (sh_name,
         BLOCKVECTOR_BLOCK (BLOCKVECTOR (search_symtab), STATIC_BLOCK),
       cur_fdr = save_cur_fdr;
 #else
       s = mylookup_symbol
        (sh_name,
         BLOCKVECTOR_BLOCK (BLOCKVECTOR (search_symtab), STATIC_BLOCK),

-        VAR_NAMESPACE,
+        VAR_DOMAIN,

         LOC_BLOCK);
 #endif
     }
   else
     s = mylookup_symbol (sh_name, top_stack->cur_block,
         LOC_BLOCK);
 #endif
     }
   else
     s = mylookup_symbol (sh_name, top_stack->cur_block,

-                        VAR_NAMESPACE, LOC_BLOCK);
+                        VAR_DOMAIN, LOC_BLOCK);

 
   if (s != 0)
     {
 
   if (s != 0)
     {


@@ -1938,17 +1894,17 @@ parse_procedure (PDR *pr, struct symtab *search_symtab,
     }
   else
     {
     }
   else
     {

-      complaint (&symfile_complaints, "PDR for %s, but no symbol", sh_name);
+      complaint (&symfile_complaints, _("PDR for %s, but no symbol"), sh_name);

 #if 1
       return;
 #else
 /* FIXME -- delete.  We can't do symbol allocation now; it's all done.  */
       s = new_symbol (sh_name);
 #if 1
       return;
 #else
 /* FIXME -- delete.  We can't do symbol allocation now; it's all done.  */
       s = new_symbol (sh_name);

-      SYMBOL_NAMESPACE (s) = VAR_NAMESPACE;
+      SYMBOL_DOMAIN (s) = VAR_DOMAIN;

       SYMBOL_CLASS (s) = LOC_BLOCK;
       /* Donno its type, hope int is ok */
       SYMBOL_TYPE (s) = lookup_function_type (mdebug_type_int);
       SYMBOL_CLASS (s) = LOC_BLOCK;
       /* Donno its type, hope int is ok */
       SYMBOL_TYPE (s) = lookup_function_type (mdebug_type_int);

-      add_symbol (s, top_stack->cur_block);
+      add_symbol (s, top_stack->cur_st, top_stack->cur_block);

       /* Wont have symbols for this one */
       b = new_block (2);
       SYMBOL_BLOCK_VALUE (s) = b;
       /* Wont have symbols for this one */
       b = new_block (2);
       SYMBOL_BLOCK_VALUE (s) = b;


@@ -1962,11 +1918,11 @@ parse_procedure (PDR *pr, struct symtab *search_symtab,
 #endif
     }
 
 #endif
     }
 

-  i = mylookup_symbol (MIPS_EFI_SYMBOL_NAME, b, LABEL_NAMESPACE, LOC_CONST);
+  i = mylookup_symbol (MDEBUG_EFI_SYMBOL_NAME, b, LABEL_DOMAIN, LOC_CONST);

 
   if (i)
     {
 
   if (i)
     {

-      e = (struct mips_extra_func_info *) SYMBOL_VALUE (i);
+      e = (struct mdebug_extra_func_info *) SYMBOL_VALUE (i);

       e->pdr = *pr;
       e->pdr.isym = (long) s;
 
       e->pdr = *pr;
       e->pdr.isym = (long) s;
 


@@ -1981,16 +1937,6 @@ parse_procedure (PDR *pr, struct symtab *search_symtab,
          To work around these problems, we replace e->pdr.adr with
          the start address of the function.  */
       e->pdr.adr = BLOCK_START (b);
          To work around these problems, we replace e->pdr.adr with
          the start address of the function.  */
       e->pdr.adr = BLOCK_START (b);

-
-      /* Correct incorrect setjmp procedure descriptor from the library
-         to make backtrace through setjmp work.  */
-      if (e->pdr.pcreg == 0 && STREQ (sh_name, "setjmp"))
-       {
-         complaint (&symfile_complaints, "fixing bad setjmp PDR from libc");
-         e->pdr.pcreg = RA_REGNUM;
-         e->pdr.regmask = 0x80000000;
-         e->pdr.regoffset = -4;
-       }

     }
 
   /* It would be reasonable that functions that have been compiled
     }
 
   /* It would be reasonable that functions that have been compiled


@@ -2011,19 +1957,7 @@ parse_procedure (PDR *pr, struct symtab *search_symtab,
   if (processing_gcc_compilation == 0
       && found_ecoff_debugging_info == 0
       && TYPE_CODE (TYPE_TARGET_TYPE (SYMBOL_TYPE (s))) == TYPE_CODE_VOID)
   if (processing_gcc_compilation == 0
       && found_ecoff_debugging_info == 0
       && TYPE_CODE (TYPE_TARGET_TYPE (SYMBOL_TYPE (s))) == TYPE_CODE_VOID)

-    SYMBOL_TYPE (s) = nodebug_func_symbol_type;
-}
-
-/* Relocate the extra function info pointed to by the symbol table.  */
-
-void
-ecoff_relocate_efi (struct symbol *sym, CORE_ADDR delta)
-{
-  struct mips_extra_func_info *e;
-
-  e = (struct mips_extra_func_info *) SYMBOL_VALUE (sym);
-
-  e->pdr.adr += delta;
+    SYMBOL_TYPE (s) = builtin_type (gdbarch)->nodebug_text_symbol;

 }
 
 /* Parse the external symbol ES. Just call parse_symbol() after
 }
 
 /* Parse the external symbol ES. Just call parse_symbol() after


@@ -2083,7 +2017,7 @@ parse_external (EXTR *es, int bigend, struct section_offsets *section_offsets,
       n_undef_symbols++;
       /* FIXME:  Turn this into a complaint? */
       if (info_verbose)
       n_undef_symbols++;
       /* FIXME:  Turn this into a complaint? */
       if (info_verbose)

-       printf_filtered ("Warning: %s `%s' is undefined (in %s)\n",
+       printf_filtered (_("Warning: %s `%s' is undefined (in %s)\n"),

                         what, debug_info->ssext + es->asym.iss,
                         fdr_name (cur_fdr));
       return;
                         what, debug_info->ssext + es->asym.iss,
                         fdr_name (cur_fdr));
       return;


@@ -2184,7 +2118,7 @@ parse_lines (FDR *fh, PDR *pr, struct linetable *lt, int maxlines,
          if (lt->nitems >= maxlines)
            {
              complaint (&symfile_complaints,
          if (lt->nitems >= maxlines)
            {
              complaint (&symfile_complaints,

-                        "guessed size of linetable for %s incorrectly",
+                        _("guessed size of linetable for %s incorrectly"),

                         fdr_name (fh));
              break;
            }
                         fdr_name (fh));
              break;
            }


@@ -2198,16 +2132,96 @@ static void
 function_outside_compilation_unit_complaint (const char *arg1)
 {
   complaint (&symfile_complaints,
 function_outside_compilation_unit_complaint (const char *arg1)
 {
   complaint (&symfile_complaints,

-            "function `%s' appears to be defined outside of all compilation units",
+            _("function `%s' appears to be defined outside of all compilation units"),

             arg1);
 }
 
             arg1);
 }
 

+/* Use the STORAGE_CLASS to compute which section the given symbol
+   belongs to, and then records this new minimal symbol.  */
+
+static void
+record_minimal_symbol (const char *name, const CORE_ADDR address,
+                       enum minimal_symbol_type ms_type, int storage_class,
+                       struct objfile *objfile)
+{
+  int section;
+  asection *bfd_section;
+
+  switch (storage_class)
+    {
+      case scText:
+        section = SECT_OFF_TEXT (objfile);
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".text");
+        break;
+      case scData:
+        section = SECT_OFF_DATA (objfile);
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".data");
+        break;
+      case scBss:
+        section = SECT_OFF_BSS (objfile);
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".bss");
+        break;
+      case scSData:
+        section = get_section_index (objfile, ".sdata");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".sdata");
+        break;
+      case scSBss:
+        section = get_section_index (objfile, ".sbss");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".sbss");
+        break;
+      case scRData:
+        section = get_section_index (objfile, ".rdata");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".rdata");
+        break;
+      case scInit:
+        section = get_section_index (objfile, ".init");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".init");
+        break;
+      case scXData:
+        section = get_section_index (objfile, ".xdata");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".xdata");
+        break;
+      case scPData:
+        section = get_section_index (objfile, ".pdata");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".pdata");
+        break;
+      case scFini:
+        section = get_section_index (objfile, ".fini");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".fini");
+        break;
+      case scRConst:
+        section = get_section_index (objfile, ".rconst");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".rconst");
+        break;
+#ifdef scTlsData
+      case scTlsData:
+        section = get_section_index (objfile, ".tlsdata");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".tlsdata");
+        break;
+#endif
+#ifdef scTlsBss
+      case scTlsBss:
+        section = get_section_index (objfile, ".tlsbss");
+        bfd_section = bfd_get_section_by_name (cur_bfd, ".tlsbss");
+        break;
+#endif
+      default:
+        /* This kind of symbol is not associated to a section.  */
+        section = -1;
+        bfd_section = NULL;
+    }
+
+  prim_record_minimal_symbol_and_info (name, address, ms_type, NULL,
+                                       section, bfd_section, objfile);
+}
+

 /* Master parsing procedure for first-pass reading of file symbols
    into a partial_symtab.  */
 
 static void
 parse_partial_symbols (struct objfile *objfile)
 {
 /* Master parsing procedure for first-pass reading of file symbols
    into a partial_symtab.  */
 
 static void
 parse_partial_symbols (struct objfile *objfile)
 {

+  struct gdbarch *gdbarch = get_objfile_arch (objfile);

   const bfd_size_type external_sym_size = debug_swap->external_sym_size;
   const bfd_size_type external_rfd_size = debug_swap->external_rfd_size;
   const bfd_size_type external_ext_size = debug_swap->external_ext_size;
   const bfd_size_type external_sym_size = debug_swap->external_sym_size;
   const bfd_size_type external_rfd_size = debug_swap->external_rfd_size;
   const bfd_size_type external_ext_size = debug_swap->external_ext_size;


@@ -2221,7 +2235,7 @@ parse_partial_symbols (struct objfile *objfile)
   char *ext_out;
   char *ext_out_end;
   EXTR *ext_block;
   char *ext_out;
   char *ext_out_end;
   EXTR *ext_block;

-  register EXTR *ext_in;
+  EXTR *ext_in;

   EXTR *ext_in_end;
   SYMR sh;
   struct partial_symtab *pst;
   EXTR *ext_in_end;
   SYMR sh;
   struct partial_symtab *pst;


@@ -2254,7 +2268,7 @@ parse_partial_symbols (struct objfile *objfile)
       && (bfd_get_section_flags (cur_bfd, text_sect) & SEC_RELOC))
     relocatable = 1;
 
       && (bfd_get_section_flags (cur_bfd, text_sect) & SEC_RELOC))
     relocatable = 1;
 

-  extern_tab = (EXTR *) obstack_alloc (&objfile->psymbol_obstack,
+  extern_tab = (EXTR *) obstack_alloc (&objfile->objfile_obstack,

                                       sizeof (EXTR) * hdr->iextMax);
 
   includes_allocated = 30;
                                       sizeof (EXTR) * hdr->iextMax);
 
   includes_allocated = 30;


@@ -2298,7 +2312,7 @@ parse_partial_symbols (struct objfile *objfile)
   /* Allocate the global pending list.  */
   pending_list =
     ((struct mdebug_pending **)
   /* Allocate the global pending list.  */
   pending_list =
     ((struct mdebug_pending **)

-     obstack_alloc (&objfile->psymbol_obstack,
+     obstack_alloc (&objfile->objfile_obstack,

                    hdr->ifdMax * sizeof (struct mdebug_pending *)));
   memset (pending_list, 0,
          hdr->ifdMax * sizeof (struct mdebug_pending *));
                    hdr->ifdMax * sizeof (struct mdebug_pending *)));
   memset (pending_list, 0,
          hdr->ifdMax * sizeof (struct mdebug_pending *));


@@ -2379,14 +2393,14 @@ parse_partial_symbols (struct objfile *objfile)
       if (ext_in->ifd < -1 || ext_in->ifd >= hdr->ifdMax)
        {
          complaint (&symfile_complaints,
       if (ext_in->ifd < -1 || ext_in->ifd >= hdr->ifdMax)
        {
          complaint (&symfile_complaints,

-                    "bad ifd for external symbol: %d (max %ld)", ext_in->ifd,
+                    _("bad ifd for external symbol: %d (max %ld)"), ext_in->ifd,

                     hdr->ifdMax);
          continue;
        }
       if (ext_in->asym.iss < 0 || ext_in->asym.iss >= hdr->issExtMax)
        {
          complaint (&symfile_complaints,
                     hdr->ifdMax);
          continue;
        }
       if (ext_in->asym.iss < 0 || ext_in->asym.iss >= hdr->issExtMax)
        {
          complaint (&symfile_complaints,

-                    "bad iss for external symbol: %ld (max %ld)",
+                    _("bad iss for external symbol: %ld (max %ld)"),

                     ext_in->asym.iss, hdr->issExtMax);
          continue;
        }
                     ext_in->asym.iss, hdr->issExtMax);
          continue;
        }


@@ -2516,7 +2530,8 @@ parse_partial_symbols (struct objfile *objfile)
          unknown_ext_complaint (name);
        }
       if (!ECOFF_IN_ELF (cur_bfd))
          unknown_ext_complaint (name);
        }
       if (!ECOFF_IN_ELF (cur_bfd))

-       prim_record_minimal_symbol (name, svalue, ms_type, objfile);
+        record_minimal_symbol (name, svalue, ms_type, ext_in->asym.sc,
+                               objfile);

     }
 
   /* Pass 3 over files, over local syms: fill in static symbols */
     }
 
   /* Pass 3 over files, over local syms: fill in static symbols */


@@ -2550,7 +2565,7 @@ parse_partial_symbols (struct objfile *objfile)
                                  objfile->global_psymbols.next,
                                  objfile->static_psymbols.next);
       pst->read_symtab_private = ((char *)
                                  objfile->global_psymbols.next,
                                  objfile->static_psymbols.next);
       pst->read_symtab_private = ((char *)

-                                 obstack_alloc (&objfile->psymbol_obstack,
+                                 obstack_alloc (&objfile->objfile_obstack,

                                                 sizeof (struct symloc)));
       memset (pst->read_symtab_private, 0, sizeof (struct symloc));
 
                                                 sizeof (struct symloc)));
       memset (pst->read_symtab_private, 0, sizeof (struct symloc));
 


@@ -2605,7 +2620,8 @@ parse_partial_symbols (struct objfile *objfile)
                          ((char *) debug_info->external_sym
                           + (fh->isymBase + 1) * external_sym_size),
                          &sh);
                          ((char *) debug_info->external_sym
                           + (fh->isymBase + 1) * external_sym_size),
                          &sh);

-         if (STREQ (debug_info->ss + fh->issBase + sh.iss, stabs_symbol))
+         if (strcmp (debug_info->ss + fh->issBase + sh.iss,
+                     stabs_symbol) == 0)

            processing_gcc_compilation = 2;
        }
 
            processing_gcc_compilation = 2;
        }
 


@@ -2632,13 +2648,9 @@ parse_partial_symbols (struct objfile *objfile)
                      if (sh.st == stStaticProc)
                        {
                          namestring = debug_info->ss + fh->issBase + sh.iss;
                      if (sh.st == stStaticProc)
                        {
                          namestring = debug_info->ss + fh->issBase + sh.iss;

-                         prim_record_minimal_symbol_and_info (namestring,
-                                                              sh.value,
-                                                              mst_file_text,
-                                                              NULL,
-                                                              SECT_OFF_TEXT (objfile),
-                                                              NULL,
-                                                              objfile);
+                          record_minimal_symbol (namestring, sh.value,
+                                                 mst_file_text, sh.sc,
+                                                 objfile);

                        }
                      procaddr = sh.value;
 
                        }
                      procaddr = sh.value;
 


@@ -2680,13 +2692,9 @@ parse_partial_symbols (struct objfile *objfile)
                        case scXData:
                          namestring = debug_info->ss + fh->issBase + sh.iss;
                          sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile));
                        case scXData:
                          namestring = debug_info->ss + fh->issBase + sh.iss;
                          sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile));

-                         prim_record_minimal_symbol_and_info (namestring,
-                                                              sh.value,
-                                                              mst_file_data,
-                                                              NULL,
-                                                              SECT_OFF_DATA (objfile),
-                                                              NULL,
-                                                              objfile);
+                          record_minimal_symbol (namestring, sh.value,
+                                                 mst_file_data, sh.sc,
+                                                 objfile);

                          break;
 
                        default:
                          break;
 
                        default:


@@ -2694,13 +2702,9 @@ parse_partial_symbols (struct objfile *objfile)
                             then have the default be abs? */
                          namestring = debug_info->ss + fh->issBase + sh.iss;
                          sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_BSS (objfile));
                             then have the default be abs? */
                          namestring = debug_info->ss + fh->issBase + sh.iss;
                          sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_BSS (objfile));

-                         prim_record_minimal_symbol_and_info (namestring,
-                                                              sh.value,
-                                                              mst_file_bss,
-                                                              NULL,
-                                                              SECT_OFF_BSS (objfile),
-                                                              NULL,
-                                                              objfile);
+                          record_minimal_symbol (namestring, sh.value,
+                                                 mst_file_bss, sh.sc,
+                                                 objfile);

                          break;
                        }
                    }
                          break;
                        }
                    }


@@ -2836,21 +2840,19 @@ parse_partial_symbols (struct objfile *objfile)
 
                      prev_textlow_not_set = textlow_not_set;
 
 
                      prev_textlow_not_set = textlow_not_set;
 

-#ifdef SOFUN_ADDRESS_MAYBE_MISSING

                      /* A zero value is probably an indication for the SunPRO 3.0
                         compiler. end_psymtab explicitly tests for zero, so
                         don't relocate it.  */
 
                      /* A zero value is probably an indication for the SunPRO 3.0
                         compiler. end_psymtab explicitly tests for zero, so
                         don't relocate it.  */
 

-                     if (sh.value == 0)
+                     if (sh.value == 0
+                         && gdbarch_sofun_address_maybe_missing (gdbarch))

                        {
                          textlow_not_set = 1;
                          valu = 0;
                        }
                      else
                        textlow_not_set = 0;
                        {
                          textlow_not_set = 1;
                          valu = 0;
                        }
                      else
                        textlow_not_set = 0;

-#else
-                     textlow_not_set = 0;
-#endif
+

                      past_first_source_file = 1;
 
                      if (prev_so_symnum != symnum - 1)
                      past_first_source_file = 1;
 
                      if (prev_so_symnum != symnum - 1)


@@ -2926,12 +2928,13 @@ parse_partial_symbols (struct objfile *objfile)
                         things like "break c-exp.y:435" need to work (I
                         suppose the psymtab_include_list could be hashed or put
                         in a binary tree, if profiling shows this is a major hog).  */
                         things like "break c-exp.y:435" need to work (I
                         suppose the psymtab_include_list could be hashed or put
                         in a binary tree, if profiling shows this is a major hog).  */

-                     if (pst && STREQ (namestring, pst->filename))
+                     if (pst && strcmp (namestring, pst->filename) == 0)

                        continue;
                      {
                        continue;
                      {

-                       register int i;
+                       int i;

                        for (i = 0; i < includes_used; i++)
                        for (i = 0; i < includes_used; i++)

-                         if (STREQ (namestring, psymtab_include_list[i]))
+                         if (strcmp (namestring,
+                                     psymtab_include_list[i]) == 0)

                            {
                              i = -1;
                              break;
                            {
                              i = -1;
                              break;


@@ -2948,7 +2951,7 @@ parse_partial_symbols (struct objfile *objfile)
                          psymtab_include_list = (char **)
                            alloca ((includes_allocated *= 2) *
                                    sizeof (char *));
                          psymtab_include_list = (char **)
                            alloca ((includes_allocated *= 2) *
                                    sizeof (char *));

-                         memcpy ((PTR) psymtab_include_list, (PTR) orig,
+                         memcpy (psymtab_include_list, orig,

                                  includes_used * sizeof (char *));
                        }
                      continue;
                                  includes_used * sizeof (char *));
                        }
                      continue;


@@ -2990,11 +2993,13 @@ parse_partial_symbols (struct objfile *objfile)
                      {
                      case 'S':
                        sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile));
                      {
                      case 'S':
                        sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile));

-#ifdef STATIC_TRANSFORM_NAME
-                       namestring = STATIC_TRANSFORM_NAME (namestring);
-#endif
+
+                       if (gdbarch_static_transform_name_p (gdbarch))
+                         namestring = gdbarch_static_transform_name
+                                        (gdbarch, namestring);
+

                        add_psymbol_to_list (namestring, p - namestring,
                        add_psymbol_to_list (namestring, p - namestring,

-                                            VAR_NAMESPACE, LOC_STATIC,
+                                            VAR_DOMAIN, LOC_STATIC,

                                             &objfile->static_psymbols,
                                             0, sh.value,
                                             psymtab_language, objfile);
                                             &objfile->static_psymbols,
                                             0, sh.value,
                                             psymtab_language, objfile);


@@ -3004,7 +3009,7 @@ parse_partial_symbols (struct objfile *objfile)
                        /* The addresses in these entries are reported to be
                           wrong.  See the code that reads 'G's for symtabs. */
                        add_psymbol_to_list (namestring, p - namestring,
                        /* The addresses in these entries are reported to be
                           wrong.  See the code that reads 'G's for symtabs. */
                        add_psymbol_to_list (namestring, p - namestring,

-                                            VAR_NAMESPACE, LOC_STATIC,
+                                            VAR_DOMAIN, LOC_STATIC,

                                             &objfile->global_psymbols,
                                             0, sh.value,
                                             psymtab_language, objfile);
                                             &objfile->global_psymbols,
                                             0, sh.value,
                                             psymtab_language, objfile);


@@ -3022,7 +3027,7 @@ parse_partial_symbols (struct objfile *objfile)
                                && namestring[0] != ' '))
                          {
                            add_psymbol_to_list (namestring, p - namestring,
                                && namestring[0] != ' '))
                          {
                            add_psymbol_to_list (namestring, p - namestring,

-                                                STRUCT_NAMESPACE, LOC_TYPEDEF,
+                                                STRUCT_DOMAIN, LOC_TYPEDEF,

                                                 &objfile->static_psymbols,
                                                 sh.value, 0,
                                                 psymtab_language, objfile);
                                                 &objfile->static_psymbols,
                                                 sh.value, 0,
                                                 psymtab_language, objfile);


@@ -3030,33 +3035,19 @@ parse_partial_symbols (struct objfile *objfile)
                              {
                                /* Also a typedef with the same name.  */
                                add_psymbol_to_list (namestring, p - namestring,
                              {
                                /* Also a typedef with the same name.  */
                                add_psymbol_to_list (namestring, p - namestring,

-                                                    VAR_NAMESPACE, LOC_TYPEDEF,
+                                                    VAR_DOMAIN, LOC_TYPEDEF,

                                                     &objfile->static_psymbols,
                                                     sh.value, 0,
                                                     psymtab_language, objfile);
                                p += 1;
                              }
                                                     &objfile->static_psymbols,
                                                     sh.value, 0,
                                                     psymtab_language, objfile);
                                p += 1;
                              }

-                           /* The semantics of C++ state that "struct foo { ... }"
-                              also defines a typedef for "foo".  Unfortuantely, cfront
-                              never makes the typedef when translating from C++ to C.
-                              We make the typedef here so that "ptype foo" works as
-                              expected for cfront translated code.  */
-                           else if (psymtab_language == language_cplus)
-                             {
-                               /* Also a typedef with the same name.  */
-                               add_psymbol_to_list (namestring, p - namestring,
-                                                    VAR_NAMESPACE, LOC_TYPEDEF,
-                                                    &objfile->static_psymbols,
-                                                    sh.value, 0,
-                                                    psymtab_language, objfile);
-                             }

                          }
                        goto check_enum;
                      case 't':
                        if (p != namestring)    /* a name is there, not just :T... */
                          {
                            add_psymbol_to_list (namestring, p - namestring,
                          }
                        goto check_enum;
                      case 't':
                        if (p != namestring)    /* a name is there, not just :T... */
                          {
                            add_psymbol_to_list (namestring, p - namestring,

-                                                VAR_NAMESPACE, LOC_TYPEDEF,
+                                                VAR_DOMAIN, LOC_TYPEDEF,

                                                 &objfile->static_psymbols,
                                                 sh.value, 0,
                                                 psymtab_language, objfile);
                                                 &objfile->static_psymbols,
                                                 sh.value, 0,
                                                 psymtab_language, objfile);


@@ -3118,7 +3109,7 @@ parse_partial_symbols (struct objfile *objfile)
                                /* Note that the value doesn't matter for
                                   enum constants in psymtabs, just in symtabs.  */
                                add_psymbol_to_list (p, q - p,
                                /* Note that the value doesn't matter for
                                   enum constants in psymtabs, just in symtabs.  */
                                add_psymbol_to_list (p, q - p,

-                                                    VAR_NAMESPACE, LOC_CONST,
+                                                    VAR_DOMAIN, LOC_CONST,

                                                     &objfile->static_psymbols, 0,
                                                     0, psymtab_language, objfile);
                                /* Point past the name.  */
                                                     &objfile->static_psymbols, 0,
                                                     0, psymtab_language, objfile);
                                /* Point past the name.  */


@@ -3135,7 +3126,7 @@ parse_partial_symbols (struct objfile *objfile)
                      case 'c':
                        /* Constant, e.g. from "const" in Pascal.  */
                        add_psymbol_to_list (namestring, p - namestring,
                      case 'c':
                        /* Constant, e.g. from "const" in Pascal.  */
                        add_psymbol_to_list (namestring, p - namestring,

-                                            VAR_NAMESPACE, LOC_CONST,
+                                            VAR_DOMAIN, LOC_CONST,

                                             &objfile->static_psymbols, sh.value,
                                             0, psymtab_language, objfile);
                        continue;
                                             &objfile->static_psymbols, sh.value,
                                             0, psymtab_language, objfile);
                        continue;


@@ -3152,7 +3143,7 @@ parse_partial_symbols (struct objfile *objfile)
                          }
                        sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
                        add_psymbol_to_list (namestring, p - namestring,
                          }
                        sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
                        add_psymbol_to_list (namestring, p - namestring,

-                                            VAR_NAMESPACE, LOC_BLOCK,
+                                            VAR_DOMAIN, LOC_BLOCK,

                                             &objfile->static_psymbols,
                                             0, sh.value,
                                             psymtab_language, objfile);
                                             &objfile->static_psymbols,
                                             0, sh.value,
                                             psymtab_language, objfile);


@@ -3173,7 +3164,7 @@ parse_partial_symbols (struct objfile *objfile)
                          }
                        sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
                        add_psymbol_to_list (namestring, p - namestring,
                          }
                        sh.value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
                        add_psymbol_to_list (namestring, p - namestring,

-                                            VAR_NAMESPACE, LOC_BLOCK,
+                                            VAR_DOMAIN, LOC_BLOCK,

                                             &objfile->global_psymbols,
                                             0, sh.value,
                                             psymtab_language, objfile);
                                             &objfile->global_psymbols,
                                             0, sh.value,
                                             psymtab_language, objfile);


@@ -3196,9 +3187,6 @@ parse_partial_symbols (struct objfile *objfile)
                      case '9':
                      case '-':
                      case '#':         /* for symbol identification (used in live ranges) */
                      case '9':
                      case '-':
                      case '#':         /* for symbol identification (used in live ranges) */

-                       /* added to support cfront stabs strings */
-                     case 'Z':         /* for definition continuations */
-                     case 'P':         /* for prototypes */

                        continue;
 
                      case ':':
                        continue;
 
                      case ':':


@@ -3220,7 +3208,7 @@ parse_partial_symbols (struct objfile *objfile)
                           a backslash.  */
 
                        complaint (&symfile_complaints,
                           a backslash.  */
 
                        complaint (&symfile_complaints,

-                                  "unknown symbol descriptor `%c'", p[1]);
+                                  _("unknown symbol descriptor `%c'"), p[1]);

 
                        /* Ignore it; perhaps it is an extension that we don't
                           know about.  */
 
                        /* Ignore it; perhaps it is an extension that we don't
                           know about.  */


@@ -3231,19 +3219,18 @@ parse_partial_symbols (struct objfile *objfile)
                    continue;
 
                  case N_ENDM:
                    continue;
 
                  case N_ENDM:

-#ifdef SOFUN_ADDRESS_MAYBE_MISSING

                    /* Solaris 2 end of module, finish current partial
                       symbol table.  END_PSYMTAB will set
                       pst->texthigh to the proper value, which is
                       necessary if a module compiled without
                       debugging info follows this module.  */
                    /* Solaris 2 end of module, finish current partial
                       symbol table.  END_PSYMTAB will set
                       pst->texthigh to the proper value, which is
                       necessary if a module compiled without
                       debugging info follows this module.  */

-                   if (pst)
+                   if (pst
+                       && gdbarch_sofun_address_maybe_missing (gdbarch))

                      {
                        pst = (struct partial_symtab *) 0;
                        includes_used = 0;
                        dependencies_used = 0;
                      }
                      {
                        pst = (struct partial_symtab *) 0;
                        includes_used = 0;
                        dependencies_used = 0;
                      }

-#endif

                    continue;
 
                  case N_RBRAC:
                    continue;
 
                  case N_RBRAC:


@@ -3281,8 +3268,8 @@ parse_partial_symbols (struct objfile *objfile)
                  default:
                    /* If we haven't found it yet, ignore it.  It's probably some
                       new type we don't know about yet.  */
                  default:
                    /* If we haven't found it yet, ignore it.  It's probably some
                       new type we don't know about yet.  */

-                   complaint (&symfile_complaints, "unknown symbol type %s",
-                              local_hex_string (type_code)); /*CUR_SYMBOL_TYPE*/
+                   complaint (&symfile_complaints, _("unknown symbol type %s"),
+                              hex_string (type_code)); /*CUR_SYMBOL_TYPE*/

                    continue;
                  }
                if (stabstring
                    continue;
                  }
                if (stabstring


@@ -3378,7 +3365,7 @@ parse_partial_symbols (struct objfile *objfile)
                    {
                      /* This should not happen either... FIXME.  */
                      complaint (&symfile_complaints,
                    {
                      /* This should not happen either... FIXME.  */
                      complaint (&symfile_complaints,

-                                "bad proc end in aux found from symbol %s",
+                                _("bad proc end in aux found from symbol %s"),

                                 name);
                      new_sdx = cur_sdx + 1;    /* Don't skip backward */
                    }
                                 name);
                      new_sdx = cur_sdx + 1;    /* Don't skip backward */
                    }


@@ -3406,12 +3393,12 @@ parse_partial_symbols (struct objfile *objfile)
                     symbol table.  */
                  if (sh.st == stProc)
                    add_psymbol_to_list (name, strlen (name),
                     symbol table.  */
                  if (sh.st == stProc)
                    add_psymbol_to_list (name, strlen (name),

-                                        VAR_NAMESPACE, LOC_BLOCK,
+                                        VAR_DOMAIN, LOC_BLOCK,

                                         &objfile->global_psymbols,
                                    0, sh.value, psymtab_language, objfile);
                  else
                    add_psymbol_to_list (name, strlen (name),
                                         &objfile->global_psymbols,
                                    0, sh.value, psymtab_language, objfile);
                  else
                    add_psymbol_to_list (name, strlen (name),

-                                        VAR_NAMESPACE, LOC_BLOCK,
+                                        VAR_DOMAIN, LOC_BLOCK,

                                         &objfile->static_psymbols,
                                    0, sh.value, psymtab_language, objfile);
 
                                         &objfile->static_psymbols,
                                    0, sh.value, psymtab_language, objfile);
 


@@ -3480,7 +3467,7 @@ parse_partial_symbols (struct objfile *objfile)
                      && sh.index != cur_sdx + 2)
                    {
                      add_psymbol_to_list (name, strlen (name),
                      && sh.index != cur_sdx + 2)
                    {
                      add_psymbol_to_list (name, strlen (name),

-                                          STRUCT_NAMESPACE, LOC_TYPEDEF,
+                                          STRUCT_DOMAIN, LOC_TYPEDEF,

                                           &objfile->static_psymbols,
                                           0, (CORE_ADDR) 0,
                                           psymtab_language, objfile);
                                           &objfile->static_psymbols,
                                           0, (CORE_ADDR) 0,
                                           psymtab_language, objfile);


@@ -3493,7 +3480,7 @@ parse_partial_symbols (struct objfile *objfile)
                    {
                      /* This happens with the Ultrix kernel. */
                      complaint (&symfile_complaints,
                    {
                      /* This happens with the Ultrix kernel. */
                      complaint (&symfile_complaints,

-                                "bad aux index at block symbol %s", name);
+                                _("bad aux index at block symbol %s"), name);

                      new_sdx = cur_sdx + 1;    /* Don't skip backward */
                    }
                  cur_sdx = new_sdx;
                      new_sdx = cur_sdx + 1;    /* Don't skip backward */
                    }
                  cur_sdx = new_sdx;


@@ -3513,15 +3500,15 @@ parse_partial_symbols (struct objfile *objfile)
                default:
                  /* Both complaints are valid:  one gives symbol name,
                     the other the offending symbol type.  */
                default:
                  /* Both complaints are valid:  one gives symbol name,
                     the other the offending symbol type.  */

-                 complaint (&symfile_complaints, "unknown local symbol %s",
+                 complaint (&symfile_complaints, _("unknown local symbol %s"),

                             name);
                             name);

-                 complaint (&symfile_complaints, "with type %d", sh.st);
+                 complaint (&symfile_complaints, _("with type %d"), sh.st);

                  cur_sdx++;
                  continue;
                }
              /* Use this gdb symbol */
              add_psymbol_to_list (name, strlen (name),
                  cur_sdx++;
                  continue;
                }
              /* Use this gdb symbol */
              add_psymbol_to_list (name, strlen (name),

-                                  VAR_NAMESPACE, class,
+                                  VAR_DOMAIN, class,

                                   &objfile->static_psymbols,
                                   0, sh.value, psymtab_language, objfile);
            skip:
                                   &objfile->static_psymbols,
                                   0, sh.value, psymtab_language, objfile);
            skip:


@@ -3541,7 +3528,7 @@ parse_partial_symbols (struct objfile *objfile)
              CORE_ADDR svalue;
 
              if (ext_ptr->ifd != f_idx)
              CORE_ADDR svalue;
 
              if (ext_ptr->ifd != f_idx)

-               internal_error (__FILE__, __LINE__, "failed internal consistency check");
+               internal_error (__FILE__, __LINE__, _("failed internal consistency check"));

              psh = &ext_ptr->asym;
 
              /* Do not add undefined symbols to the partial symbol table.  */
              psh = &ext_ptr->asym;
 
              /* Do not add undefined symbols to the partial symbol table.  */


@@ -3597,7 +3584,7 @@ parse_partial_symbols (struct objfile *objfile)
                }
              name = debug_info->ssext + psh->iss;
              add_psymbol_to_list (name, strlen (name),
                }
              name = debug_info->ssext + psh->iss;
              add_psymbol_to_list (name, strlen (name),

-                                  VAR_NAMESPACE, class,
+                                  VAR_DOMAIN, class,

                                   &objfile->global_psymbols,
                                   0, svalue,
                                   psymtab_language, objfile);
                                   &objfile->global_psymbols,
                                   0, svalue,
                                   psymtab_language, objfile);


@@ -3613,13 +3600,6 @@ parse_partial_symbols (struct objfile *objfile)
       includes_used = 0;
       dependencies_used = 0;
 
       includes_used = 0;
       dependencies_used = 0;
 

-      if (objfile->ei.entry_point >= save_pst->textlow &&
-         objfile->ei.entry_point < save_pst->texthigh)
-       {
-         objfile->ei.entry_file_lowpc = save_pst->textlow;
-         objfile->ei.entry_file_highpc = save_pst->texthigh;
-       }
-

       /* The objfile has its functions reordered if this partial symbol
          table overlaps any other partial symbol table.
          We cannot assume a reordered objfile if a partial symbol table
       /* The objfile has its functions reordered if this partial symbol
          table overlaps any other partial symbol table.
          We cannot assume a reordered objfile if a partial symbol table


@@ -3668,7 +3648,7 @@ parse_partial_symbols (struct objfile *objfile)
       pst->number_of_dependencies = 0;
       pst->dependencies =
        ((struct partial_symtab **)
       pst->number_of_dependencies = 0;
       pst->dependencies =
        ((struct partial_symtab **)

-        obstack_alloc (&objfile->psymbol_obstack,
+        obstack_alloc (&objfile->objfile_obstack,

                        ((fh->crfd - 1)
                         * sizeof (struct partial_symtab *))));
       for (s_idx = 1; s_idx < fh->crfd; s_idx++)
                        ((fh->crfd - 1)
                         * sizeof (struct partial_symtab *))));
       for (s_idx = 1; s_idx < fh->crfd; s_idx++)


@@ -3681,7 +3661,7 @@ parse_partial_symbols (struct objfile *objfile)
                          &rh);
          if (rh < 0 || rh >= hdr->ifdMax)
            {
                          &rh);
          if (rh < 0 || rh >= hdr->ifdMax)
            {

-             complaint (&symfile_complaints, "bad file number %ld", rh);
+             complaint (&symfile_complaints, _("bad file number %ld"), rh);

              continue;
            }
 
              continue;
            }
 


@@ -3767,7 +3747,7 @@ handle_psymbol_enumerators (struct objfile *objfile, FDR *fh, int stype,
       /* Note that the value doesn't matter for enum constants
          in psymtabs, just in symtabs.  */
       add_psymbol_to_list (name, strlen (name),
       /* Note that the value doesn't matter for enum constants
          in psymtabs, just in symtabs.  */
       add_psymbol_to_list (name, strlen (name),

-                          VAR_NAMESPACE, LOC_CONST,
+                          VAR_DOMAIN, LOC_CONST,

                           &objfile->static_psymbols, 0,
                           (CORE_ADDR) 0, psymtab_language, objfile);
       ext_sym += external_sym_size;
                           &objfile->static_psymbols, 0,
                           (CORE_ADDR) 0, psymtab_language, objfile);
       ext_sym += external_sym_size;


@@ -3875,8 +3855,8 @@ psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename)
                      ((char *) debug_info->external_sym
                       + (fh->isymBase + 1) * external_sym_size),
                      &sh);
                      ((char *) debug_info->external_sym
                       + (fh->isymBase + 1) * external_sym_size),
                      &sh);

-      if (STREQ (debug_info->ss + fh->issBase + sh.iss,
-                stabs_symbol))
+      if (strcmp (debug_info->ss + fh->issBase + sh.iss,
+                 stabs_symbol) == 0)

        {
          /* We indicate that this is a GCC compilation so that certain
             features will be enabled in stabsread/dbxread.  */
        {
          /* We indicate that this is a GCC compilation so that certain
             features will be enabled in stabsread/dbxread.  */


@@ -3953,14 +3933,14 @@ psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename)
                {
                  /* Make up special symbol to contain
                     procedure specific info */
                {
                  /* Make up special symbol to contain
                     procedure specific info */

-                 struct mips_extra_func_info *e =
-                 ((struct mips_extra_func_info *)
-                  obstack_alloc (&current_objfile->symbol_obstack,
-                                 sizeof (struct mips_extra_func_info)));
-                 struct symbol *s = new_symbol (MIPS_EFI_SYMBOL_NAME);
-
-                 memset (e, 0, sizeof (struct mips_extra_func_info));
-                 SYMBOL_NAMESPACE (s) = LABEL_NAMESPACE;
+                 struct mdebug_extra_func_info *e =
+                 ((struct mdebug_extra_func_info *)
+                  obstack_alloc (&current_objfile->objfile_obstack,
+                                 sizeof (struct mdebug_extra_func_info)));
+                 struct symbol *s = new_symbol (MDEBUG_EFI_SYMBOL_NAME);
+
+                 memset (e, 0, sizeof (struct mdebug_extra_func_info));
+                 SYMBOL_DOMAIN (s) = LABEL_DOMAIN;

                  SYMBOL_CLASS (s) = LOC_CONST;
                  SYMBOL_TYPE (s) = mdebug_type_void;
                  SYMBOL_VALUE (s) = (long) e;
                  SYMBOL_CLASS (s) = LOC_CONST;
                  SYMBOL_TYPE (s) = mdebug_type_void;
                  SYMBOL_VALUE (s) = (long) e;


@@ -3988,7 +3968,7 @@ psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename)
            /* These are generated by gcc-2.x, do not complain */
            ;
          else
            /* These are generated by gcc-2.x, do not complain */
            ;
          else

-           complaint (&symfile_complaints, "unknown stabs symbol %s", name);
+           complaint (&symfile_complaints, _("unknown stabs symbol %s"), name);

        }
 
       if (! last_symtab_ended)
        }
 
       if (! last_symtab_ended)


@@ -3997,10 +3977,6 @@ psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename)
          end_stabs ();
        }
 
          end_stabs ();
        }
 

-      /* Sort the symbol table now, we are done adding symbols to it.
-         We must do this before parse_procedure calls lookup_symbol.  */
-      sort_symtab_syms (st);
-

       /* There used to be a call to sort_blocks here, but this should not
          be necessary for stabs symtabs.  And as sort_blocks modifies the
          start address of the GLOBAL_BLOCK to the FIRST_LOCAL_BLOCK,
       /* There used to be a call to sort_blocks here, but this should not
          be necessary for stabs symtabs.  And as sort_blocks modifies the
          start address of the GLOBAL_BLOCK to the FIRST_LOCAL_BLOCK,


@@ -4054,19 +4030,15 @@ psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename)
       int maxlines;
       EXTR *ext_ptr;
 
       int maxlines;
       EXTR *ext_ptr;
 

-      /* How many symbols will we need */
-      /* FIXME, this does not count enum values. */
-      f_max = pst->n_global_syms + pst->n_static_syms;

       if (fh == 0)
        {
          maxlines = 0;
       if (fh == 0)
        {
          maxlines = 0;

-         st = new_symtab ("unknown", f_max, 0, pst->objfile);
+         st = new_symtab ("unknown", 0, pst->objfile);

        }
       else
        {
        }
       else
        {

-         f_max += fh->csym + fh->cpd;

          maxlines = 2 * fh->cline;
          maxlines = 2 * fh->cline;

-         st = new_symtab (pst->filename, 2 * f_max, maxlines, pst->objfile);
+         st = new_symtab (pst->filename, maxlines, pst->objfile);

 
          /* The proper language was already determined when building
             the psymtab, use it.  */
 
          /* The proper language was already determined when building
             the psymtab, use it.  */


@@ -4086,7 +4058,6 @@ psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename)
       BLOCK_START (top_stack->cur_block) = pst->textlow;
       BLOCK_END (top_stack->cur_block) = 0;
       top_stack->blocktype = stFile;
       BLOCK_START (top_stack->cur_block) = pst->textlow;
       BLOCK_END (top_stack->cur_block) = 0;
       top_stack->blocktype = stFile;

-      top_stack->maxsyms = 2 * f_max;

       top_stack->cur_type = 0;
       top_stack->procadr = 0;
       top_stack->numargs = 0;
       top_stack->cur_type = 0;
       top_stack->procadr = 0;
       top_stack->numargs = 0;


@@ -4170,10 +4141,6 @@ psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename)
       top_stack->cur_block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (top_stack->cur_st),
                                                GLOBAL_BLOCK);
       top_stack->blocktype = stFile;
       top_stack->cur_block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (top_stack->cur_st),
                                                GLOBAL_BLOCK);
       top_stack->blocktype = stFile;

-      top_stack->maxsyms
-       = (debug_info->symbolic_header.isymMax
-          + debug_info->symbolic_header.ipdMax
-          + debug_info->symbolic_header.iextMax);

 
       ext_ptr = PST_PRIVATE (pst)->extern_tab;
       for (i = PST_PRIVATE (pst)->extern_count; --i >= 0; ext_ptr++)
 
       ext_ptr = PST_PRIVATE (pst)->extern_tab;
       for (i = PST_PRIVATE (pst)->extern_count; --i >= 0; ext_ptr++)


@@ -4184,7 +4151,7 @@ psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename)
          from a shared library, so tell the user only if verbose is on.  */
       if (info_verbose && n_undef_symbols)
        {
          from a shared library, so tell the user only if verbose is on.  */
       if (info_verbose && n_undef_symbols)
        {

-         printf_filtered ("File %s contains %d unresolved references:",
+         printf_filtered (_("File %s contains %d unresolved references:"),

                           st->filename, n_undef_symbols);
          printf_filtered ("\n\t%4d variables\n\t%4d procedures\n\t%4d labels\n",
                           n_undef_vars, n_undef_procs, n_undef_labels);
                           st->filename, n_undef_symbols);
          printf_filtered ("\n\t%4d variables\n\t%4d procedures\n\t%4d labels\n",
                           n_undef_vars, n_undef_procs, n_undef_labels);


@@ -4195,9 +4162,6 @@ psymtab_to_symtab_1 (struct partial_symtab *pst, char *filename)
 
       st->primary = 1;
 
 
       st->primary = 1;
 

-      /* Sort the symbol table now, we are done adding symbols to it. */
-      sort_symtab_syms (st);
-

       sort_blocks (st);
     }
 
       sort_blocks (st);
     }
 


@@ -4360,7 +4324,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, enum type_code type_cod
                                      &tir);
          if (tir.tq0 != tqNil)
            complaint (&symfile_complaints,
                                      &tir);
          if (tir.tq0 != tqNil)
            complaint (&symfile_complaints,

-                      "illegal tq0 in forward typedef for %s", sym_name);
+                      _("illegal tq0 in forward typedef for %s"), sym_name);

          switch (tir.bt)
            {
            case btVoid:
          switch (tir.bt)
            {
            case btVoid:


@@ -4398,7 +4362,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, enum type_code type_cod
 
            default:
              complaint (&symfile_complaints,
 
            default:
              complaint (&symfile_complaints,

-                        "illegal bt %d in forward typedef for %s", tir.bt,
+                        _("illegal bt %d in forward typedef for %s"), tir.bt,

                         sym_name);
              *tpp = init_type (type_code, 0, 0, (char *) NULL,
                                current_objfile);
                         sym_name);
              *tpp = init_type (type_code, 0, 0, (char *) NULL,
                                current_objfile);


@@ -4443,64 +4407,37 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, enum type_code type_cod
    keeping the symtab sorted */
 
 static struct symbol *
    keeping the symtab sorted */
 
 static struct symbol *

-mylookup_symbol (char *name, register struct block *block,
-                namespace_enum namespace, enum address_class class)
+mylookup_symbol (char *name, struct block *block,
+                domain_enum domain, enum address_class class)

 {
 {

-  int i, inc;
+  struct dict_iterator iter;
+  int inc;

   struct symbol *sym;
 
   inc = name[0];
   struct symbol *sym;
 
   inc = name[0];

-  ALL_BLOCK_SYMBOLS (block, i, sym)
+  ALL_BLOCK_SYMBOLS (block, iter, sym)

     {
     {

-      if (SYMBOL_NAME (sym)[0] == inc
-         && SYMBOL_NAMESPACE (sym) == namespace
+      if (DEPRECATED_SYMBOL_NAME (sym)[0] == inc
+         && SYMBOL_DOMAIN (sym) == domain

          && SYMBOL_CLASS (sym) == class
          && SYMBOL_CLASS (sym) == class

-         && strcmp (SYMBOL_NAME (sym), name) == 0)
+         && strcmp (DEPRECATED_SYMBOL_NAME (sym), name) == 0)

        return sym;
     }
 
   block = BLOCK_SUPERBLOCK (block);
   if (block)
        return sym;
     }
 
   block = BLOCK_SUPERBLOCK (block);
   if (block)

-    return mylookup_symbol (name, block, namespace, class);
+    return mylookup_symbol (name, block, domain, class);

   return 0;
 }
 
 
   return 0;
 }
 
 

-/* Add a new symbol S to a block B.
-   Infrequently, we will need to reallocate the block to make it bigger.
-   We only detect this case when adding to top_stack->cur_block, since
-   that's the only time we know how big the block is.  FIXME.  */
+/* Add a new symbol S to a block B.  */

 
 static void
 
 static void

-add_symbol (struct symbol *s, struct block *b)
+add_symbol (struct symbol *s, struct symtab *symtab, struct block *b)

 {
 {

-  int nsyms = BLOCK_NSYMS (b)++;
-  struct block *origb;
-  struct parse_stack *stackp;
-
-  if (b == top_stack->cur_block &&
-      nsyms >= top_stack->maxsyms)
-    {
-      complaint (&symfile_complaints, "block containing %s overfilled",
-                SYMBOL_NAME (s));
-      /* In this case shrink_block is actually grow_block, since
-         BLOCK_NSYMS(b) is larger than its current size.  */
-      origb = b;
-      b = shrink_block (top_stack->cur_block, top_stack->cur_st);
-
-      /* Now run through the stack replacing pointers to the
-         original block.  shrink_block has already done this
-         for the blockvector and BLOCK_FUNCTION.  */
-      for (stackp = top_stack; stackp; stackp = stackp->next)
-       {
-         if (stackp->cur_block == origb)
-           {
-             stackp->cur_block = b;
-             stackp->maxsyms = BLOCK_NSYMS (b);
-           }
-       }
-    }
-  BLOCK_SYM (b, nsyms) = s;
+  SYMBOL_SYMTAB (s) = symtab;
+  dict_add_symbol (BLOCK_DICT (b), s);

 }
 
 /* Add a new block B to a symtab S */
 }
 
 /* Add a new block B to a symtab S */


@@ -4560,7 +4497,7 @@ add_line (struct linetable *lt, int lineno, CORE_ADDR adr, int last)
 static int
 compare_blocks (const void *arg1, const void *arg2)
 {
 static int
 compare_blocks (const void *arg1, const void *arg2)
 {

-  register int addr_diff;
+  LONGEST addr_diff;

   struct block **b1 = (struct block **) arg1;
   struct block **b2 = (struct block **) arg2;
 
   struct block **b1 = (struct block **) arg1;
   struct block **b2 = (struct block **) arg2;
 


@@ -4601,8 +4538,8 @@ sort_blocks (struct symtab *s)
           compare_blocks);
 
   {
           compare_blocks);
 
   {

-    register CORE_ADDR high = 0;
-    register int i, j = BLOCKVECTOR_NBLOCKS (bv);
+    CORE_ADDR high = 0;
+    int i, j = BLOCKVECTOR_NBLOCKS (bv);

 
     for (i = FIRST_LOCAL_BLOCK; i < j; i++)
       if (high < BLOCK_END (BLOCKVECTOR_BLOCK (bv, i)))
 
     for (i = FIRST_LOCAL_BLOCK; i < j; i++)
       if (high < BLOCK_END (BLOCKVECTOR_BLOCK (bv, i)))


@@ -4622,11 +4559,11 @@ sort_blocks (struct symtab *s)
 
 /* Constructor/restructor/destructor procedures */
 
 
 /* Constructor/restructor/destructor procedures */
 

-/* Allocate a new symtab for NAME.  Needs an estimate of how many symbols
-   MAXSYMS and linenumbers MAXLINES we'll put in it */
+/* Allocate a new symtab for NAME.  Needs an estimate of how many
+   linenumbers MAXLINES we'll put in it */

 
 static struct symtab *
 
 static struct symtab *

-new_symtab (char *name, int maxsyms, int maxlines, struct objfile *objfile)
+new_symtab (char *name, int maxlines, struct objfile *objfile)

 {
   struct symtab *s = allocate_symtab (name, objfile);
 
 {
   struct symtab *s = allocate_symtab (name, objfile);
 


@@ -4634,14 +4571,16 @@ new_symtab (char *name, int maxsyms, int maxlines, struct objfile *objfile)
 
   /* All symtabs must have at least two blocks */
   BLOCKVECTOR (s) = new_bvect (2);
 
   /* All symtabs must have at least two blocks */
   BLOCKVECTOR (s) = new_bvect (2);

-  BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK) = new_block (maxsyms);
-  BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK) = new_block (maxsyms);
+  BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK)
+    = new_block (NON_FUNCTION_BLOCK);
+  BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK)
+    = new_block (NON_FUNCTION_BLOCK);

   BLOCK_SUPERBLOCK (BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK)) =
     BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
 
   s->free_code = free_linetable;
   s->debugformat = obsavestring ("ECOFF", 5,
   BLOCK_SUPERBLOCK (BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), STATIC_BLOCK)) =
     BLOCKVECTOR_BLOCK (BLOCKVECTOR (s), GLOBAL_BLOCK);
 
   s->free_code = free_linetable;
   s->debugformat = obsavestring ("ECOFF", 5,

-                                &objfile->symbol_obstack);
+                                &objfile->objfile_obstack);

   return (s);
 }
 
   return (s);
 }
 


@@ -4658,7 +4597,7 @@ new_psymtab (char *name, struct objfile *objfile)
   /* Keep a backpointer to the file's symbols */
 
   psymtab->read_symtab_private = ((char *)
   /* Keep a backpointer to the file's symbols */
 
   psymtab->read_symtab_private = ((char *)

-                                 obstack_alloc (&objfile->psymbol_obstack,
+                                 obstack_alloc (&objfile->objfile_obstack,

                                                 sizeof (struct symloc)));
   memset (psymtab->read_symtab_private, 0, sizeof (struct symloc));
   CUR_BFD (psymtab) = cur_bfd;
                                                 sizeof (struct symloc)));
   memset (psymtab->read_symtab_private, 0, sizeof (struct symloc));
   CUR_BFD (psymtab) = cur_bfd;


@@ -4719,48 +4658,25 @@ new_bvect (int nblocks)
   return bv;
 }
 
   return bv;
 }
 

-/* Allocate and zero a new block of MAXSYMS symbols */
+/* Allocate and zero a new block, and set its BLOCK_DICT.  If function
+   is non-zero, assume the block is associated to a function, and make
+   sure that the symbols are stored linearly; otherwise, store them
+   hashed.  */

 
 static struct block *
 
 static struct block *

-new_block (int maxsyms)
+new_block (enum block_type type)

 {
 {

-  int size = sizeof (struct block) + (maxsyms - 1) * sizeof (struct symbol *);
+  /* FIXME: carlton/2003-09-11: This should use allocate_block to
+     allocate the block.  Which, in turn, suggests that the block
+     should be allocated on an obstack.  */
+  struct block *retval = xzalloc (sizeof (struct block));

 
 

-  return (struct block *) xzalloc (size);
-}
-
-/* Ooops, too big. Shrink block B in symtab S to its minimal size.
-   Shrink_block can also be used by add_symbol to grow a block.  */
-
-static struct block *
-shrink_block (struct block *b, struct symtab *s)
-{
-  struct block *new;
-  struct blockvector *bv = BLOCKVECTOR (s);
-  int i;
+  if (type == FUNCTION_BLOCK)
+    BLOCK_DICT (retval) = dict_create_linear_expandable ();
+  else
+    BLOCK_DICT (retval) = dict_create_hashed_expandable ();

 
 

-  /* Just reallocate it and fix references to the old one */
-
-  new = (struct block *) xrealloc ((void *) b,
-                                  (sizeof (struct block)
-                                   + ((BLOCK_NSYMS (b) - 1)
-                                      * sizeof (struct symbol *))));
-
-  /* FIXME: Not worth hashing this block as it's built.  */
-  /* All callers should have created the block with new_block (), which
-     would mean it was not previously hashed.  Make sure.  */
-  gdb_assert (BLOCK_HASHTABLE (new) == 0);
-
-  /* Should chase pointers to old one.  Fortunately, that`s just
-     the block`s function and inferior blocks */
-  if (BLOCK_FUNCTION (new) && SYMBOL_BLOCK_VALUE (BLOCK_FUNCTION (new)) == b)
-    SYMBOL_BLOCK_VALUE (BLOCK_FUNCTION (new)) = new;
-  for (i = 0; i < BLOCKVECTOR_NBLOCKS (bv); i++)
-    if (BLOCKVECTOR_BLOCK (bv, i) == b)
-      BLOCKVECTOR_BLOCK (bv, i) = new;
-    else if (BLOCK_SUPERBLOCK (BLOCKVECTOR_BLOCK (bv, i)) == b)
-      BLOCK_SUPERBLOCK (BLOCKVECTOR_BLOCK (bv, i)) = new;
-  return new;
+  return retval;

 }
 
 /* Create a new symbol with printname NAME */
 }
 
 /* Create a new symbol with printname NAME */


@@ -4769,14 +4685,12 @@ static struct symbol *
 new_symbol (char *name)
 {
   struct symbol *s = ((struct symbol *)
 new_symbol (char *name)
 {
   struct symbol *s = ((struct symbol *)

-                     obstack_alloc (&current_objfile->symbol_obstack,
+                     obstack_alloc (&current_objfile->objfile_obstack,

                                     sizeof (struct symbol)));
 
   memset (s, 0, sizeof (*s));
                                     sizeof (struct symbol)));
 
   memset (s, 0, sizeof (*s));

-  SYMBOL_NAME (s) = obsavestring (name, strlen (name),
-                                 &current_objfile->symbol_obstack);

   SYMBOL_LANGUAGE (s) = psymtab_language;
   SYMBOL_LANGUAGE (s) = psymtab_language;

-  SYMBOL_INIT_DEMANGLED_NAME (s, &current_objfile->symbol_obstack);
+  SYMBOL_SET_NAMES (s, name, strlen (name), current_objfile);

   return s;
 }
 
   return s;
 }
 


@@ -4804,138 +4718,29 @@ elfmdebug_build_psymtabs (struct objfile *objfile,
 {
   bfd *abfd = objfile->obfd;
   struct ecoff_debug_info *info;
 {
   bfd *abfd = objfile->obfd;
   struct ecoff_debug_info *info;

+  struct cleanup *back_to;
+
+  /* FIXME: It's not clear whether we should be getting minimal symbol
+     information from .mdebug in an ELF file, or whether we will.
+     Re-initialize the minimal symbol reader in case we do.  */
+
+  init_minimal_symbol_collection ();
+  back_to = make_cleanup_discard_minimal_symbols ();

 
   info = ((struct ecoff_debug_info *)
 
   info = ((struct ecoff_debug_info *)

-         obstack_alloc (&objfile->psymbol_obstack,
+         obstack_alloc (&objfile->objfile_obstack,

                         sizeof (struct ecoff_debug_info)));
 
   if (!(*swap->read_debug_info) (abfd, sec, info))
                         sizeof (struct ecoff_debug_info)));
 
   if (!(*swap->read_debug_info) (abfd, sec, info))

-    error ("Error reading ECOFF debugging information: %s",
+    error (_("Error reading ECOFF debugging information: %s"),

           bfd_errmsg (bfd_get_error ()));
 
   mdebug_build_psymtabs (objfile, swap, info);
           bfd_errmsg (bfd_get_error ()));
 
   mdebug_build_psymtabs (objfile, swap, info);

-}
-\f
-
-/* Things used for calling functions in the inferior.
-   These functions are exported to our companion
-   mips-tdep.c file and are here because they play
-   with the symbol-table explicitly. */
-
-/* Sigtramp: make sure we have all the necessary information
-   about the signal trampoline code. Since the official code
-   from MIPS does not do so, we make up that information ourselves.
-   If they fix the library (unlikely) this code will neutralize itself. */
-
-/* FIXME: This function is called only by mips-tdep.c.  It needs to be
-   here because it calls functions defined in this file, but perhaps
-   this could be handled in a better way.  Only compile it in when
-   tm-mips.h is included. */
-
-#ifdef TM_MIPS_H

 
 

-void
-fixup_sigtramp (void)
-{
-  struct symbol *s;
-  struct symtab *st;
-  struct block *b, *b0 = NULL;
-
-  sigtramp_address = -1;
-
-  /* We have to handle the following cases here:
-     a) The Mips library has a sigtramp label within sigvec.
-     b) Irix has a _sigtramp which we want to use, but it also has sigvec.  */
-  s = lookup_symbol ("sigvec", 0, VAR_NAMESPACE, 0, NULL);
-  if (s != 0)
-    {
-      b0 = SYMBOL_BLOCK_VALUE (s);
-      s = lookup_symbol ("sigtramp", b0, VAR_NAMESPACE, 0, NULL);
-    }
-  if (s == 0)
-    {
-      /* No sigvec or no sigtramp inside sigvec, try _sigtramp.  */
-      s = lookup_symbol ("_sigtramp", 0, VAR_NAMESPACE, 0, NULL);
-    }
-
-  /* But maybe this program uses its own version of sigvec */
-  if (s == 0)
-    return;
-
-  /* Did we or MIPSco fix the library ? */
-  if (SYMBOL_CLASS (s) == LOC_BLOCK)
-    {
-      sigtramp_address = BLOCK_START (SYMBOL_BLOCK_VALUE (s));
-      sigtramp_end = BLOCK_END (SYMBOL_BLOCK_VALUE (s));
-      return;
-    }
-
-  sigtramp_address = SYMBOL_VALUE (s);
-  sigtramp_end = sigtramp_address + 0x88;      /* black magic */
-
-  /* But what symtab does it live in ? */
-  st = find_pc_symtab (SYMBOL_VALUE (s));
-
-  /*
-   * Ok, there goes the fix: turn it into a procedure, with all the
-   * needed info.  Note we make it a nested procedure of sigvec,
-   * which is the way the (assembly) code is actually written.
-   */
-  SYMBOL_NAMESPACE (s) = VAR_NAMESPACE;
-  SYMBOL_CLASS (s) = LOC_BLOCK;
-  SYMBOL_TYPE (s) = init_type (TYPE_CODE_FUNC, 4, 0, (char *) NULL,
-                              st->objfile);
-  TYPE_TARGET_TYPE (SYMBOL_TYPE (s)) = mdebug_type_void;
-
-  /* Need a block to allocate MIPS_EFI_SYMBOL_NAME in */
-  b = new_block (1);
-  SYMBOL_BLOCK_VALUE (s) = b;
-  BLOCK_START (b) = sigtramp_address;
-  BLOCK_END (b) = sigtramp_end;
-  BLOCK_FUNCTION (b) = s;
-  BLOCK_SUPERBLOCK (b) = BLOCK_SUPERBLOCK (b0);
-  add_block (b, st);
-  sort_blocks (st);
-
-  /* Make a MIPS_EFI_SYMBOL_NAME entry for it */
-  {
-    struct mips_extra_func_info *e =
-    ((struct mips_extra_func_info *)
-     xzalloc (sizeof (struct mips_extra_func_info)));
-
-    e->numargs = 0;            /* the kernel thinks otherwise */
-    e->pdr.frameoffset = 32;
-    e->pdr.framereg = SP_REGNUM;
-    /* Note that setting pcreg is no longer strictly necessary as
-       mips_frame_saved_pc is now aware of signal handler frames.  */
-    e->pdr.pcreg = PC_REGNUM;
-    e->pdr.regmask = -2;
-    /* Offset to saved r31, in the sigtramp case the saved registers
-       are above the frame in the sigcontext.
-       We have 4 alignment bytes, 12 bytes for onstack, mask and pc,
-       32 * 4 bytes for the general registers, 12 bytes for mdhi, mdlo, ownedfp
-       and 32 * 4 bytes for the floating point registers.  */
-    e->pdr.regoffset = 4 + 12 + 31 * 4;
-    e->pdr.fregmask = -1;
-    /* Offset to saved f30 (first saved *double* register).  */
-    e->pdr.fregoffset = 4 + 12 + 32 * 4 + 12 + 30 * 4;
-    e->pdr.isym = (long) s;
-    e->pdr.adr = sigtramp_address;
-
-    current_objfile = st->objfile;     /* Keep new_symbol happy */
-    s = new_symbol (MIPS_EFI_SYMBOL_NAME);
-    SYMBOL_VALUE (s) = (long) e;
-    SYMBOL_NAMESPACE (s) = LABEL_NAMESPACE;
-    SYMBOL_CLASS (s) = LOC_CONST;
-    SYMBOL_TYPE (s) = mdebug_type_void;
-    current_objfile = NULL;
-  }
-
-  BLOCK_SYM (b, BLOCK_NSYMS (b)++) = s;
+  install_minimal_symbols (objfile);
+  do_cleanups (back_to);

 }
 
 }
 

-#endif /* TM_MIPS_H */
-

 void
 _initialize_mdebugread (void)
 {
 void
 _initialize_mdebugread (void)
 {


@@ -5010,22 +4815,22 @@ _initialize_mdebugread (void)
               "adr_64", (struct objfile *) NULL);
   TYPE_TARGET_TYPE (mdebug_type_adr_64) = mdebug_type_void;
   mdebug_type_float =
               "adr_64", (struct objfile *) NULL);
   TYPE_TARGET_TYPE (mdebug_type_adr_64) = mdebug_type_void;
   mdebug_type_float =

-    init_type (TYPE_CODE_FLT, TARGET_FLOAT_BIT / TARGET_CHAR_BIT,
-              0,
-              "float", (struct objfile *) NULL);
+    init_type (TYPE_CODE_FLT,
+              gdbarch_float_bit (current_gdbarch) / TARGET_CHAR_BIT,
+              0, "float", (struct objfile *) NULL);

   mdebug_type_double =
   mdebug_type_double =

-    init_type (TYPE_CODE_FLT, TARGET_DOUBLE_BIT / TARGET_CHAR_BIT,
-              0,
-              "double", (struct objfile *) NULL);
+    init_type (TYPE_CODE_FLT,
+              gdbarch_double_bit (current_gdbarch) / TARGET_CHAR_BIT,
+              0, "double", (struct objfile *) NULL);

   mdebug_type_complex =
   mdebug_type_complex =

-    init_type (TYPE_CODE_COMPLEX, 2 * TARGET_FLOAT_BIT / TARGET_CHAR_BIT,
-              0,
-              "complex", (struct objfile *) NULL);
+    init_type (TYPE_CODE_COMPLEX,
+              2 * gdbarch_float_bit (current_gdbarch) / TARGET_CHAR_BIT,
+              0, "complex", (struct objfile *) NULL);

   TYPE_TARGET_TYPE (mdebug_type_complex) = mdebug_type_float;
   mdebug_type_double_complex =
   TYPE_TARGET_TYPE (mdebug_type_complex) = mdebug_type_float;
   mdebug_type_double_complex =

-    init_type (TYPE_CODE_COMPLEX, 2 * TARGET_DOUBLE_BIT / TARGET_CHAR_BIT,
-              0,
-              "double complex", (struct objfile *) NULL);
+    init_type (TYPE_CODE_COMPLEX,
+              2 * gdbarch_double_bit (current_gdbarch) / TARGET_CHAR_BIT,
+              0, "double complex", (struct objfile *) NULL);

   TYPE_TARGET_TYPE (mdebug_type_double_complex) = mdebug_type_double;
 
   /* Is a "string" the way btString means it the same as TYPE_CODE_STRING?
   TYPE_TARGET_TYPE (mdebug_type_double_complex) = mdebug_type_double;
 
   /* Is a "string" the way btString means it the same as TYPE_CODE_STRING?


@@ -5041,20 +4846,13 @@ _initialize_mdebugread (void)
      TYPE_CODE_ERROR print things in hex if it knows the size?  */
   mdebug_type_fixed_dec =
     init_type (TYPE_CODE_INT,
      TYPE_CODE_ERROR print things in hex if it knows the size?  */
   mdebug_type_fixed_dec =
     init_type (TYPE_CODE_INT,

-              TARGET_INT_BIT / TARGET_CHAR_BIT,
+              gdbarch_int_bit (current_gdbarch) / TARGET_CHAR_BIT,

               0, "fixed decimal",
               (struct objfile *) NULL);
 
   mdebug_type_float_dec =
     init_type (TYPE_CODE_ERROR,
               0, "fixed decimal",
               (struct objfile *) NULL);
 
   mdebug_type_float_dec =
     init_type (TYPE_CODE_ERROR,

-              TARGET_DOUBLE_BIT / TARGET_CHAR_BIT,
+              gdbarch_double_bit (current_gdbarch) / TARGET_CHAR_BIT,

               0, "floating decimal",
               (struct objfile *) NULL);
               0, "floating decimal",
               (struct objfile *) NULL);

-
-  nodebug_func_symbol_type = init_type (TYPE_CODE_FUNC, 1, 0,
-                                       "<function, no debug info>", NULL);
-  TYPE_TARGET_TYPE (nodebug_func_symbol_type) = mdebug_type_int;
-  nodebug_var_symbol_type =
-    init_type (TYPE_CODE_INT, TARGET_INT_BIT / HOST_CHAR_BIT, 0,
-              "<variable, no debug info>", NULL);

 }
 }