From 49a417263099d0b220153619dd0a1ec81d15895f Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 20 Nov 2003 09:59:59 +0000 Subject: [PATCH] Makefile.in (lang_checks): Add. gcc: * Makefile.in (lang_checks): Add. (check-c++, check-f77, check-java, check-g++, check-g77, check-objc): Remove hardcoded targets. * doc/sourcebuild.texi: Document testsuite hooks. * objc/Make-lang.in (check-objc, lang_checks): Add. gcc/cp: * Make-lang.in (check-g++, lang_checks): Add. gcc/f: * Make-lang.in (check-f77, lang_checks): Add. gcc/java: * Make-lang.in (check-java): Add. gcc/treelang: * Make-lang.in: Remove obsolete comment. From-SVN: r73758 --- gcc/ChangeLog | 8 ++++++++ gcc/Makefile.in | 10 ++++------ gcc/cp/ChangeLog | 4 ++++ gcc/cp/Make-lang.in | 3 +++ gcc/doc/sourcebuild.texi | 4 +++- gcc/f/ChangeLog | 4 ++++ gcc/f/Make-lang.in | 3 +++ gcc/java/ChangeLog | 4 ++++ gcc/java/Make-lang.in | 2 ++ gcc/objc/Make-lang.in | 2 ++ gcc/treelang/ChangeLog | 4 ++++ gcc/treelang/Make-lang.in | 1 - 12 files changed, 41 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 55e618ecfca..ca4666ed97a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2003-11-20 Joseph S. Myers + + * Makefile.in (lang_checks): Add. + (check-c++, check-f77, check-java, check-g++, check-g77, + check-objc): Remove hardcoded targets. + * doc/sourcebuild.texi: Document testsuite hooks. + * objc/Make-lang.in (check-objc, lang_checks): Add. + 2003-11-19 Scott Snyder PR target/13131 diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 7edb2efedbb..8f40a275b84 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -380,6 +380,7 @@ host_xm_defines=@host_xm_defines@ xm_file_list=@xm_file_list@ xm_include_list=@xm_include_list@ xm_defines=@xm_defines@ +lang_checks=check-gcc lang_opt_files=@lang_opt_files@ $(srcdir)/c.opt $(srcdir)/common.opt lang_specs_files=@lang_specs_files@ lang_tree_files=@lang_tree_files@ @@ -3253,10 +3254,6 @@ site.exp: ./config.status Makefile CHECK_TARGETS = check-gcc @check_languages@ -check-c++ : check-g++ -check-f77 : check-g77 -check-java : - check: $(CHECK_TARGETS) # The idea is to parallelize testing of multilibs, for example: @@ -3264,7 +3261,8 @@ check: $(CHECK_TARGETS) # will run 3 concurrent sessions of check-gcc, eventually testing # all 10 combinations. GNU make is required, as is a shell that expands # alternations within braces. -check-gcc//% check-g++//% check-g77//% check-objc//%: site.exp +lang_checks_parallel = $(lang_checks:=//%) +$(lang_checks_parallel): site.exp target=`echo "$@" | sed 's,//.*,,'`; \ variant=`echo "$@" | sed 's,^[^/]*//,,'`; \ vardots=`echo "$$variant" | sed 's,/,.,g'`; \ @@ -3279,7 +3277,7 @@ $(TESTSUITEDIR)/site.exp: site.exp -rm -f $@ sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)|' < site.exp > $@ -check-g++ check-gcc check-g77 check-objc: check-% : $(TESTSUITEDIR)/site.exp +$(lang_checks): check-% : $(TESTSUITEDIR)/site.exp -(rootme=`${PWD_COMMAND}`; export rootme; \ srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \ cd $(TESTSUITEDIR); \ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7f75b43e25f..26d71e5a163 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2003-11-20 Joseph S. Myers + + * Make-lang.in (check-g++, lang_checks): Add. + 2003-11-18 Kriang Lerdsuwanakij PR c++/12932 diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 08afcffccd9..252ea8996d9 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -120,6 +120,9 @@ c++.tags: force generated-manpages:: cp/g++.1 +check-c++ : check-g++ +lang_checks += check-g++ + # # Install hooks: # cc1plus is installed elsewhere as part of $(COMPILERS). diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index dda934bbe2a..16686a4a1b9 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -551,7 +551,9 @@ specified in @code{outputs} in @file{config-lang.in}, although this is deprecated). Some hooks are defined by using a double-colon rule for @code{@var{hook}}, rather than by using a target of form @code{@var{lang}.@var{hook}}. These hooks are called ``double-colon -hooks'' below. +hooks'' below. It also adds any testsuite targets that can use the +standard rule in @file{gcc/Makefile.in} to the variable +@code{lang_checks}. @table @code @item all.build diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 48e4d28215a..cdd78f99c33 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,7 @@ +2003-11-20 Joseph S. Myers + + * Make-lang.in (check-f77, lang_checks): Add. + 2003-11-16 Jason Merrill * Make-lang.in (f77.tags): Create TAGS.sub files in each directory diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in index d3b1b81185c..d0e9dd1b474 100644 --- a/gcc/f/Make-lang.in +++ b/gcc/f/Make-lang.in @@ -153,6 +153,9 @@ info:: $(docobjdir)/g77.info dvi:: $(docobjdir)/g77.dvi generated-manpages:: $(docobjdir)/g77.1 +check-f77 : check-g77 +lang_checks += check-g77 + # g77 documentation. $(docobjdir)/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ $(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \ diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 13c7625e522..5770af0c568 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,7 @@ +2003-11-20 Joseph S. Myers + + * Make-lang.in (check-java): Add. + 2003-11-19 Jeff Sturm Fix PR java/13024. diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index 1ac1a1a09c4..814dab63fca 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -170,6 +170,8 @@ generated-manpages:: $(docobjdir)/gcj.1 $(docobjdir)/gcjh.1 \ $(docobjdir)/gij.1 $(docobjdir)/jv-convert.1 \ $(docobjdir)/rmic.1 $(docobjdir)/rmiregistry.1 +check-java : + # Install hooks: # jc1, gcj, jvgenmain, and gcjh are installed elsewhere as part # of $(COMPILERS). diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in index f3eacadac3e..672d719b8b5 100644 --- a/gcc/objc/Make-lang.in +++ b/gcc/objc/Make-lang.in @@ -107,6 +107,8 @@ objc.tags: force cd $(srcdir)/objc; etags -o TAGS.sub *.y *.c *.h; \ etags --include TAGS.sub --include ../TAGS.sub +lang_checks += check-objc + # # Install hooks: # cc1obj is installed elsewhere as part of $(COMPILERS). diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog index 5168cb28faf..7b08872c138 100644 --- a/gcc/treelang/ChangeLog +++ b/gcc/treelang/ChangeLog @@ -1,3 +1,7 @@ +2003-11-20 Joseph S. Myers + + * Make-lang.in: Remove obsolete comment. + 2003-11-03 Kelley Cook * Make-lang.in (dvi): Move targets to $(docobjdir). diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in index e94ac7f6047..03be182d0e9 100644 --- a/gcc/treelang/Make-lang.in +++ b/gcc/treelang/Make-lang.in @@ -271,7 +271,6 @@ treelang.distdir: # not here yet sorry not sure if this is needed or not??? # test hook -# the other languages are hard coded in the main makefile.in - that seems to be wrong check-treelang: treelang.check