2003-06-27 David Carlton <carlton@kealia.com>

	* dwarf2read.c (add_partial_symbol): Add 'objfile' argument to
	call to cp_check_possible_namespace_symbols.
	(add_partial_namespace): Add partial symbol instead of calling
	cp_check_namespace_symbol.
	(read_namespace): Add symbol associated to namespace.
	(new_symbol): Handle DW_TAG_namespace.
	* cp-support.h: Delete declaration of cp_check_namespace_symbol;
	add 'objfile' argument to declaration of
	cp_check_possible_namespace_symbols.
	* cp-namespace.c: Delete variables namespace_block,
	possible_namespace_block, namespace_objfile.
	Delete functions get_namespace_block, get_namespace_objfile,
	cp_check_namespace_symbol, check_namespace_symbol_block,
	lookup_namespace_symbol.
	(lookup_symbol_file): Delete call to lookup_namespace_symbol;
	tweak call to lookup_possible_namespace_symbol.
	(initialize_namespace_symtab): Rename from
	initialize_namespace_blocks; add 'objfile' argument, don't do
	anything special with global block.
	(get_possible_namespace_block): Add 'objfile' argument.
	(check_possible_namespace_symbols_loop)
	(cp_check_possible_namespace_symbols): Ditto.
	(free_namespace_block): Rename from free_namespace_blocks; don't
	do anything special with global block.
	(check_one_possible_namespace_symbol): Add 'objfile' argument, and
	inline call to check_namespace_symbol_block.
	(lookup_possible_namespace_symbol): Add 'symtab' argument, loop
	over all objfiles.
	(maintenance_cplus_namespace): Only have possible symbols; add
	loop over objfiles.
	(_initialize_cp_namespace): Tweak doc string.
	* objfiles.h: Add opaque declaration of struct symtab.
	(struct objfile): Add cp_namespace_symtab member.
	* objfiles.c (allocate_objfile): Set
	objfile->cp_namespace_symtab.

2003-06-27  David Carlton  <carlton@kealia.com>

	* carlton_runtest (FASTTESTS): Add gdb.c++/pr-1210.exp.
	* gdb.c++/namespace.exp: Delete test for maint cp namespace.
	* gdb.c++/maint.exp (test_help): Tweak output for 'help maint cp
	namespace'.
	(test_namespace): Tweak comment.

10 files changed, 235 insertions, 233 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a55b4546856..3ea0a168fb6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,43 @@
 2003-06-27  David Carlton  <carlton@kealia.com>
 
+	* dwarf2read.c (add_partial_symbol): Add 'objfile' argument to
+	call to cp_check_possible_namespace_symbols.
+	(add_partial_namespace): Add partial symbol instead of calling
+	cp_check_namespace_symbol.
+	(read_namespace): Add symbol associated to namespace.
+	(new_symbol): Handle DW_TAG_namespace.
+	* cp-support.h: Delete declaration of cp_check_namespace_symbol;
+	add 'objfile' argument to declaration of
+	cp_check_possible_namespace_symbols.
+	* cp-namespace.c: Delete variables namespace_block,
+	possible_namespace_block, namespace_objfile.
+	Delete functions get_namespace_block, get_namespace_objfile,
+	cp_check_namespace_symbol, check_namespace_symbol_block,
+	lookup_namespace_symbol.
+	(lookup_symbol_file): Delete call to lookup_namespace_symbol;
+	tweak call to lookup_possible_namespace_symbol.
+	(initialize_namespace_symtab): Rename from
+	initialize_namespace_blocks; add 'objfile' argument, don't do
+	anything special with global block.
+	(get_possible_namespace_block): Add 'objfile' argument.
+	(check_possible_namespace_symbols_loop)
+	(cp_check_possible_namespace_symbols): Ditto.
+	(free_namespace_block): Rename from free_namespace_blocks; don't
+	do anything special with global block.
+	(check_one_possible_namespace_symbol): Add 'objfile' argument, and
+	inline call to check_namespace_symbol_block.
+	(lookup_possible_namespace_symbol): Add 'symtab' argument, loop
+	over all objfiles.
+	(maintenance_cplus_namespace): Only have possible symbols; add
+	loop over objfiles.
+	(_initialize_cp_namespace): Tweak doc string.
+	* objfiles.h: Add opaque declaration of struct symtab.
+	(struct objfile): Add cp_namespace_symtab member.
+	* objfiles.c (allocate_objfile): Set
+	objfile->cp_namespace_symtab.
+
+2003-06-27  David Carlton  <carlton@kealia.com>
+
 	* Merge with mainline; tag is carlton_dictionary-20030627-merge.
 
 2003-06-27  Elena Zannoni  <ezannoni@redhat.com>
diff --git a/gdb/cp-namespace.c b/gdb/cp-namespace.c
index 131e6aa6976..72b901fd1bf 100644
--- a/gdb/cp-namespace.c
+++ b/gdb/cp-namespace.c
@@ -79,41 +79,25 @@ static struct type *lookup_transparent_type_namespace_loop (const char *name,
 							    const char *scope,
 							    int scope_len);
 
-/* The next three variables are used to store symbols associated to
-   namespaces.  Don't refer to them directly: use
-   get_namespace_block(), get_possible_namespace_block(), and
-   get_namespace_objfile() instead.  */
+static void initialize_namespace_symtab (struct objfile *objfile);
 
-static struct block *namespace_block = NULL;
+static struct block *get_possible_namespace_block (struct objfile *objfile);
 
-static struct block *possible_namespace_block = NULL;
-
-static struct objfile *namespace_objfile = NULL;
-
-static void initialize_namespace_blocks (void);
-
-static struct block *get_namespace_block (void);
-
-static struct block *get_possible_namespace_block (void);
-
-static void free_namespace_blocks (struct symtab *symtab);
-
-static struct objfile *get_namespace_objfile (void);
-
-static int check_namespace_symbol_block (const char *name, int len,
-					 struct block *block);
-
-static struct symbol *lookup_namespace_symbol (const char *name);
+static void free_namespace_block (struct symtab *symtab);
 
 static int check_possible_namespace_symbols_loop (const char *name,
-						  int len);
+						  int len,
+						  struct objfile *objfile);
 
 static int check_one_possible_namespace_symbol (const char *name,
-						int len);
+						int len,
+						struct objfile *objfile);
 
-static struct symbol *lookup_possible_namespace_symbol (const char *name);
+static
+struct symbol *lookup_possible_namespace_symbol (const char *name,
+						 struct symtab **symtab);
 
-static void maintenance_print_namespace (char *args, int from_tty);
+static void maintenance_cplus_namespace (char *args, int from_tty);
 
 /* Set up support for dealing with C++ namespace info in the current
    symtab.  */
@@ -500,13 +484,6 @@ lookup_symbol_file (const char *name,
       if (global_block != NULL)
 	sym = lookup_symbol_aux_block (name, linkage_name, global_block,
 				       domain, symtab);
-
-      if (sym == NULL || global_block == NULL)
-	{
-	  sym = lookup_namespace_symbol (name);
-	  if (sym != NULL && symtab != NULL)
-	    *symtab = NULL;
-	}
     }
   else
     {
@@ -517,11 +494,11 @@ lookup_symbol_file (const char *name,
     return sym;
 
   /* Now call "lookup_possible_namespace_symbol".  Symbols in here
-     claim to be associated to namespaces, whereas the names in
-     question might actually correspond to either namespaces or to
-     classes.  But if they correspond to classes, then we should have
-     found a match to them above.  So if we find them now, they should
-     be genuine.  */
+     claim to be associated to namespaces, but this claim might be
+     incorrect: the names in question might actually correspond to
+     classes instead of namespaces.  But if they correspond to
+     classes, then we should have found a match for them above.  So if
+     we find them now, they should be genuine.  */
 
   /* FIXME: carlton/2002-12-18: This is a hack and should eventually
      be deleted: see cp-support.c.  */
@@ -535,13 +512,9 @@ lookup_symbol_file (const char *name,
 
   if (domain == VAR_DOMAIN)
     {
-      sym = lookup_possible_namespace_symbol (name);
+      sym = lookup_possible_namespace_symbol (name, symtab);
       if (sym != NULL)
-	{
-	  if (symtab != NULL)
-	    *symtab = NULL;
-	  return sym;
-	}
+	return sym;
     }
 
   return NULL;
@@ -601,144 +574,154 @@ lookup_transparent_type_namespace_loop (const char *name, const char *scope,
 
 /* Now come functions for dealing with symbols associated to
    namespaces.  (They're used to store the namespaces themselves, not
-   objects that live in the namespaces.)  Since namespaces span files,
-   we create special blocks to store those symbols in instead of
-   storing them in blocks associated to actual files.  That avoids
-   duplication of symbols, among other issues.
-
-   Unfortunately, versions of GCC through at least 3.3 don't generate
-   debugging information to tell us about the existence of namespaces.
-   Our solution is to try to guess their existence by looking at
-   demangled names.  This might cause us to misidentify classes as
-   namespaces, however.  So we put those symbols in
-   'possible_namespace_block' instead of 'namespace_block', and we
-   only search that block as a last resort.  */
+   objects that live in the namespaces.)  These symbols come in two
+   varieties: if we run into a DW_TAG_namespace DIE, then we know that
+   we have a namespace, so dwarf2read.c creates a symbol for it just
+   like normal.  But, unfortunately, versions of GCC through at least
+   3.3 don't generate those DIE's.  Our solution is to try to guess
+   their existence by looking at demangled names.  This might cause us
+   to misidentify classes as namespaces, however.  So we put those
+   symbols in a special block (one per objfile), and we only search
+   that block as a last resort.  */
 
 /* FIXME: carlton/2003-06-12: Once versions of GCC that generate
    DW_TAG_namespace have been out for a year or two, we should get rid
-   of possible_namespace_block and everything associated to it.  */
+   of all of this "possible namespace" nonsense.  */
 
-/* Allocate everything necessary for namespace_block and
-   possible_namespace_block.  */
+/* Allocate everything necessary for the possible namespace block
+   associated to OBJFILE.  */
 
 static void
-initialize_namespace_blocks (void)
+initialize_namespace_symtab (struct objfile *objfile)
 {
-  struct objfile *objfile = get_namespace_objfile ();
   struct symtab *namespace_symtab;
   struct blockvector *bv;
   struct block *bl;
 
-  namespace_symtab = allocate_symtab ("<C++-namespaces>", objfile);
+  namespace_symtab = allocate_symtab ("<<C++-namespaces>>", objfile);
   namespace_symtab->language = language_cplus;
   namespace_symtab->free_code = free_nothing;
   namespace_symtab->dirname = NULL;
 
-  /* 2 = three blocks (global = namespace_block, static = NULL, third
-     block = possible_namespace_block), minus the one block that's
-     always part of struct blockvector.  */
   bv = obstack_alloc (&objfile->symbol_obstack,
 		      sizeof (struct blockvector)
-		      + 2 * sizeof (struct block *));
-  BLOCKVECTOR_NBLOCKS (bv) = 3;
+		      + FIRST_LOCAL_BLOCK * sizeof (struct block *));
+  BLOCKVECTOR_NBLOCKS (bv) = FIRST_LOCAL_BLOCK + 1;
   BLOCKVECTOR (namespace_symtab) = bv;
   
-  /* Allocate dummy STATIC_BLOCK. */
+  /* Allocate empty GLOBAL_BLOCK and STATIC_BLOCK. */
+
   bl = allocate_block (&objfile->symbol_obstack);
   BLOCK_DICT (bl) = dict_create_linear (&objfile->symbol_obstack,
 					NULL);
-  BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK) = bl;
-
-  /* Allocate GLOBAL_BLOCK, which is namespace_block.  */
-  bl = allocate_block (&objfile->symbol_obstack);
-  BLOCK_DICT (bl) = dict_create_hashed_expandable ();
   BLOCKVECTOR_BLOCK (bv, GLOBAL_BLOCK) = bl;
-  namespace_block = bl;
+  bl = allocate_block (&objfile->symbol_obstack);
+  BLOCK_DICT (bl) = dict_create_linear (&objfile->symbol_obstack,
+					NULL);
+  BLOCKVECTOR_BLOCK (bv, STATIC_BLOCK) = bl;
 
-  /* Allocate possible_namespace_block; we put it where the first
+  /* Allocate the possible namespace block; we put it where the first
      local block will live, though I don't think there's any need to
      pretend that it's actually a local block (e.g. by setting
      BLOCK_SUPERBLOCK appropriately).  */
+
   bl = allocate_block (&objfile->symbol_obstack);
   BLOCK_DICT (bl) = dict_create_hashed_expandable ();
-  BLOCKVECTOR_BLOCK (bv, 2) = bl;
-  possible_namespace_block = bl;
+  BLOCKVECTOR_BLOCK (bv, FIRST_LOCAL_BLOCK) = bl;
 
-  namespace_symtab->free_func = free_namespace_blocks;
+  namespace_symtab->free_func = free_namespace_block;
+
+  objfile->cp_namespace_symtab = namespace_symtab;
 }
 
-/* Locate namespace_block, allocating it if necessary.  */
+/* Locate the possible namespace block associated to OBJFILE,
+   allocating it if necessary.  */
 
 static struct block *
-get_namespace_block (void)
+get_possible_namespace_block (struct objfile *objfile)
 {
-  if (namespace_block == NULL)
-    initialize_namespace_blocks ();
+  if (objfile->cp_namespace_symtab == NULL)
+    initialize_namespace_symtab (objfile);
 
-  return namespace_block;
+  return BLOCKVECTOR_BLOCK (BLOCKVECTOR (objfile->cp_namespace_symtab),
+			    FIRST_LOCAL_BLOCK);
 }
 
-/* Locate possible_namespace_block, allocating it if necessary.  */
+/* Free the dictionary associated to the possible namespace block.  */
 
-static struct block *
-get_possible_namespace_block (void)
+static void
+free_namespace_block (struct symtab *symtab)
 {
-  if (namespace_block == NULL)
-    initialize_namespace_blocks ();
+  struct block *possible_namespace_block;
 
-  return possible_namespace_block;
+  possible_namespace_block = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab),
+						FIRST_LOCAL_BLOCK);
+  gdb_assert (possible_namespace_block != NULL);
+  dict_free (BLOCK_DICT (possible_namespace_block));
 }
 
-/* Free the dictionary associated to the namespace block.  */
+/* Ensure that there are symbols in the possible namespace block
+   associated to OBJFILE for all initial substrings of NAME that look
+   like namespaces or classes.  NAME should end in a member variable:
+   it shouldn't consist solely of namespaces.  */
 
-static void
-free_namespace_blocks (struct symtab *symtab)
+void
+cp_check_possible_namespace_symbols (const char *name, struct objfile *objfile)
 {
-  gdb_assert (namespace_block != NULL);
-  dict_free (BLOCK_DICT (namespace_block));
-  namespace_block = NULL;
-  dict_free (BLOCK_DICT (possible_namespace_block));
-  possible_namespace_block = NULL;
-  namespace_objfile = NULL;
+  check_possible_namespace_symbols_loop (name,
+					 cp_find_first_component (name),
+					 objfile);
 }
 
-/* Locate the namespace objfile, allocating it if necessary.  */
+/* This is a helper loop for cp_check_possible_namespace_symbols; it
+   ensures that there are symbols in the possible namespace block
+   associated to OBJFILE for all namespaces that are initial
+   substrings of NAME of length at least LEN.  It returns 1 if a
+   previous loop had already created the shortest such symbol and 0
+   otherwise.
+
+   This function assumes that if there is already a symbol associated
+   to a substring of NAME of a given length, then there are already
+   symbols associated to all substrings of NAME whose length is less
+   than that length.  So if cp_check_possible_namespace_symbols has
+   been called once with argument "A::B::C::member", then that will
+   create symbols "A", "A::B", and "A::B::C".  If it is then later
+   called with argument "A::B::D::member", then the new call will
+   generate a new symbol for "A::B::D", but once it sees that "A::B"
+   has already been created, it doesn't bother checking to see if "A"
+   has also been created.  */
 
-static struct objfile *
-get_namespace_objfile (void)
+static int
+check_possible_namespace_symbols_loop (const char *name, int len,
+				       struct objfile *objfile)
 {
-  if (namespace_objfile == NULL)
+  if (name[len] == ':')
     {
-      namespace_objfile = allocate_objfile (NULL, 0);
-      namespace_objfile->name
-	= mstrsave (namespace_objfile->md, "<<C++-namespaces>>");
-    }
+      int done;
+      int next_len = len + 2;
 
-  return namespace_objfile;
-}
+      next_len += cp_find_first_component (name + next_len);
+      done = check_possible_namespace_symbols_loop (name, next_len,
+						    objfile);
 
-/* Check to see if there's already a namespace symbol whose name is
-   NAME.  If there isn't one, allocate one and add it to the namespace
-   symtab.  */
+      if (!done)
+	done = check_one_possible_namespace_symbol (name, len, objfile);
 
-void
-cp_check_namespace_symbol (const char *name)
-{
-  check_namespace_symbol_block (name, strlen (name),
-				get_namespace_block ());
+      return done;
+    }
+  else
+    return 0;
 }
 
-/* A helper function used by cp_check_namespace_symbol and
-   check_one_possible_namespace_symbol.  Looks to see if there is a
-   symbol whose name is the initial substring of NAME of length LEN in
-   block BLOCK; if not, adds it.  Return 1 if the symbol was already
-   in there, 0 otherwise.  */
+/* Check to see if there's already a possible namespace symbol in
+   OBJFILE whose name is the initial substring of NAME of length LEN.
+   If not, create one and return 0; otherwise, return 1.  */
 
 static int
-check_namespace_symbol_block (const char *name, int len,
-			      struct block *block)
+check_one_possible_namespace_symbol (const char *name, int len,
+				     struct objfile *objfile)
 {
-  struct objfile *objfile = get_namespace_objfile ();
+  struct block *block = get_possible_namespace_block (objfile);
   char *name_copy = obsavestring (name, len, &objfile->symbol_obstack);
   struct symbol *sym = lookup_block_symbol (block, name_copy, NULL,
 					    VAR_DOMAIN);
@@ -769,104 +752,50 @@ check_namespace_symbol_block (const char *name, int len,
     }
 }
 
-/* Look for a symbol in namespace_block named NAME.  */
+/* Look for a symbol named NAME in all the possible namespace blocks.
+   If one is found, return it; if SYMTAB is non-NULL, set *SYMTAB to
+   equal the symtab where it was found.  */
 
 static struct symbol *
-lookup_namespace_symbol (const char *name)
+lookup_possible_namespace_symbol (const char *name, struct symtab **symtab)
 {
-  return lookup_block_symbol (get_namespace_block (), name, NULL,
-			      VAR_DOMAIN);
-}
-
-/* Ensure that there are symbols in possible_namespace_block for all
-   initial substrings of NAME that look like namespaces or classes.
-   NAME should end in a member variable: it shouldn't consist solely
-   of namespaces.  */
+  struct objfile *objfile;
 
-void
-cp_check_possible_namespace_symbols (const char *name)
-{
-  check_possible_namespace_symbols_loop (name,
-					 cp_find_first_component (name));
-}
-
-/* This is a helper loop for cp_check_possible_namespace_symbols; it
-   ensures that there are namespace symbols for all namespaces that
-   are initial substrings of NAME of length at least LEN.  It returns
-   1 if a previous loop had already created the shortest such symbol
-   and 0 otherwise.
-
-   This function assumes that if there is already a symbol associated
-   to a substring of NAME of a given length, then there are already
-   symbols associated to all substrings of NAME whose length is less
-   than that length.  So if cp_check_possible_namespace_symbols has
-   been called once with argument "A::B::C::member", then that will
-   create symbols "A", "A::B", and "A::B::C".  If it is then later
-   called with argument "A::B::D::member", then the new call will
-   generate a new symbol for "A::B::D", but once it sees that "A::B"
-   has already been created, it doesn't bother checking to see if "A"
-   has also been created.  */
-
-static int
-check_possible_namespace_symbols_loop (const char *name, int len)
-{
-  if (name[len] == ':')
+  ALL_OBJFILES (objfile)
     {
-      int done;
-      int next_len = len + 2;
+      struct symbol *sym;
 
-      next_len += cp_find_first_component (name + next_len);
-      done = check_possible_namespace_symbols_loop (name, next_len);
+      sym = lookup_block_symbol (get_possible_namespace_block (objfile),
+				 name, NULL, VAR_DOMAIN);
 
-      if (!done)
+      if (sym != NULL)
 	{
-	  done = check_one_possible_namespace_symbol (name, len);
-	}
+	  if (symtab != NULL)
+	    *symtab = objfile->cp_namespace_symtab;
 
-      return done;
+	  return sym;
+	}
     }
-  else
-    return 0;
-}
-
-/* Check to see if there's already a possible namespace symbol whose
-   name is the initial substring of NAME of length LEN.  If not,
-   create one and return 0; otherwise, return 1.  */
 
-static int
-check_one_possible_namespace_symbol (const char *name, int len)
-{
-  return check_namespace_symbol_block (name, len,
-				       get_possible_namespace_block ());
+  return NULL;
 }
 
-/* Look for a symbol in possible_namespace_block named NAME.  */
-
-static struct symbol *
-lookup_possible_namespace_symbol (const char *name)
-{
-  return lookup_block_symbol (get_possible_namespace_block (),
-			      name, NULL, VAR_DOMAIN);
-}
+/* Print out all the possible namespace symbols.  */
 
 static void
 maintenance_cplus_namespace (char *args, int from_tty)
 {
-  const struct block *namespace_block = get_namespace_block ();
-  const struct block *possible_namespace_block
-    = get_possible_namespace_block ();
-  struct dict_iterator iter;
-  struct symbol *sym;
-
-  printf_unfiltered ("Definite namespaces:\n");
-  ALL_BLOCK_SYMBOLS (namespace_block, iter, sym)
-    {
-      printf_unfiltered ("%s\n", SYMBOL_PRINT_NAME (sym));
-    }
+  struct objfile *objfile;
   printf_unfiltered ("Possible namespaces:\n");
-  ALL_BLOCK_SYMBOLS (possible_namespace_block, iter, sym)
+  ALL_OBJFILES (objfile)
     {
-      printf_unfiltered ("%s\n", SYMBOL_PRINT_NAME (sym));
+      struct dict_iterator iter;
+      struct symbol *sym;
+
+      ALL_BLOCK_SYMBOLS (get_possible_namespace_block (objfile), iter, sym)
+	{
+	  printf_unfiltered ("%s\n", SYMBOL_PRINT_NAME (sym));
+	}
     }
 }
 
@@ -874,6 +803,6 @@ void
 _initialize_cp_namespace (void)
 {
   add_cmd ("namespace", class_maintenance, maintenance_cplus_namespace,
-	   "Print the list of current known C++ namespaces.",
+	   "Print the list of possible C++ namespaces.",
 	   &maint_cplus_cmd_list);
 }
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 0686c4a0714..4d987e43f14 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -102,9 +102,8 @@ extern struct symbol *cp_lookup_symbol_namespace (const char *namespace,
 						  const domain_enum domain,
 						  struct symtab **symtab);
 
-extern void cp_check_namespace_symbol (const char *name);
-
-extern void cp_check_possible_namespace_symbols (const char *name);
+extern void cp_check_possible_namespace_symbols (const char *name,
+						 struct objfile *objfile);
 
 struct type *lookup_transparent_type_namespace (const char *name);
 
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index 97b117f2008..4f7f55581e8 100644
--- a/gdb/dwarf2read.c
+++ b/gdb/dwarf2read.c
@@ -1675,7 +1675,8 @@ add_partial_symbol (struct partial_die_info *pdi, struct objfile *objfile,
       && namespace == NULL
       && psym != NULL
       && SYMBOL_CPLUS_DEMANGLED_NAME (psym) != NULL)
-    cp_check_possible_namespace_symbols (SYMBOL_CPLUS_DEMANGLED_NAME (psym));
+    cp_check_possible_namespace_symbols (SYMBOL_CPLUS_DEMANGLED_NAME (psym),
+					 objfile);
 }
 
 static int
@@ -1722,9 +1723,13 @@ add_partial_namespace (struct partial_die_info *pdi, char *info_ptr,
     strcat (full_name, "::");
   strcat (full_name, new_name);
 
-  /* Make sure that there's a symbol associated to that namespace.  */
+  /* FIXME: carlton/2003-06-27: Should we replace this by a call to
+     add_partial_symbol?  */
 
-  cp_check_namespace_symbol (full_name);
+  add_psymbol_to_list (full_name, strlen (full_name),
+		       VAR_DOMAIN, LOC_TYPEDEF,
+		       &objfile->global_psymbols,
+		       0, 0, cu_language, objfile);
 
   /* Now scan partial symbols in that namespace.  */
 
@@ -3574,6 +3579,23 @@ read_namespace (struct die_info *die, struct objfile *objfile,
 			    strlen (previous_prefix),
 			    strlen (processing_current_prefix));
 
+  /* Add a symbol associated to this if we haven't seen the namespace
+     before.  */
+
+  if (dwarf2_extension (die) == NULL)
+    {
+      struct type *type;
+
+      /* FIXME: carlton/2003-06-27: Once GDB is more const-correct,
+	 this cast will hopefully become unnecessary.  */
+      type = init_type (TYPE_CODE_NAMESPACE, 0, 0,
+			(char *) processing_current_prefix,
+			objfile);
+      TYPE_TAG_NAME (type) = TYPE_NAME (type);
+
+      new_symbol (die, type, objfile, cu_header);
+    }
+
   if (die->child != NULL)
     {
       struct die_info *child_die = die->child;
@@ -5503,7 +5525,11 @@ new_symbol (struct die_info *die, struct type *type, struct objfile *objfile,
   struct attribute *attr2 = NULL;
   CORE_ADDR addr = 0;
 
-  name = dwarf2_linkage_name (die);
+  if (die->tag != DW_TAG_namespace)
+    name = dwarf2_linkage_name (die);
+  else
+    name = TYPE_NAME (type);
+
   if (name)
     {
       sym = (struct symbol *) obstack_alloc (&objfile->symbol_obstack,
@@ -5751,6 +5777,10 @@ new_symbol (struct die_info *die, struct type *type, struct objfile *objfile,
 	    add_symbol_to_list (sym, list_to_add);
 	  }
 	  break;
+	case DW_TAG_namespace:
+	  SYMBOL_CLASS (sym) = LOC_TYPEDEF;
+	  add_symbol_to_list (sym, &global_symbols);
+	  break;
 	default:
 	  /* Not a tag we recognize.  Hopefully we aren't processing
 	     trash data, but since we must specifically ignore things
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 39f5623749d..1d32512242c 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -332,10 +332,14 @@ allocate_objfile (bfd *abfd, int flags)
   /* Initialize the section indexes for this objfile, so that we can
      later detect if they are used w/o being properly assigned to. */
 
-    objfile->sect_index_text = -1;
-    objfile->sect_index_data = -1;
-    objfile->sect_index_bss = -1;
-    objfile->sect_index_rodata = -1;
+  objfile->sect_index_text = -1;
+  objfile->sect_index_data = -1;
+  objfile->sect_index_bss = -1;
+  objfile->sect_index_rodata = -1;
+
+  /* We don't yet have a C++-specific namespace symtab.  */
+
+  objfile->cp_namespace_symtab = NULL;
 
   /* Add this file onto the tail of the linked list of other such files. */
 
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index f747a680108..22827f69180 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -28,6 +28,7 @@
 
 struct bcache;
 struct htab;
+struct symtab;
 
 /* This structure maintains information on a per-objfile basis about the
    "entry point" of the objfile, and the scope within which the entry point
@@ -436,6 +437,13 @@ struct objfile
     
     /* Place to stash various statistics about this objfile */
       OBJSTATS;
+
+    /* A symtab that the C++ code uses to stash special symbols
+       associated to namespaces.  */
+
+    /* FIXME/carlton-2003-06-27: Delete this in a few years once
+       "possible namespace symbols" go away.  */
+    struct symtab *cp_namespace_symtab;
   };
 
 /* Defines for the objfile flag word. */
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 36de27ac9fd..7b9289d225e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-27  David Carlton  <carlton@kealia.com>
+
+	* carlton_runtest (FASTTESTS): Add gdb.c++/pr-1210.exp.
+	* gdb.c++/namespace.exp: Delete test for maint cp namespace.
+	* gdb.c++/maint.exp (test_help): Tweak output for 'help maint cp
+	namespace'.
+	(test_namespace): Tweak comment.
+
 2003-06-24  Joel Brobecker  <brobecker@gnat.com>
 
 	* gdb.base/bang.exp: New testcase.
diff --git a/gdb/testsuite/carlton_runtest b/gdb/testsuite/carlton_runtest
index db4ad87c2ba..4ad75321a4c 100755
--- a/gdb/testsuite/carlton_runtest
+++ b/gdb/testsuite/carlton_runtest
@@ -26,6 +26,7 @@ FASTTESTS="gdb.base/assign.exp \
   gdb.c++/m-static.exp \
   gdb.c++/method.exp \
   gdb.c++/breakpoint.exp \
+  gdb.c++/pr-1210.exp \
   gdb.c++/rtti.exp"
 
 # 6 seconds or more (usually around 10).
diff --git a/gdb/testsuite/gdb.c++/maint.exp b/gdb/testsuite/gdb.c++/maint.exp
index 110cfc9250a..77bfff698be 100644
--- a/gdb/testsuite/gdb.c++/maint.exp
+++ b/gdb/testsuite/gdb.c++/maint.exp
@@ -30,7 +30,7 @@ if $tracelevel then {
 
 proc test_help {} {
     set first_component_help "Print the first class/namespace component of NAME"
-    set namespace_help "Print the list of current known C\\+\\+ namespaces"
+    set namespace_help "Print the list of possible C\\+\\+ namespaces"
 
     set multiple_help_body "List of maintenance cplus subcommands:\r\n\r\nmaintenance cplus first_component -- ${first_component_help}\r\nmaintenance cplus namespace -- ${namespace_help}\r\n\r\nType \"help maintenance cplus\" followed by maintenance cplus subcommand name for full documentation.\r\nCommand name abbreviations are allowed if unambiguous."
 
@@ -88,7 +88,7 @@ proc test_first_component {} {
 }
 
 proc test_namespace {} {
-    # There are some more tests for this command in namespace.exp.
+    # There's not a lot we can do to test this.
 
     gdb_test "maint cp namespace" "Definite namespaces:\r\nPossible namespaces:"
 }
diff --git a/gdb/testsuite/gdb.c++/namespace.exp b/gdb/testsuite/gdb.c++/namespace.exp
index c4fd69c5d9a..5bf976b5ff6 100644
--- a/gdb/testsuite/gdb.c++/namespace.exp
+++ b/gdb/testsuite/gdb.c++/namespace.exp
@@ -313,18 +313,3 @@ setup_kfail "c++/831" "*-*-*"
 gdb_test "print r1" "\\$\[0-9\].* = 19"
 setup_kfail "c++/831" "*-*-*"
 gdb_test "print r2" "No symbol \"r2\" in current context."
-
-# Test to make sure that 'maint cplus namespace' is at least picking
-# up one of the namespaces in this file.
-
-# FIXME: carlton/2003-06-16: We should check to make sure it picks up
-# all of the namespaces.  Unfortunately, I can't guarantee what order
-# they'll be listed in when you do 'maint cplus namespace'.  Probably
-# I should stash the output of that command in a variable somewhere
-# and examine that variable for all of the relevant namespaces.
-
-# FIXME: carlton/2003-06-16: This test (like many others in this file,
-# doubtless) will fail in non-DWARF-2 situations; I need to go through
-# and audit the tests accordingly at some point.
-
-gdb_test "maint cplus namespace" ".*C::C.*"