* dbxread.c (read_ofile_symtab): Remove "#if 1" around code to

	set demangling style automatically.
	* defs.h (CPLUS_MARKER):  Clarify comment that this is only for
	GNU C++, not C++ in general.
	* symtab.h (general_symbol_info):  Simplify by eliminating one
	structure level for the language dependent info.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8147c448693bda1dae8a403b7a65ffd58e4b232e..8fa2a3f4d2b0aa75de62252c83d50fbe8c17bda0 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,12 @@
+Sun May 30 15:35:21 1993  Fred Fish  (fnf@cygnus.com)
+
+       * dbxread.c (read_ofile_symtab):  Remove "#if 1" around code to
+       set demangling style automatically.
+       * defs.h (CPLUS_MARKER):  Clarify comment that this is only for
+       GNU C++, not C++ in general.
+       * symtab.h (general_symbol_info):  Simplify by eliminating one
+       structure level for the language dependent info.
+
 Sat May 29 15:59:29 1993  Fred Fish  (fnf@cygnus.com)
 
        * c-typeprint.c (c_type_print_base):  Avoid dereferencing NULL

diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 302d9cb0f679c08804b66d24f6a9088b6e79c1ba..025bc36d08224dbe92cafc1331e5153d16233f85 100644 (file)
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -1154,7 +1154,7 @@ end_psymtab (pst, include_list, num_includes, capping_symbol_offset,
 
       subpst->readin = 0;
       subpst->symtab = 0;
-      subpst->read_symtab = dbx_psymtab_to_symtab;
+      subpst->read_symtab = pst->read_symtab;
     }
 
   sort_pst_symbols (pst);
@@ -1358,12 +1358,10 @@ read_ofile_symtab (objfile, sym_offset, sym_size, text_offset, text_size,
 
       if (processing_gcc_compilation)
        {
-#if 1    /* Works, but is experimental.  -fnf */
          if (AUTO_DEMANGLING)
            {
              set_demangling_style (GNU_DEMANGLING_STYLE_STRING);
            }
-#endif
        }
     }
   else
@@ -1416,12 +1414,10 @@ read_ofile_symtab (objfile, sym_offset, sym_size, text_offset, text_size,
          else if (STREQ (namestring, GCC2_COMPILED_FLAG_SYMBOL))
            processing_gcc_compilation = 2;
 
-#if 1    /* Works, but is experimental.  -fnf */
          if (AUTO_DEMANGLING)
            {
              set_demangling_style (GNU_DEMANGLING_STYLE_STRING);
            }
-#endif
        }
       else if (type & N_EXT || type == (unsigned char)N_TEXT
               || type == (unsigned char)N_NBTEXT