merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index faeee673f85b1e4dfa0737fc04597b8ef10d5fcb..89424ff88034e71344cbd3a84fc853196842a77a 100644 (file)
--- 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 add64a9e147fd75f35283246df5b6485b446be22..a0b84947a6adb0ba14c378697df205213761e766 100644 (file)
--- 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;