gcc:

	* Makefile.in: Remove all references to s-under and underscore.c.
	* collect2.c, tlink.c: Change all uses of prepends_underscore
	to look directly at USER_LABEL_PREFIX.

gcc/cp:
	* Make-lang.in: Build cp/cxxfilt.o from $(srcdir)/cp/cxxfilt.c,
	and c++filt from cxxfilt.o + version.o + $(LIBDEPS).
	* cxxfilt.c: New file: split from libiberty/cplus-dem.c, with
	minor adjustments (use version_string, eliminate yet another
	duplicate of xmalloc)

libiberty:
	* cplus-dem.c: Code code under #ifdef MAIN moved to gcc/cp/cxxfilt.c.
	* testsuite/Makefile.in: Adjust for test-demangle.
	* testsuite/regress-demangle: Deleted.
	* testsuite/test-demangle.c: New file.
	* testsuite/demangle-expected: Change \$ to $ throughout, now that
	this file is not being read by a shell script.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@57037 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 7 insertions, 13 deletions

diff --git a/libiberty/testsuite/Makefile.in b/libiberty/testsuite/Makefile.in
index 9d4ddd0ef1e..515dcd56b7e 100644
--- a/libiberty/testsuite/Makefile.in
+++ b/libiberty/testsuite/Makefile.in
@@ -1,6 +1,6 @@
 #
 # Makefile
-#   Copyright (C) 1999
+#   Copyright (C) 1999, 2002
 #   Free Software Foundation
 #
 # This file is part of the libiberty library.
@@ -45,31 +45,25 @@ all:
 check: @CHECK@
 
 # Run some tests of the demangler.
-check-cplus-dem: test-filter $(srcdir)/demangle-expected
-	$(SHELL) $(srcdir)/regress-demangle $(srcdir)/demangle-expected
+check-cplus-dem: test-demangle $(srcdir)/demangle-expected
+	./test-demangle < $(srcdir)/demangle-expected
 
-# Note that we just hard-code prepends_underscore to 0.  This doesn't
-# matter since any particular test can override the default if need
-# be.
 TEST_COMPILE = $(CC) @DEFS@ $(LIBCFLAGS) -I.. -I$(INCDIR) $(HDEFINES)
-test-filter: $(srcdir)/../cplus-dem.c
-	echo 'int prepends_underscore = 0;' > test-us.c
-	$(TEST_COMPILE) -o test-filter -DMAIN -DVERSION='"none"' @DEFS@ \
-		$(srcdir)/../cplus-dem.c test-us.c -L.. -liberty
-
+test-demangle: $(srcdir)/test-demangle.c
+	$(TEST_COMPILE) -o test-demangle \
+		$(srcdir)/test-demangle.c ../libiberty.a
 
 # Standard (either GNU or Cygnus) rules we don't use.
 info install-info clean-info dvi install etags tags installcheck:
 
 # The standard clean rules.
 mostlyclean:
-	rm -f test-us.c test-filter
+	rm -f test-demangle
 clean: mostlyclean
 distclean: clean
 	rm -f Makefile
 maintainer-clean realclean: distclean
 
-
 Makefile: $(srcdir)/Makefile.in ../config.status
 	CONFIG_FILES=testsuite/Makefile CONFIG_HEADERS= \
 	  cd .. && $(SHELL) ./config.status