* cplus-dem.c: Removed. Use the version in libiberty now.

	* ldmisc.c:  Use new libiberty version of cplus_demangle().

diff --git a/ld/.Sanitize b/ld/.Sanitize
index b47fd58..3c39532 100644 (file)
--- a/ld/.Sanitize
+++ b/ld/.Sanitize
@@ -42,7 +42,6 @@ config
 config.h
 configure.bat
 configure.in
-cplus-dem.c
 ebmon29k.sc-sh
 ebmon29k.sh
 generic.em
@@ -122,7 +121,11 @@ echo Done in `pwd`.
 #
 #
 # $Log$
-# Revision 1.40  1992/08/17 18:35:55  pesch
+# Revision 1.41  1992/08/31 01:14:44  bothner
+#      * cplus-dem.c:  Removed.  Use the version in libiberty now.
+#      * ldmisc.c:  Use new libiberty version of cplus_demangle().
+#
+# Revision 1.40  1992/08/17  18:35:55  pesch
 # Use new name of man page (ld.1).
 #
 # Revision 1.39  1992/08/07  01:37:34  bothner

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 0f3e751..dd17202 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+Sun Aug 30 18:12:13 1992  Per Bothner  (bothner@rtl.cygnus.com)
+
+       * cplus-dem.c:  Removed.  Use the version in libiberty now.
+       * ldmisc.c:  Use new libiberty version of cplus_demangle().
+
 Thu Aug 27 16:38:42 1992  Ian Lance Taylor  (ian@cygnus.com)
 
        * gld960.em (gld960_choose_target): default to little endian, not

diff --git a/ld/ldmisc.c b/ld/ldmisc.c
index 9a70af9..b35e021 100644 (file)
--- a/ld/ldmisc.c
+++ b/ld/ldmisc.c
@@ -22,6 +22,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "bfd.h"
 #include "sysdep.h"
 #include <varargs.h>
+#include <demangle.h>
 
 #include "ld.h"
 #include "ldmisc.h"
@@ -60,7 +61,6 @@ vfinfo(fp, fmt, arg)
      char *fmt;
      va_list arg;
 {
-  extern char *cplus_demangle();
   boolean fatal = false;
   while (*fmt) 
   {
@@ -91,7 +91,8 @@ vfinfo(fp, fmt, arg)
 
            
           asection *section = symbol->section;
-          char *cplusname = cplus_demangle(symbol->name, 1);
+          char *cplusname =
+              cplus_demangle(symbol->name, DMGL_ANSI|DMGL_PARAMS);
           CONST char *section_name =  section->name;
           if (section != &bfd_und_section) 
           {
@@ -208,7 +209,7 @@ vfinfo(fp, fmt, arg)
            filename = abfd->filename;
           if (functionname != (char *)NULL) 
           {
-            cplus_name = cplus_demangle(functionname, 1);
+            cplus_name = cplus_demangle(functionname, DMGL_ANSI|DMGL_PARAMS);
             fprintf(fp,"%s:%u: (%s)", filename, linenumber,
                     cplus_name? cplus_name: functionname);
             if (cplus_name)