aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gdb/ChangeLog6
-rw-r--r--gdb/dbxread.c12
-rw-r--r--gdb/dwarfread.c4
3 files changed, 21 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 969ac08..ffaf8d3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2001-01-19 Jason Merrill <jason@redhat.com>
+
+ * dbxread.c (read_ofile_symtab): Stay with AUTO_DEMANGLING for G++.
+ (process_one_symbol): Likewise.
+ * dwarfread.c (handle_producer): Likewise.
+
Thu Jan 18 12:08:57 2001 Andrew Cagney <cagney@b1.cygnus.com>
* configure.in (build_warnings): Disable -Wuninitialized until GDB
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 071be76..4e1a518 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -1738,6 +1738,9 @@ read_ofile_symtab (struct partial_symtab *pst)
/* Try to select a C++ demangling based on the compilation unit
producer. */
+#if 0
+ /* For now, stay with AUTO_DEMANGLING for g++ output, as we don't
+ know whether it will use the old style or v3 mangling. */
if (processing_gcc_compilation)
{
if (AUTO_DEMANGLING)
@@ -1745,6 +1748,7 @@ read_ofile_symtab (struct partial_symtab *pst)
set_demangling_style (GNU_DEMANGLING_STYLE_STRING);
}
}
+#endif
}
else
{
@@ -1798,10 +1802,14 @@ read_ofile_symtab (struct partial_symtab *pst)
else if (STREQ (namestring, GCC2_COMPILED_FLAG_SYMBOL))
processing_gcc_compilation = 2;
+#if 0
+ /* For now, stay with AUTO_DEMANGLING for g++ output, as we don't
+ know whether it will use the old style or v3 mangling. */
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
@@ -2367,7 +2375,9 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name,
if (STREQ (name, GCC2_COMPILED_FLAG_SYMBOL))
{
processing_gcc_compilation = 2;
-#if 1 /* Works, but is experimental. -fnf */
+#if 0 /* Works, but is experimental. -fnf */
+ /* For now, stay with AUTO_DEMANGLING for g++ output, as we don't
+ know whether it will use the old style or v3 mangling. */
if (AUTO_DEMANGLING)
{
set_demangling_style (GNU_DEMANGLING_STYLE_STRING);
diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c
index 7055717..8d15175 100644
--- a/gdb/dwarfread.c
+++ b/gdb/dwarfread.c
@@ -1838,7 +1838,11 @@ handle_producer (char *producer)
{
if (STREQN (producer, GPLUS_PRODUCER, strlen (GPLUS_PRODUCER)))
{
+#if 0
+ /* For now, stay with AUTO_DEMANGLING for g++ output, as we don't
+ know whether it will use the old style or v3 mangling. */
set_demangling_style (GNU_DEMANGLING_STYLE_STRING);
+#endif
}
else if (STREQN (producer, LCC_PRODUCER, strlen (LCC_PRODUCER)))
{