From 5659daa1d9d69b21490a7624abaa6f88e9e33f31 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Tue, 18 Nov 2003 19:10:05 +0000 Subject: [PATCH] merge from gcc --- libiberty/ChangeLog | 7 +++++++ libiberty/testsuite/Makefile.in | 2 +- libiberty/testsuite/test-demangle.c | 2 +- 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 + + * 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 * 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) -- 2.7.4