aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2003-11-18 19:10:05 +0000
committerDJ Delorie <dj@redhat.com>2003-11-18 19:10:05 +0000
commit5659daa1d9d69b21490a7624abaa6f88e9e33f31 (patch)
tree34afe0df76718f56dbe7b38cfa39e676e18776ff
parent082c50f897ccb4a3554c0c3965116420618bcfda (diff)
downloadgdb-5659daa1d9d69b21490a7624abaa6f88e9e33f31.zip
gdb-5659daa1d9d69b21490a7624abaa6f88e9e33f31.tar.gz
gdb-5659daa1d9d69b21490a7624abaa6f88e9e33f31.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog7
-rw-r--r--libiberty/testsuite/Makefile.in2
-rw-r--r--libiberty/testsuite/test-demangle.c2
3 files changed, 9 insertions, 2 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c9b048e..436ca7d 100644
--- 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 515dcd5..6f2a4fe 100644
--- 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 6e5d0b4..ed28229 100644
--- 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)