aboutsummaryrefslogtreecommitdiff
path: root/libiberty/cplus-dem.c
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2002-02-03 13:12:45 +0000
committerDJ Delorie <dj@redhat.com>2002-02-03 13:12:45 +0000
commit42da15d6b301762d3baeffef9cc4379e472fdad2 (patch)
treededc292521c1b63d4aeebda9f7f93d636f4fabe2 /libiberty/cplus-dem.c
parent6ca652b0db8d98b581fbdec110028f0ddae0d19d (diff)
downloadgdb-42da15d6b301762d3baeffef9cc4379e472fdad2.zip
gdb-42da15d6b301762d3baeffef9cc4379e472fdad2.tar.gz
gdb-42da15d6b301762d3baeffef9cc4379e472fdad2.tar.bz2
merge from gcc
Diffstat (limited to 'libiberty/cplus-dem.c')
-rw-r--r--libiberty/cplus-dem.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libiberty/cplus-dem.c b/libiberty/cplus-dem.c
index 5af8826..b66d26d 100644
--- a/libiberty/cplus-dem.c
+++ b/libiberty/cplus-dem.c
@@ -478,6 +478,9 @@ do_hpacc_template_literal PARAMS ((struct work_stuff *, const char **, string *)
static int
snarf_numeric_literal PARAMS ((const char **, string *));
+static char* (*cplus_demangle_v3_p) PARAMS ((const char* mangled))
+ = cplus_demangle_v3;
+
/* There is a TYPE_QUAL value for each type qualifier. They can be
combined by bitwise-or to form the complete set of qualifiers for a
type. */
@@ -911,7 +914,7 @@ cplus_demangle (mangled, options)
/* The V3 ABI demangling is implemented elsewhere. */
if (GNU_V3_DEMANGLING || AUTO_DEMANGLING)
{
- ret = cplus_demangle_v3 (mangled);
+ ret = cplus_demangle_v3_p (mangled);
if (ret || GNU_V3_DEMANGLING)
return ret;
}
@@ -5086,6 +5089,7 @@ main (argc, argv)
if (optind < argc)
{
+ cplus_demangle_v3_p = cplus_demangle_v3_type;
for ( ; optind < argc; optind++)
{
demangle_it (argv[optind]);