From: DJ Delorie <dj@redhat.com>
Date: Tue, 25 Nov 2003 22:35:33 +0000 (+0000)
Subject: merge from gcc
X-Git-Tag: cagney_bigcore-20040122-branchpoint~674
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51948b34c5241d8159617563dbe9424e89e08f05;p=platform%2Fupstream%2Fbinutils.git

merge from gcc
---

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;