? coffmixeddebug.patch
Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.5602
diff -u -p -r1.5602 ChangeLog
--- ChangeLog	23 Mar 2004 21:21:36 -0000	1.5602
+++ ChangeLog	24 Mar 2004 00:17:03 -0000
@@ -1,3 +1,9 @@
+2004-03-23  Brian Ford  <ford@vss.fsi.com>
+
+	* coffread.c (coff_symfile_read): Prevent mixed debugging formats from
+	corrupting/reinitializing the psymtab like elf_symfile_read.
+	* dbxread.c (elfstab_build_psymtabs): Remove bogus comment.
+
 2004-03-23  Andrew Cagney  <cagney@redhat.com>
 
 	* MAINTAINERS (Past Maintainers): Add Mark Salter and Fernando
Index: coffread.c
===================================================================
RCS file: /cvs/src/src/gdb/coffread.c,v
retrieving revision 1.53
diff -u -p -r1.53 coffread.c
--- coffread.c	27 Feb 2004 17:46:11 -0000	1.53
+++ coffread.c	24 Mar 2004 00:17:03 -0000
@@ -610,6 +610,15 @@ coff_symfile_read (struct objfile *objfi
   /* Free the installed minimal symbol data.  */
   do_cleanups (cleanup_minimal_symbols);
 
+  /* If we are reinitializing, or if we have never loaded syms yet,
+     set table to empty.  MAINLINE is cleared so that *_read_psymtab
+     functions do not all also re-initialize the psymbol table. */
+  if (mainline)
+    {
+      init_psymbol_list (objfile, 0);
+      mainline = 0;
+    }
+
   bfd_map_over_sections (abfd, coff_locate_sections, (void *) info);
 
   if (info->stabsects)
Index: dbxread.c
===================================================================
RCS file: /cvs/src/src/gdb/dbxread.c,v
retrieving revision 1.64
diff -u -p -r1.64 dbxread.c
--- dbxread.c	14 Feb 2004 15:46:32 -0000	1.64
+++ dbxread.c	24 Mar 2004 00:17:07 -0000
@@ -3392,8 +3392,7 @@ coffstab_build_psymtabs (struct objfile 
 }
 
 /* Scan and build partial symbols for an ELF symbol file.
-   This ELF file has already been processed to get its minimal symbols,
-   and any DWARF symbols that were in it.
+   This ELF file has already been processed to get its minimal symbols.
 
    This routine is the equivalent of dbx_symfile_init and dbx_symfile_read
    rolled into one.