Makefile.in ($(lang_checks_parallelized)): Fix detection of -j argument.

gcc/ChangeLog

	* Makefile.in ($(lang_checks_parallelized)): Fix detection
	of -j argument.

gcc/ada/ChangeLog

	* gcc-interface/Make-lang.in (check-acats): Fix detection
	of -j argument.

libstdc++-v3/ChangeLog

	* testsuite/Makefile.am
	(check-DEJAGNU $(check_DEJAGNU_normal_targets)): Fix detection
	of -j argument.
	* testsuite/Makefile.in: Regenereate.

From-SVN: r242716

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 40ca4dcaab75cc6dd9bd6e37f69905dac3459c14..20b262e7df89ddf02138405e4f1cb9adb3d10709 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-22  Uros Bizjak  <ubizjak@gmail.com>
+
+       * Makefile.in ($(lang_checks_parallelized)): Fix detection
+       of -j argument.
+
 2016-11-15  Matthias Klose  <doko@ubuntu.com>
 
        * doc/install.texi: Move the 'Overriding configure test results'

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 93746efdc34da169e5463b10f26e636740983b51..89bef144dcb6a632c04270f3cf9c601ec2612cdf 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3739,7 +3739,7 @@ check_p_subdirs=$(wordlist 1,$(check_p_count),$(wordlist 1, \
 # variable (see above check_gcc_parallelize description).
 $(lang_checks_parallelized): check-% : site.exp
        -rm -rf $(TESTSUITEDIR)/$*-parallel
-       @if [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
+       @if [ -n "$(filter -j%, $(MFLAGS))" ]; then \
          test -d $(TESTSUITEDIR) || mkdir $(TESTSUITEDIR) || true; \
          test -d $(TESTSUITEDIR)/$*-parallel || mkdir $(TESTSUITEDIR)/$*-parallel || true; \
          GCC_RUNTEST_PARALLELIZE_DIR=`${PWD_COMMAND}`/$(TESTSUITEDIR)/$(check_p_tool)-parallel ; \

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4e35ef40dbeefe135b659645c40062d54ef72cb2..8f904d3b2619ecc4b0388d7f6705d0c35bbab569 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2016-11-22  Uros Bizjak  <ubizjak@gmail.com>
+
+       * gcc-interface/Make-lang.in (check-acats): Fix detection
+       of -j argument.
+
 2016-11-13  Bob Duff  <duff@adacore.com>
 
        * gcc-interface/decl.c (gnat_to_gnu_entity): In assertion about known

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index bef0a6786eba3dfbce920d1798390149d1ecde5c..72ccae5d68fe90d092345d0f4ccdbc3cb1838907 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -887,7 +887,7 @@ check-acats:
        @test -d $(ACATSDIR) || mkdir -p $(ACATSDIR); \
        rootme=`${PWD_COMMAND}`; export rootme; \
        EXPECT=$(EXPECT); export EXPECT; \
-       if [ -z "$(CHAPTERS)" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; \
+       if [ -z "$(CHAPTERS)" ] && [ -n "$(filter -j%, $(MFLAGS))" ]; \
        then \
          rm -rf $(ACATSDIR)-parallel; \
          mkdir $(ACATSDIR)-parallel; \

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 26ec7c105d84f812f0bcd909eb7eca8d473eaa3a..72012146b78c18af7f2ae55a53fe6b851e49b467 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2016-11-22  Uros Bizjak  <ubizjak@gmail.com>
+
+       * testsuite/Makefile.am
+       (check-DEJAGNU $(check_DEJAGNU_normal_targets)): Fix detection
+       of -j argument.
+       * testsuite/Makefile.in: Regenereate.
+
 2016-11-15  Jonathan Wakely  <jwakely@redhat.com>
 
        * testsuite/experimental/any/typedefs.cc: Fix license text.
@@ -365,7 +372,7 @@
 2016-07-04  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
        Backport from mainline
-        2016-07-04  Ville Voutilainen  <ville.voutilainen@gmail.com>
+       2016-07-04  Ville Voutilainen  <ville.voutilainen@gmail.com>
 
        PR libstdc++/71313
        * src/filesystem/ops.cc (remove_all(const path&, error_code&)):

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index c54ad6498521861428fdfb3e2af7d2a14f499c0f..ea7c9a3dc78803b533843b804a5443ad2e3f0a5a 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.am
+++ b/libstdc++-v3/testsuite/Makefile.am
@@ -117,7 +117,7 @@ $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp
 check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
        $(if $*,@)AR="$(AR)"; export AR; \
        RANLIB="$(RANLIB)"; export RANLIB; \
-       if [ -z "$*" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
+       if [ -z "$*" ] && [ -n "$(filter -j%, $(MFLAGS))" ]; then \
          rm -rf normal-parallel || true; \
          mkdir normal-parallel; \
          $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \

diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in
index e0e7114147d7bd6d3aa15237fbc2447479312b9b..4f67a37966db29156b084812dda6ae05b8596026 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -597,7 +597,7 @@ $(check_DEJAGNU_normal_targets): check-DEJAGNUnormal%: normal%/site.exp
 check-DEJAGNU $(check_DEJAGNU_normal_targets): check-DEJAGNU%: site.exp
        $(if $*,@)AR="$(AR)"; export AR; \
        RANLIB="$(RANLIB)"; export RANLIB; \
-       if [ -z "$*" ] && [ "$(filter -j, $(MFLAGS))" = "-j" ]; then \
+       if [ -z "$*" ] && [ -n "$(filter -j%, $(MFLAGS))" ]; then \
          rm -rf normal-parallel || true; \
          mkdir normal-parallel; \
          $(MAKE) $(AM_MAKEFLAGS) $(check_DEJAGNU_normal_targets); \