From: dj <dj>
Date: Tue, 25 Nov 2003 22:35:33 +0000 (+0000)
Subject: merge from gcc
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3896e3629044a1a388410ef78a59ba033c1ea62e;p=pf3gnuchains%2Fpf3gnuchains3x.git

merge from gcc
---

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index faeee673f8..89424ff880 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 add64a9e14..a0b84947a6 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;