* dbxread.c (read_type): Handle error case slightly better.

Make complaint message not C++-specific.

* symtab.c (lookup_symtab_1, lookup_symbol):  "fatal" errors
between symtabs and psymtabs become ordinary error()s.

* dbxread.c (read_dbx_symtab):  Relocate end_of_text_addr
properly, making "end pc" correct in shared lib psymtabs.
(From Guy Harris <guy@auspex.com>.)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 13c74395cd7bde4166754815ae92628889405912..e99709572fef5b180c84aee7e69ff98e11286c51 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,9 +1,23 @@
+Thu Oct  3 09:33:26 1991  John Gilmore  (gnu at cygnus.com)
+
+       * dbxread.c (read_type):  Handle error case slightly better.
+       Make complaint message not C++-specific.
+
 Wed Oct  2 17:21:07 1991  Stu Grossman  (grossman at cygnus.com)
 
        * infrun.c (wait_for_inferior):  Fix step/next so that you only
        stop at the beginning of a new line.  This fixes various problems
        with for loops, nested if-else's and switch statements.
 
+Tue Oct  1 06:33:55 1991  John Gilmore  (gnu at cygnus.com)
+
+       * symtab.c (lookup_symtab_1, lookup_symbol):  "fatal" errors
+       between symtabs and psymtabs become ordinary error()s.
+
+       * dbxread.c (read_dbx_symtab):  Relocate end_of_text_addr
+       properly, making "end pc" correct in shared lib psymtabs.
+       (From Guy Harris <guy@auspex.com>.)
+
 Mon Sep 30 13:15:31 1991  John Gilmore  (gnu at cygnus.com)
 
        * dbxread.c:  Enable, but soften, const_vol_complaint.

diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index dba32b75e02d82fc06ef45167e67fa24bbf18f32..d5ebb39fa9a9aac93fc7c7719bcb7c39d0d13887 100644 (file)
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -403,7 +403,7 @@ struct complaint const_vol_complaint =
   {"const/volatile indicator missing (ok if using g++ v1.x), got '%c'", 0, 0};
 
 struct complaint error_type_complaint =
-  {"C++ type mismatch between compiler and debugger", 0, 0};
+  {"debug info mismatch between compiler and debugger", 0, 0};
 
 struct complaint invalid_member_complaint =
   {"invalid (minimal) member type data format at symtab pos %d.", 0, 0};
@@ -1711,7 +1711,7 @@ read_dbx_symtab (symfile_name, addr,
 #ifdef END_OF_TEXT_DEFAULT
   end_of_text_addr = END_OF_TEXT_DEFAULT;
 #else
-  end_of_text_addr = text_addr + text_size;
+  end_of_text_addr = text_addr + addr + text_size;     /* Relocate */
 #endif
 
   symtab_input_desc = desc;    /* This is needed for fill_symbuf below */
@@ -4089,6 +4089,8 @@ read_type (pp)
       break;
 
     default:
+      --*pp;                   /* Go back to the symbol in error */
+                               /* Particularly important if it was \0! */
       return error_type (pp);
     }