* buildsym.c (finish_block): If we pop the context stack and it is

	not empty, complain () instead of abort ().

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 4933a765a2a10c3cad7266bfe14ff21897fa0e5d..c982c91b3de0a9a10139ecede411c3fadc35f60d 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,19 @@
+Mon Oct 18 10:28:08 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * buildsym.c (finish_block): If we pop the context stack and it is
+       not empty, complain () instead of abort ().
+
+Sun Oct 17 19:42:31 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * parse.c, parser-defs.h (follow_types): New function.
+       * c-exp.y (ptype : typebase abs_decl): Use it.
+       * c-exp.y (ptype): Add support for type qualifiers after the
+       typebase.  The typebase rule already has support for them before
+       the typebase.
+       * Makefile.in: Change the expected number of shift/reduce
+       conflicts to 6.  This is OK--the 2 new conflicts are basically the
+       same as one of the old ones.
+
 Sun Oct 17 13:04:49 1993  Fred Fish  (fnf@cygnus.com)
 
        * Makefile.in (VERSION):  Bump to 4.10.3.

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 256d2cecb39d479e68ebfd8898b44b490b13421f..dfa9be1316259f657848cfb14c31c0df5083c9e5 100644 (file)
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -667,11 +667,16 @@ end_symtab (end_addr, sort_pending, sort_linevec, objfile, section)
       finish_block (cstk->name, &local_symbols, cstk->old_blocks,
                    cstk->start_addr, end_addr, objfile);
 
-      /* Debug: if context stack still has something in it,
-        we are in trouble.  */
       if (context_stack_depth > 0)
        {
-         abort ();
+         /* This is said to happen with SCO.  The old coffread.c code
+            simply emptied the context stack, so we do the same.  FIXME:
+            Find out why it is happening.  This is not believed to happen
+            in most cases (even for coffread.c); it used to be an abort().  */
+         static struct complaint msg =
+           {"Context stack not empty in end_symtab", 0, 0};
+         complain (&msg);
+         context_stack_depth = 0;
        }
     }