diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ae6ebbafe95..1bddfc069d9 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2005-04-08 Benjamin Kosnik + + * testsuite/Makefile.am: Remove libv3test.a. + * testsuite/Makefile.in: Regenerate. + * testsuite/lib/libstdc++.exp (v3_target_compile): Fix comments. + 2005-04-08 Paolo Carlini PR libstdc++/20909 diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index fa013b6774a..eb6a612f6a0 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -28,29 +28,6 @@ include $(top_srcdir)/fragment.am AM_MAKEFLAGS = -j1 AM_RUNTESTFLAGS = -## CXX is actually a "C" compiler. These are real C++ programs. -testsuite_flags_script=${glibcxx_builddir}/scripts/testsuite_flags -CXX = $(shell ${SHELL} ${testsuite_flags_script} --build-cxx) -GLIBCXX_INCLUDES = $(shell ${SHELL} ${testsuite_flags_script} \ - --build-includes) -AM_CXXFLAGS = $(shell ${SHELL} ${testsuite_flags_script} --cxxflags) - -GLIBGCC_DIR=`$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` -GLIBCXX_DIR=${glibcxx_builddir}/src/.libs - -CXXLINK = \ - $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ - -R $(GLIBGCC_DIR) -R $(GLIBCXX_DIR) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -lv3test -L. -o $@ - -## Build support library. -noinst_LIBRARIES = libv3test.a -libv3test_a_SOURCES = \ - testsuite_abi.cc \ - testsuite_allocator.cc \ - testsuite_character.cc \ - testsuite_hooks.cc - all-local: stamp_wchar stamp_thread # Enable wchar_t tests if capable. diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 81345f68649..d7573c94686 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -13,9 +13,6 @@ # PARTICULAR PURPOSE. @SET_MAKE@ - -SOURCES = $(libv3test_a_SOURCES) - srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -51,27 +48,10 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = -LIBRARIES = $(noinst_LIBRARIES) -ARFLAGS = cru -libv3test_a_AR = $(AR) $(ARFLAGS) -libv3test_a_LIBADD = -am_libv3test_a_OBJECTS = testsuite_abi.$(OBJEXT) \ - testsuite_allocator.$(OBJEXT) testsuite_character.$(OBJEXT) \ - testsuite_hooks.$(OBJEXT) -libv3test_a_OBJECTS = $(am_libv3test_a_OBJECTS) -DEFAULT_INCLUDES = depcomp = am__depfiles_maybe = -CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ - $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ - $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) -SOURCES = $(libv3test_a_SOURCES) -DIST_SOURCES = $(libv3test_a_SOURCES) -ETAGS = etags -CTAGS = ctags +SOURCES = +DIST_SOURCES = DEJATOOL = $(PACKAGE) RUNTESTDEFAULTFLAGS = --tool $$tool --srcdir $$srcdir EXPECT = expect @@ -109,7 +89,7 @@ CPPFLAGS = @CPPFLAGS@ CSTDIO_H = @CSTDIO_H@ CTIME_CC = @CTIME_CC@ CTIME_H = @CTIME_H@ -CXX = $(shell ${SHELL} ${testsuite_flags_script} --build-cxx) +CXX = @CXX@ CXXCPP = @CXXCPP@ CXXFLAGS = @CXXFLAGS@ CYGPATH_W = @CYGPATH_W@ @@ -136,9 +116,7 @@ GLIBCXX_C_HEADERS_C_STD_TRUE = @GLIBCXX_C_HEADERS_C_STD_TRUE@ GLIBCXX_C_HEADERS_C_TRUE = @GLIBCXX_C_HEADERS_C_TRUE@ GLIBCXX_HOSTED_FALSE = @GLIBCXX_HOSTED_FALSE@ GLIBCXX_HOSTED_TRUE = @GLIBCXX_HOSTED_TRUE@ -GLIBCXX_INCLUDES = $(shell ${SHELL} ${testsuite_flags_script} \ - --build-includes) - +GLIBCXX_INCLUDES = @GLIBCXX_INCLUDES@ GLIBCXX_TEST_ABI_FALSE = @GLIBCXX_TEST_ABI_FALSE@ GLIBCXX_TEST_ABI_TRUE = @GLIBCXX_TEST_ABI_TRUE@ GLIBCXX_TEST_THREAD_FALSE = @GLIBCXX_TEST_THREAD_FALSE@ @@ -268,22 +246,6 @@ WARN_CXXFLAGS = \ AM_CPPFLAGS = $(GLIBCXX_INCLUDES) AM_MAKEFLAGS = -j1 AM_RUNTESTFLAGS = -testsuite_flags_script = ${glibcxx_builddir}/scripts/testsuite_flags -AM_CXXFLAGS = $(shell ${SHELL} ${testsuite_flags_script} --cxxflags) -GLIBGCC_DIR = `$(CC) -print-libgcc-file-name | sed 's,/[^/]*$$,,'` -GLIBCXX_DIR = ${glibcxx_builddir}/src/.libs -CXXLINK = \ - $(LIBTOOL) --tag=CXX --mode=link $(CXX) \ - -R $(GLIBGCC_DIR) -R $(GLIBCXX_DIR) \ - $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -lv3test -L. -o $@ - -noinst_LIBRARIES = libv3test.a -libv3test_a_SOURCES = \ - testsuite_abi.cc \ - testsuite_allocator.cc \ - testsuite_character.cc \ - testsuite_hooks.cc - # Generated lists of files to run. All of these names are valid make # targets, if you wish to generate a list manually. @@ -314,7 +276,6 @@ CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp* ostream_* *.log *.sum \ all: all-am .SUFFIXES: -.SUFFIXES: .cc .lo .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/fragment.am $(am__configure_deps) @for dep in $?; do \ case '$(am__configure_deps)' in \ @@ -345,28 +306,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -clean-noinstLIBRARIES: - -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libv3test.a: $(libv3test_a_OBJECTS) $(libv3test_a_DEPENDENCIES) - -rm -f libv3test.a - $(libv3test_a_AR) libv3test.a $(libv3test_a_OBJECTS) $(libv3test_a_LIBADD) - $(RANLIB) libv3test.a - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -.cc.o: - $(CXXCOMPILE) -c -o $@ $< - -.cc.obj: - $(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` - -.cc.lo: - $(LTCXXCOMPILE) -c -o $@ $< - mostlyclean-libtool: -rm -f *.lo @@ -376,54 +315,12 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - mkid -fID $$unique tags: TAGS +TAGS: -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique +CTAGS: -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags check-DEJAGNU: site.exp srcdir=`$(am__cd) $(srcdir) && pwd`; export srcdir; \ @@ -473,7 +370,7 @@ distdir: $(DISTFILES) check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU check: check-am -all-am: Makefile $(LIBRARIES) all-local +all-am: Makefile all-local installdirs: install: install-am install-exec: install-exec-am @@ -502,13 +399,12 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ - mostlyclean-am +clean-am: clean-generic clean-libtool mostlyclean-am distclean: distclean-am -rm -f Makefile -distclean-am: clean-am distclean-DEJAGNU distclean-compile \ - distclean-generic distclean-libtool distclean-tags +distclean-am: clean-am distclean-DEJAGNU distclean-generic \ + distclean-libtool dvi: dvi-am @@ -536,8 +432,7 @@ maintainer-clean-am: distclean-am maintainer-clean-generic mostlyclean: mostlyclean-am -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool +mostlyclean-am: mostlyclean-generic mostlyclean-libtool pdf: pdf-am @@ -549,17 +444,16 @@ ps-am: uninstall-am: uninstall-info-am -.PHONY: CTAGS GTAGS all all-am all-local check check-DEJAGNU check-am \ - clean clean-generic clean-libtool clean-noinstLIBRARIES ctags \ - distclean distclean-DEJAGNU distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-exec install-exec-am \ - install-info install-info-am install-man install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-info-am +.PHONY: all all-am all-local check check-DEJAGNU check-am clean \ + clean-generic clean-libtool distclean distclean-DEJAGNU \ + distclean-generic distclean-libtool distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-exec install-exec-am install-info \ + install-info-am install-man install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am all-local: stamp_wchar stamp_thread diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp index dc4c11df8e3..7f8008538eb 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++.exp @@ -297,9 +297,6 @@ proc v3_target_compile { source dest type options } { } -# XXX Fix me. -# This is a complete hack: why do we build libv3test.a and then not use it? -# This duplicates all the make logic. Boo: pick one way to do it, not two. # Build the support objects linked in with the libstdc++ tests. In # addition, set v3-wchar_t, v3-threads, and v3-test_objs # appropriately.