X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fnlmread.c;h=4e9c87d3ff0de7e1b4e4163cefe16c4028a2e284;hb=649e03f6e4b94665f1a74e2238a862f28097946a;hp=eaa9ddeb2f337ad08bd66de67975ec9f2538c19e;hpb=aac7f4eaf285cfa05a09ce0750f3f828ba0b0f01;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/nlmread.c b/gdb/nlmread.c
index eaa9ddeb2f..4e9c87d3ff 100644
--- a/gdb/nlmread.c
+++ b/gdb/nlmread.c
@@ -27,6 +27,7 @@
 #include "objfiles.h"
 #include "buildsym.h"
 #include "stabsread.h"
+#include "block.h"
 
 extern void _initialize_nlmread (void);
 
@@ -190,10 +191,16 @@ nlm_symfile_read (struct objfile *objfile, int mainline)
 
   nlm_symtab_read (abfd, offset, objfile);
 
+  /* Install any minimal symbols that have been collected as the current
+     minimal symbols for this objfile. */
+
+  install_minimal_symbols (objfile);
+  do_cleanups (back_to);
+
   stabsect_build_psymtabs (objfile, mainline, ".stab",
 			   ".stabstr", ".text");
 
-  mainsym = lookup_symbol (main_name (), NULL, VAR_NAMESPACE, NULL, NULL);
+  mainsym = lookup_symbol (main_name (), NULL, VAR_DOMAIN, NULL, NULL);
 
   if (mainsym
       && SYMBOL_CLASS (mainsym) == LOC_BLOCK)
@@ -204,13 +211,6 @@ nlm_symfile_read (struct objfile *objfile, int mainline)
 
   /* FIXME:  We could locate and read the optional native debugging format
      here and add the symbols to the minimal symbol table. */
-
-  /* Install any minimal symbols that have been collected as the current
-     minimal symbols for this objfile. */
-
-  install_minimal_symbols (objfile);
-
-  do_cleanups (back_to);
 }