* cp-valprint.c (cp_is_vtbl_ptr_type): Continue to accept old form.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a1f12b5e8b4542987df5363f1bcc3440ba531ee8..35462e65ee6611993b745957cb34266dc1b2b219 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,14 @@
+Thu Sep 30 11:30:56 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
+
+       * cp-valprint.c (cp_is_vtbl_ptr_type): Continue to accept old form.
+
+Thu Sep 30 11:25:55 1993  Kung Hsu  (kung@cygnus.com)
+
+       * cp-valprint.c (cp_is_vtbl_ptr_type):
+       change vtable field name to __vtbl (pr2695).
+
+       * symtab.c (gdb_mangle_name): fix a bug, to get mangled name right.
+
 Wed Sep 29 18:34:22 1993  Stu Grossman  (grossman at cygnus.com)
 
        * Makefile.in:  Add deps for i386lynx-nat.o and i386lynx-tdep.o to

diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c
index d43eb52f18ddc7888e65b67b98f3a0aef5a90b4c..47b38f803d9b8d46e93061308b22dba5bd28218e 100644 (file)
--- a/gdb/cp-valprint.c
+++ b/gdb/cp-valprint.c
@@ -167,14 +167,16 @@ cp_is_vtbl_ptr_type(type)
      struct type *type;
 {
   char *typename = type_name_no_tag (type);
-/* WAS this and from 4.10, it changed to __vtbl_ptr_type **
-  static const char vtbl_ptr_name[] =
+  /* This was what it was for gcc 2.4.5 and earlier.  */
+  static const char vtbl_ptr_name_old[] =
     { CPLUS_MARKER,'v','t','b','l','_','p','t','r','_','t','y','p','e', 0 };
-*/
+  /* It was changed to this after 2.4.5.  */
   static const char vtbl_ptr_name[] =
     { '_','_','v','t','b','l','_','p','t','r','_','t','y','p','e', 0 };
 
-  return (typename != NULL && STREQ(typename, vtbl_ptr_name));
+  return (typename != NULL
+         && (STREQ (typename, vtbl_ptr_name)
+             || STREQ (typename, vtbl_ptr_name_old)));
 }
 
 /* Return truth value for the assertion that TYPE is of the type