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: r242705

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ceb9a338dd4fe95e60a48a5be9c57d56853e193c..b19a3005423d57bd01ba5954389c3834a0b0fa6e 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-22  Thomas Preud'homme  <thomas.preudhomme@arm.com>
 
        * config.gcc: Allow new rmprofile value for configure option
@@ -38,8 +43,8 @@
 
        PR tree-optimization/78445
        * tree-if-conv.c (tree_if_conversion): If any_pred_load_store or
-       any_complicated_phi, version loop even if flag_tree_loop_if_convert is
-       1.  Formatting fix.
+       any_complicated_phi, version loop even if flag_tree_loop_if_convert
+       is 1.  Formatting fix.
 
 2016-11-22  Martin Liska  <mliska@suse.cz>
 
@@ -230,8 +235,7 @@
        * config/alpha/alpha.c (emit_unlikely_jump): Likewise.
        * config/arc/arc.c: Likewise.
        * config/arm/arm.c: Likewise.
-       * config/mn10300/mn10300.c (mn10300_legitimize_pic_address):
-       Likewise.
+       * config/mn10300/mn10300.c (mn10300_legitimize_pic_address): Likewise.
        * config/rs6000/rs6000.c (rs6000_expand_split_stack_prologue):
        Likewise.
        * config/spu/spu.c (spu_emit_branch_hint): Likewise.
@@ -247,19 +251,16 @@
        * config/frv/frv.c (frv_optimize_membar_local): Likewise.
        * config/frv/frv.md: Likewise.
        * config/i386/i386-protos.h: Likewise.
-       * config/i386/i386.c (ix86_expand_split_stack_prologue):
-       Likewise.
+       * config/i386/i386.c (ix86_expand_split_stack_prologue): Likewise.
        (ix86_split_fp_branch): Likewise.
        (predict_jump): Likewise.
        * config/ia64/ia64.c: Likewise.
        * config/mcore/mcore.c: Likewise.
-       * config/rs6000/rs6000.c (rs6000_legitimize_tls_address):
-       Likewise.
+       * config/rs6000/rs6000.c (rs6000_legitimize_tls_address): Likewise.
        * config/s390/s390.c: Likewise.
        * config/s390/s390.md: Likewise.
        * config/spu/spu.md: Likewise.
-       * config/tilegx/tilegx.c (tilegx_legitimize_tls_address):
-       Likewise.
+       * config/tilegx/tilegx.c (tilegx_legitimize_tls_address): Likewise.
        * lower-subreg.c (resolve_simple_move): Likewise.
 
 2016-11-20  Jeff Law  <law@redhat.com>
@@ -365,8 +366,7 @@
        base types and CU or optimize implicit consts in them if
        calc_base_type_die_sizes has been called during build_abbrev_table.
        (calc_base_type_die_sizes): If abbrev_opt_start, set
-       abbrev_opt_base_type_end to one plus largest base type's
-       die_abbrev.
+       abbrev_opt_base_type_end to one plus largest base type's die_abbrev.
 
 2016-11-18  Jeff Law  <law@redhat.com>
 
@@ -432,9 +432,9 @@
        Re-apply after PR bootstrap/77359 is fixed:
        2016-08-23  Dominik Vogt  <vogt@linux.vnet.ibm.com>
 
-        * explow.c (get_dynamic_stack_size): Take known alignment of stack
-        pointer + STACK_DYNAMIC_OFFSET into account when calculating the
-        size needed.
+       * explow.c (get_dynamic_stack_size): Take known alignment of stack
+       pointer + STACK_DYNAMIC_OFFSET into account when calculating the
+       size needed.
 
 2016-11-18  Dominik Vogt  <vogt@linux.vnet.ibm.com>
 
@@ -460,15 +460,16 @@
        * expr.c (convert_modes): Likewise.
        * loop-doloop.c (doloop_optimize): Likewise.
        * postreload.c (reload_cse_simplify_set): Likewise.
-       * simplify-rtx.c (simplify_const_unary_operation): Likewise.
+       * simplify-rtx.c (simplify_const_unary_operation): Likewise
        (simplify_binary_operation_1, simplify_const_binary_operation):
+       Likewise.
        (simplify_const_relational_operation, simplify_immed_subreg): Likewise.
        * wide-int.h: Update documentation to recommend rtx_mode_t
        instead of std::make_pair.
 
 2016-11-18  Richard Sandiford  <richard.sandiford@arm.com>
-           Alan Hayward  <alan.hayward@arm.com>
-           David Sherwood  <david.sherwood@arm.com>
+           Alan Hayward  <alan.hayward@arm.com>
+           David Sherwood  <david.sherwood@arm.com>
 
        * tree.h (SET_DECL_MODE): New macro.
        * cfgexpand.c (avoid_deep_ter_for_debug): Use SET_DECL_MODE.
@@ -507,8 +508,7 @@
        * config/arc/arc.md (cmem bit/sign-extend peephole2): New peephole
        to make better use of cmem loads in the case where a single bit is
        being accessed.
-       * config/arc/predicates.md (ge_lt_comparison_operator): New
-       predicate.
+       * config/arc/predicates.md (ge_lt_comparison_operator): New predicate.
 
 2016-11-17  Andrew Senkevich <andrew.senkevich@intel.com>
 
@@ -519,19 +519,15 @@
 2016-11-17  Kirill Yukhin  <kirill.yukhin@gmail.com>
            Andrew Senkevich <andrew.senkevich@intel.com>
 
-       * common/config/i386/i386-common.c
-       (OPTION_MASK_ISA_AVX5124FMAPS_SET,
-       OPTION_MASK_ISA_AVX5124FMAPS_UNSET,
-       OPTION_MASK_ISA_AVX5124VNNIW_SET,
+       * common/config/i386/i386-common.c (OPTION_MASK_ISA_AVX5124FMAPS_SET,
+       OPTION_MASK_ISA_AVX5124FMAPS_UNSET, OPTION_MASK_ISA_AVX5124VNNIW_SET,
        OPTION_MASK_ISA_AVX5124VNNIW_UNSET): New.
-       (ix86_handle_option): Handle OPT_mavx5124fmaps,
-       OPT_mavx5124vnniw.
+       (ix86_handle_option): Handle OPT_mavx5124fmaps, OPT_mavx5124vnniw.
        * config.gcc: Add avx5124fmapsintrin.h, avx5124vnniwintrin.h.
        * config/i386/avx5124fmapsintrin.h: New file.
        * config/i386/avx5124vnniwintrin.h: Ditto.
        * config/i386/constraints.md (h): New constraint.
-       * config/i386/cpuid.h: (bit_AVX5124VNNIW,
-       bit_AVX5124FMAPS): New.
+       * config/i386/cpuid.h (bit_AVX5124VNNIW, bit_AVX5124FMAPS): New.
        * config/i386/driver-i386.c (host_detect_local_cpu):
        Detect avx5124fmaps, avx5124vnniw.
        * config/i386/i386-builtin-types.def: Add types
@@ -560,17 +556,14 @@
        avx5124vnniw.
        (ix86_expand_builtin): Handle new builtins.
        (ix86_additional_allocno_class_p): New.
-       * config/i386/i386.h (TARGET_AVX5124FMAPS,
-       TARGET_AVX5124FMAPS_P,
-       TARGET_AVX5124VNNIW,
-       TARGET_AVX5124VNNIW_P): Define.
+       * config/i386/i386.h (TARGET_AVX5124FMAPS, TARGET_AVX5124FMAPS_P,
+       TARGET_AVX5124VNNIW, TARGET_AVX5124VNNIW_P): Define.
        (reg_class): Add MOD4_SSE_REGS.
        (MOD4_SSE_REG_P, MOD4_SSE_REGNO_P): New.
        * config/i386/i386.opt: Add mavx5124fmaps, mavx5124vnniw.
        * config/i386/immintrin.h: Include avx5124fmapsintrin.h,
        avx5124vnniwintrin.h.
-       * config/i386/sse.md (unspec): Add UNSPEC_VP4FMADD,
-       UNSPEC_VP4FNMADD,
+       * config/i386/sse.md (unspec): Add UNSPEC_VP4FMADD, UNSPEC_VP4FNMADD,
        UNSPEC_VP4DPWSSD, UNSPEC_VP4DPWSSDS.
        (define_mode_iterator IMOD4): New.
        (define_mode_attr imod4_narrow): Ditto.
@@ -643,7 +636,7 @@
        is larger or equal to targetm.max_anchor_offset.
 
 2016-11-17  Pip Cet  <pipcet@gmail.com>
-            Eric Botcazou  <ebotcazou@adacore.com>
+           Eric Botcazou  <ebotcazou@adacore.com>
 
        PR rtl-optimization/78355
        * doc/tm.texi.in (SLOW_UNALIGNED_ACCESS): Document that the macro only
@@ -671,7 +664,7 @@
        function.
 
 2016-11-17  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
-            Richard Biener  <rguenther@suse.de>
+           Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/77848
        * tree-if-conv.c (tree_if_conversion): Always version loops unless
@@ -949,7 +942,7 @@
        (atomic_fetch_add<mode>): Ditto.
        (atomic_fetch_addsf): Ditto.
        (atomic_fetch_<logic><mode>): Ditto.
-       * config/nvptx/nvptx.opt: (msoft-stack): New option.
+       * config/nvptx/nvptx.opt (msoft-stack): New option.
        (muniform-simt): Ditto.
        (mgomp): Ditto.
        * config/nvptx/t-nvptx (MULTILIB_OPTIONS): New.
@@ -958,7 +951,7 @@
        (muniform-simt): Document
        (mgomp): Document.
        * doc/tm.texi: Regenerate.
-       * doc/tm.texi.in: (TARGET_SIMT_VF): New hook.
+       * doc/tm.texi.in (TARGET_SIMT_VF): New hook.
        * target.def: Define it.
        * target-insns.def (omp_simt_lane): New.
        (omp_simt_last_lane): New.
@@ -973,17 +966,14 @@
        prototype.
        * config/mips/mips.h (ASM_OUTPUT_BEFORE_CASE_LABEL): New macro.
        (ASM_OUTPUT_CASE_END): Likewise.
-       * config/mips/mips.c (mips_set_text_contents_type): New
-       function.
+       * config/mips/mips.c (mips_set_text_contents_type): New function.
        (mips16_emit_constants): Record the pool's initial label number
-       with the `consttable' insn.  Emit a `consttable_end' insn at the
-       end.
+       with the `consttable' insn.  Emit a `consttable_end' insn at the end.
        (mips_final_prescan_insn): Call `mips_set_text_contents_type'
        for `consttable' insns.
        (mips_final_postscan_insn): Call `mips_set_text_contents_type'
        for `consttable_end' insns.
-       * config/mips/mips.md (unspec): Add UNSPEC_CONSTTABLE_END enum
-       value.
+       * config/mips/mips.md (unspec): Add UNSPEC_CONSTTABLE_END enum value.
        (consttable): Add operand.
        (consttable_end): New insn.
 
@@ -1053,8 +1043,8 @@
        * arm/arm-fpus.def (vfpv2): New FPU, currently an alias for 'vfp'.
        (neon-vfpv3): New FPU, currently an alias for 'neon'.
        * arm/arm-tables.opt: Regenerated.
-        * arm/t-aprofile (MULTILIB_REUSE): Add reuse rules for vfpv2 and
-        neon-vfpv3.
+       * arm/t-aprofile (MULTILIB_REUSE): Add reuse rules for vfpv2 and
+       neon-vfpv3.
        * doc/invoke.texi (ARM: -mfpu): Document new options.  Note that 'vfp'
        and 'neon' are aliases for specific implementations.
 
@@ -1164,7 +1154,8 @@
 
 2016-11-16  Kugan Vivekanandarajah  <kuganv@linaro.org>
 
-       * tree-ssa-coalesce.c (register_default_def): Remove register_ssa_partition.
+       * tree-ssa-coalesce.c (register_default_def): Remove
+       register_ssa_partition.
        (create_outofssa_var_map): Likewise.
        * tree-ssa-live.c (register_ssa_partition_check): Remove.
        * tree-ssa-live.h (register_ssa_partition): Likewise.
@@ -1381,8 +1372,7 @@
 
 2016-11-14  Martin Liska  <mliska@suse.cz>
 
-       * tree-ssa-dse.c (dse_optimize_stmt): Remove quotes and extra
-       new line.
+       * tree-ssa-dse.c (dse_optimize_stmt): Remove quotes and extra new line.
 
 2016-11-14  Prasad Ghangal  <prasad.ghangal@gmail.com>
            Richard Biener  <rguenther@suse.de>
@@ -2041,7 +2031,7 @@
 2016-11-07  Jack Howarth  <howarth.at.gcc@gmail.com>
 
        PR driver/78206
-       * incpath.c: (remove_dup(): Also silently ignore EPERM.
+       * incpath.c (remove_dup): Also silently ignore EPERM.
 
 2016-11-07  Martin Jambor  <mjambor@suse.cz>
 
@@ -3256,7 +3246,7 @@
        * config/s390/s390.c (s390_adjust_loop_scan_osc): New function.
        (s390_adjust_loops): New function.
        (s390_reorg): Invoke s390_adjust_loops.
-       * config/s390/s390.md: (UNSPEC_OSC_BREAK): New constant.
+       * config/s390/s390.md (UNSPEC_OSC_BREAK): New constant.
        ("osc_break"): New insn definition.
 
 2016-10-28  Andreas Krebbel  <krebbel@linux.vnet.ibm.com>
@@ -4824,7 +4814,7 @@
        (calculate_dominance_info_for_region): Likewise.
        (free_dominance_info_for_region): Likewise.
        * dominance.h: Add prototypes for introduced region-based functions
-       tree-if-conv.c: (build_region): New function.
+       * tree-if-conv.c (build_region): New function.
        (if_convertible_loop_p_1): Invoke local version of post-dominators
        calculation before basic block predication with subsequent freeing
        post-dominator info.
@@ -20913,7 +20903,7 @@
 
 2016-05-07  Jim Wilson  <jim.wilson@linaro.org>
 
-       * config/arm/arm.md: (arch): Add neon.
+       * config/arm/arm.md (arch): Add neon.
        (arch_enabled): Return yes for arch neon when TARGET_NEON.
        * config/arm/vfp.md (movdf_vfp): Add w/G as alternative 3.  Add
        neon_move as type for alt 3.  Add arch attr enabling alt 3 for neon.
@@ -25109,7 +25099,7 @@
 2016-03-21  Kirill Yukhin  <kirill.yukhin@intel.com>
 
        PR target/70293
-       * config/i386/sse.md: (define_insn "*vec_dup<mode>"/AVX2):
+       * config/i386/sse.md (define_insn "*vec_dup<mode>"/AVX2):
        Block third alternative for AVX-512VL target,
 
 2016-03-21  Martin Liska  <mliska@suse.cz>

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 7ecd1e4e726e4cb31b1c9fe22dcb777e71468fb2..d1acededa7ad4610856fd9b3553e096192bd1818 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3914,7 +3914,7 @@ check_p_subdirs=$(wordlist 1,$(check_p_count),$(wordlist 1, \
 # testsuites like objc or go.
 $(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 c72ac09e1483b6f43080e7eed7b08af3c3590994..ae124deb1f1dbb1e098e948f3e474f537894a561 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-18  Richard Sandiford  <richard.sandiford@arm.com>
            Alan Hayward  <alan.hayward@arm.com>
            David Sherwood  <david.sherwood@arm.com>

diff --git a/gcc/ada/gcc-interface/Make-lang.in b/gcc/ada/gcc-interface/Make-lang.in
index b5d1f0ea1733eae5ae65c30c64d24f99a5ec8ec6..eb0489b4a503171da2eb6f13e93b63e6d8c40e9f 100644 (file)
--- a/gcc/ada/gcc-interface/Make-lang.in
+++ b/gcc/ada/gcc-interface/Make-lang.in
@@ -890,7 +890,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/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b125a5518a97f3635d7f7074fed321f6ca11f478..55d20c3e89483db67cb7880f26deaea5ab371448 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -49,12 +49,12 @@
 
 2016-11-22  Szabolcs Nagy  <szabolcs.nagy@arm.com>
 
-       PR libgfortran/78449 
+       PR libgfortran/78449
        * gfortran.dg/ieee/ieee_8.f90 (aarch64*gnu, arm*gnu*): Mark xfail.
 
 2016-11-21  Jeff Law  <law@redhat.com>
 
-        PR target/68538
+       PR target/68538
        * gcc.c-torture/compile/pr68538.c: New test.
 
 2016-11-21  Michael Meissner  <meissner@linux.vnet.ibm.com>
@@ -147,7 +147,7 @@
        * gcc.target/m68k/pr48551.c: New test.
 
 2016-11-20  Harald Anlauf  <anlauf@gmx.de>
- 
+
        PR fortran/69741
        * gfortran.dg/forall_18.f90: New testcase.
 
@@ -226,8 +226,8 @@
 2016-11-18  Andrew Bennett  <andrew.bennett@imgtec.com>
            Toma Tabacu  <toma.tabacu@imgtec.com>
 
-       * gcc.target/mips/inline-memcpy-1.c (dg-options): Add
-       (REQUIRES_STDLIB).
+       * gcc.target/mips/inline-memcpy-1.c (dg-options):
+       Add (REQUIRES_STDLIB).
        * gcc.target/mips/inline-memcpy-2.c: Ditto.
        * gcc.target/mips/inline-memcpy-3.c: Ditto.
        * gcc.target/mips/inline-memcpy-4.c: Ditto.
@@ -256,8 +256,7 @@
        * gcc.target/mips/mips.exp (mips_option_groups): Add stdlib.
        (mips_preprocess): Add ignore_output argument that when set
        will not return the pre-processed output.
-       (mips_arch_info): Update arguments for the call to
-       mips_preprocess.
+       (mips_arch_info): Update arguments for the call to mips_preprocess.
        (mips-dg-init): Ditto.
        (mips-dg-options): Check if a test having test option
        (REQUIRES_STDLIB) has the required sysroot support for
@@ -356,7 +355,7 @@
        * gcc.target/aarch64/store_repeating_constant_2.c: Likewise.
 
 2016-11-17  Bill Schmidt  <wschmidt@linux.vnet.ibm.com>
-            Richard Biener  <rguenther@suse.de>
+           Richard Biener  <rguenther@suse.de>
 
        PR tree-optimization/77848
        * gfortran.dg/vect/pr77848.f: New test.
@@ -531,7 +530,7 @@
 2015-11-16  Wilco Dijkstra  <wdijkstr@arm.com>
 
        * gcc.dg/optimize-bswapdi-3.c: Remove xfail.
-       * gcc.dg/optimize-bswaphi-1.c: Likewise.        
+       * gcc.dg/optimize-bswaphi-1.c: Likewise.
        * gcc.dg/optimize-bswapsi-2.c: Likewise.
 
 2016-11-16  Szabolcs Nagy  <szabolcs.nagy@arm.com>
@@ -616,9 +615,9 @@
 2016-11-15  Uros Bizjak  <ubizjak@gmail.com>
 
        * gcc.target/i386/funcspec-56.inc: New file.
-       * gcc.target/i386.funcspec-5.c: Include funcspec-56.inc.  Remove
+       * gcc.target/i386/funcspec-5.c: Include funcspec-56.inc.  Remove
        common 32-bit and 64-bit function specific options.
-       * gcc.target/i386.funcspec-6.c: Ditto.
+       * gcc.target/i386/funcspec-6.c: Ditto.
 
 2016-11-15  Jakub Jelinek  <jakub@redhat.com>
 

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 29d6eb7b7112efedb1f0efdd6526821785032a33..70197d9eb1ff4a210a8dd383ab34138bea44064b 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-22  Jonathan Wakely  <jwakely@redhat.com>
 
        PR libstdc++/78465
@@ -7376,7 +7383,7 @@
        (is_assignable_v, is_copy_assignable_v, is_move_assignable_v)
        (is_destructible_v, is_trivially_constructible_v)
        (is_trivially_default_constructible_v)
-       (is_trivially_copy_constructible_v, is_trivially_move_constructible_v)
+       (is_trivially_copy_constructible_v, is_trivially_move_constructible_v)
        (is_trivially_assignable_v, is_trivially_copy_assignable_v)
        (is_trivially_move_assignable_v, is_trivially_destructible_v)
        (is_nothrow_constructible_v, is_nothrow_default_constructible_v)

diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am
index af57d0b534cd88062e93b378f9487b089a956fb5..65848f0166ec1e8b27c7b885f5ef4b3729b42ba9 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 b37758b2ccbc9969a57e6f7b82f5b035f06efe4b..1cdf4b894ecbbf3060a53227697139e38380fffb 100644 (file)
--- a/libstdc++-v3/testsuite/Makefile.in
+++ b/libstdc++-v3/testsuite/Makefile.in
@@ -598,7 +598,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); \