merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c9b048eacfa4686a75fff0547503b14695c7169b..436ca7d693deb22a6700481262ac0bd9019d86b6 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,10 @@
+2003-11-18  Ian Lance Taylor  <ian@wasabisystems.com>
+
+       * testsuite/test-demangle.c (main): Don't pass DMGL_VERBOSE to
+       cplus_demangle.
+
+       * testsuite/Makefile.in (test-demangle): Depend upon libiberty.a.
+
 2003-10-31  Andreas Jaeger  <aj@suse.de>
 
        * floatformat.c (floatformat_always_valid): Add unused attribute.

diff --git a/libiberty/testsuite/Makefile.in b/libiberty/testsuite/Makefile.in
index 515dcd56b7ee01c4a7675a6d14511879f64e1f6a..6f2a4fe4b39868890053d6e5d14b1116283db95a 100644 (file)
--- a/libiberty/testsuite/Makefile.in
+++ b/libiberty/testsuite/Makefile.in
@@ -49,7 +49,7 @@ check-cplus-dem: test-demangle $(srcdir)/demangle-expected
        ./test-demangle < $(srcdir)/demangle-expected
 
 TEST_COMPILE = $(CC) @DEFS@ $(LIBCFLAGS) -I.. -I$(INCDIR) $(HDEFINES)
-test-demangle: $(srcdir)/test-demangle.c
+test-demangle: $(srcdir)/test-demangle.c ../libiberty.a
        $(TEST_COMPILE) -o test-demangle \
                $(srcdir)/test-demangle.c ../libiberty.a
 

diff --git a/libiberty/testsuite/test-demangle.c b/libiberty/testsuite/test-demangle.c
index 6e5d0b4b9731b160b0efe85d522b2ffa2b4ba230..ed28229ca344a374d509df5568d1e5259c58b050 100644 (file)
--- a/libiberty/testsuite/test-demangle.c
+++ b/libiberty/testsuite/test-demangle.c
@@ -146,7 +146,7 @@ main(argc, argv)
       cplus_demangle_set_style (style);
 
       result = cplus_demangle (input.data,
-                              DMGL_PARAMS|DMGL_ANSI|DMGL_VERBOSE|DMGL_TYPES);
+                              DMGL_PARAMS|DMGL_ANSI|DMGL_TYPES);
 
       if (result
          ? strcmp (result, expect.data)