2001-09-04 Elena Zannoni <ezannoni@redhat.com>

From Daniel Jacobowitz  <drow@mvista.com>
	* dbxread.c (dbx_symfile_read): Only reinitialize
	the psymbol list if mainline or if both static
	and global lists are empty.
	* dwarf2read.c (dwarf2_build_psymtabs): Likewise.
	* dwarfread.c (dwarf_build_psymtabs): Likewise.
	* xcoffread.c (xcoff_initial_scan): Likewise.
	* os9kread.c (os9k_symfile_read): Likewise.

gdb/ChangeLog

@@ -1,5 +1,16 @@
 2001-09-04  Elena Zannoni  <ezannoni@redhat.com>
+
+	From Daniel Jacobowitz  <drow@mvista.com>	
+	* dbxread.c (dbx_symfile_read): Only reinitialize
+	the psymbol list if mainline or if both static
+	and global lists are empty.
+	* dwarf2read.c (dwarf2_build_psymtabs): Likewise.
+	* dwarfread.c (dwarf_build_psymtabs): Likewise.
+	* xcoffread.c (xcoff_initial_scan): Likewise.
+	* os9kread.c (os9k_symfile_read): Likewise.
 	
+2001-09-04  Elena Zannoni  <ezannoni@redhat.com>
+
 	From Daniel Jacobowitz  <drow@mvista.com>	
 	* mdebugread.c (psymtab_to_symtab_1): Handle N_SO stabs without
 	a name specially.

gdb/dbxread.c

@@ -582,8 +582,8 @@ dbx_symfile_read (struct objfile *objfile, int mainline)
 
   /* If we are reinitializing, or if we have never loaded syms yet, init */
   if (mainline
-      || objfile->global_psymbols.size == 0
-      || objfile->static_psymbols.size == 0)
+      || (objfile->global_psymbols.size == 0
+	  &&  objfile->static_psymbols.size == 0))
     init_psymbol_list (objfile, DBX_SYMCOUNT (objfile));
 
   symbol_size = DBX_SYMBOL_SIZE (objfile);

gdb/dwarf2read.c

@@ -869,8 +869,9 @@ dwarf2_build_psymtabs (struct objfile *objfile, int mainline)
 					   dwarf_line_offset,
 					   dwarf_line_size);
 
-  if (mainline || objfile->global_psymbols.size == 0 ||
-      objfile->static_psymbols.size == 0)
+  if (mainline
+      || (objfile->global_psymbols.size == 0
+	  && objfile->static_psymbols.size == 0))
     {
       init_psymbol_list (objfile, 1024);
     }

gdb/dwarfread.c

@@ -706,8 +706,9 @@ dwarf_build_psymtabs (struct objfile *objfile, int mainline, file_ptr dbfoff,
      Since we have no idea how many DIES we are looking at, we just guess
      some arbitrary value. */
 
-  if (mainline || objfile->global_psymbols.size == 0 ||
-      objfile->static_psymbols.size == 0)
+  if (mainline
+      || (objfile->global_psymbols.size == 0
+	  && objfile->static_psymbols.size == 0))
     {
       init_psymbol_list (objfile, 1024);
     }

gdb/os9kread.c

@@ -320,8 +320,9 @@ os9k_symfile_read (struct objfile *objfile, int mainline)
 
   sym_bfd = objfile->obfd;
   /* If we are reinitializing, or if we have never loaded syms yet, init */
-  if (mainline || objfile->global_psymbols.size == 0 ||
-      objfile->static_psymbols.size == 0)
+  if (mainline
+      || (objfile->global_psymbols.size == 0
+	  && objfile->static_psymbols.size == 0))
     init_psymbol_list (objfile, DBX_SYMCOUNT (objfile));
 
   free_pending_blocks ();

gdb/xcoffread.c

@@ -2684,8 +2684,8 @@ xcoff_initial_scan (struct objfile *objfile, int mainline)
 
   /* If we are reinitializing, or if we have never loaded syms yet, init */
   if (mainline
-      || objfile->global_psymbols.size == 0
-      || objfile->static_psymbols.size == 0)
+      || (objfile->global_psymbols.size == 0
+	  && objfile->static_psymbols.size == 0))
     /* I'm not sure how how good num_symbols is; the rule of thumb in
        init_psymbol_list was developed for a.out.  On the one hand,
        num_symbols includes auxents.  On the other hand, it doesn't