aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElena Zannoni <ezannoni@kwikemart.cygnus.com>2001-09-05 02:13:11 +0000
committerElena Zannoni <ezannoni@kwikemart.cygnus.com>2001-09-05 02:13:11 +0000
commitef96bde82e147421678d9f5390f5d3632d314d2c (patch)
treeb04a155ef7510c213671fa8ef90f11bc212e49dc
parent4961b73108c1d1783815b0e5fd03b9fc0e4fe04b (diff)
downloadgdb-ef96bde82e147421678d9f5390f5d3632d314d2c.zip
gdb-ef96bde82e147421678d9f5390f5d3632d314d2c.tar.gz
gdb-ef96bde82e147421678d9f5390f5d3632d314d2c.tar.bz2
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.
-rw-r--r--gdb/ChangeLog11
-rw-r--r--gdb/dbxread.c4
-rw-r--r--gdb/dwarf2read.c5
-rw-r--r--gdb/dwarfread.c5
-rw-r--r--gdb/os9kread.c5
-rw-r--r--gdb/xcoffread.c4
6 files changed, 24 insertions, 10 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 6fe893a..629cd04 100644
--- a/gdb/ChangeLog
+++ b/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.
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index f1382e7..ba60fe1 100644
--- a/gdb/dbxread.c
+++ b/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);
diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c
index bc559b0..478b467 100644
--- a/gdb/dwarf2read.c
+++ b/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);
}
diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index 0bfb4fd..d6258b3 100644
--- a/gdb/dwarfread.c
+++ b/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);
}
diff --git a/gdb/os9kread.c b/gdb/os9kread.c
index 8dcf251..591161c 100644
--- a/gdb/os9kread.c
+++ b/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 ();
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 6e52710..5e7b935 100644
--- a/gdb/xcoffread.c
+++ b/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