* corelow.c (core_close): Don't hardcode the core's pid.

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

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 217145781e90a73a26ce1caa1547a93354190b90..55ace15cc29ab340b8fb664052173f2c13136b5f 100644 (file)
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -1,6 +1,6 @@
 /* Support routines for building symbol tables in GDB's internal format.
    Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
-   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007, 2008
+   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2007, 2008, 2009
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -147,12 +147,6 @@ add_symbol_to_list (struct symbol *symbol, struct pending **listhead)
     }
 
   (*listhead)->symbol[(*listhead)->nsyms++] = symbol;
-
-  /* Check to see if we might need to look for a mention of anonymous
-     namespaces.  */
-  
-  if (SYMBOL_LANGUAGE (symbol) == language_cplus)
-    cp_scan_for_anonymous_namespaces (symbol);
 }
 
 /* Find a symbol named NAME on a LIST.  NAME need not be
@@ -168,7 +162,7 @@ find_symbol_in_list (struct pending *list, char *name, int length)
     {
       for (j = list->nsyms; --j >= 0;)
        {
-         pp = DEPRECATED_SYMBOL_NAME (list->symbol[j]);
+         pp = SYMBOL_LINKAGE_NAME (list->symbol[j]);
          if (*pp == *name && strncmp (pp, name, length) == 0 &&
              pp[length] == '\0')
            {
@@ -283,32 +277,8 @@ finish_block (struct symbol *symbol, struct pending **listhead,
          struct symbol *sym;
          ALL_BLOCK_SYMBOLS (block, iter, sym)
            {
-             switch (SYMBOL_CLASS (sym))
-               {
-               case LOC_ARG:
-               case LOC_REF_ARG:
-               case LOC_REGPARM:
-               case LOC_REGPARM_ADDR:
-               case LOC_BASEREG_ARG:
-               case LOC_COMPUTED_ARG:
-                 nparams++;
-                 break;
-               case LOC_UNDEF:
-               case LOC_CONST:
-               case LOC_STATIC:
-               case LOC_REGISTER:
-               case LOC_LOCAL:
-               case LOC_TYPEDEF:
-               case LOC_LABEL:
-               case LOC_BLOCK:
-               case LOC_CONST_BYTES:
-               case LOC_BASEREG:
-               case LOC_UNRESOLVED:
-               case LOC_OPTIMIZED_OUT:
-               case LOC_COMPUTED:
-               default:
-                 break;
-               }
+             if (SYMBOL_IS_ARGUMENT (sym))
+               nparams++;
            }
          if (nparams > 0)
            {
@@ -322,43 +292,15 @@ finish_block (struct symbol *symbol, struct pending **listhead,
                  if (iparams == nparams)
                    break;
 
-                 switch (SYMBOL_CLASS (sym))
+                 if (SYMBOL_IS_ARGUMENT (sym))
                    {
-                   case LOC_ARG:
-                   case LOC_REF_ARG:
-                   case LOC_REGPARM:
-                   case LOC_REGPARM_ADDR:
-                   case LOC_BASEREG_ARG:
-                   case LOC_COMPUTED_ARG:
                      TYPE_FIELD_TYPE (ftype, iparams) = SYMBOL_TYPE (sym);
                      TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
                      iparams++;
-                     break;
-                   case LOC_UNDEF:
-                   case LOC_CONST:
-                   case LOC_STATIC:
-                   case LOC_REGISTER:
-                   case LOC_LOCAL:
-                   case LOC_TYPEDEF:
-                   case LOC_LABEL:
-                   case LOC_BLOCK:
-                   case LOC_CONST_BYTES:
-                   case LOC_BASEREG:
-                   case LOC_UNRESOLVED:
-                   case LOC_OPTIMIZED_OUT:
-                   case LOC_COMPUTED:
-                   default:
-                     break;
                    }
                }
            }
        }
-
-      /* If we're in the C++ case, set the block's scope.  */
-      if (SYMBOL_LANGUAGE (symbol) == language_cplus)
-       {
-         cp_set_block_scope (symbol, block, &objfile->objfile_obstack);
-       }
     }
   else
     {
@@ -593,7 +535,7 @@ start_subfile (char *name, char *dirname)
          && !IS_ABSOLUTE_PATH (subfile->name)
          && subfile->dirname != NULL)
        subfile_name = concat (subfile->dirname, SLASH_STRING,
-                              subfile->name, NULL);
+                              subfile->name, (char *) NULL);
       else
        subfile_name = subfile->name;