aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2003-11-25 22:35:33 +0000
committerDJ Delorie <dj@redhat.com>2003-11-25 22:35:33 +0000
commit51948b34c5241d8159617563dbe9424e89e08f05 (patch)
tree61cce5ae547e79a3dd19ee64df9c7b52b82b2dca
parent78c63a3b6fa8ef422b732bbeb650390f1a5a0728 (diff)
downloadgdb-51948b34c5241d8159617563dbe9424e89e08f05.zip
gdb-51948b34c5241d8159617563dbe9424e89e08f05.tar.gz
gdb-51948b34c5241d8159617563dbe9424e89e08f05.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/cp-demangle.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index faeee67..89424ff 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-25 Ian Lance Taylor <ian@wasabisystems.com>
+
+ * cp-demangle.c (java_demangle_v3): Pass DMGL_PARAMS to
+ d_demangle.
+
2003-11-22 Ian Lance Taylor <ian@wasabisystems.com>
* cp-demangle.c (d_encoding): Add top_level parameter. Change all
diff --git a/libiberty/cp-demangle.c b/libiberty/cp-demangle.c
index add64a9..a0b8494 100644
--- a/libiberty/cp-demangle.c
+++ b/libiberty/cp-demangle.c
@@ -3528,7 +3528,7 @@ java_demangle_v3 (mangled)
char *from;
char *to;
- demangled = d_demangle (mangled, DMGL_JAVA, &alc);
+ demangled = d_demangle (mangled, DMGL_JAVA | DMGL_PARAMS, &alc);
if (demangled == NULL)
return NULL;