Always check for target i?86 and x86_64

	libstdc++-v3:
	* testsuite/20_util/variant/index_type.cc: Allow for all ilp32 and
	lp64 targets.

	gcc/testsuite:
	* c-c++-common/fold-masked-cmp-1.c: Allow for i?86-*-* target.
	* c-c++-common/fold-masked-cmp-2.c: Likewise.
	* c-c++-common/fold-masked-cmp-3.c: Likewise.
	* g++.dg/cpp0x/alignas4.C: Allow for i?86-*-* target, don't
	restrict to x86_64-*-*-gnu.
	Skip scan-assembler on *-*-darwin*.
	* g++.dg/vect/pr70944.cc: Allow for i?86-*-* target.
	* gcc.dg/loop-invariant.c: Likewise.
	* gcc.dg/lto/pr70955_0.c: Likewise.
	* gcc.dg/tree-ssa/pr69196-1.c: Likewise.
	* gcc.dg/tree-ssa/pr79803.c: Likewise.
	* gfortran.dg/pr68078.f90: Allow for i?86-*-linux*.

	* g++.dg/debug/dwarf2/const2b.C: Allow for x86_64-*-* target.
	* gcc.dg/attr-ms_struct-1.c: Allow for all i?86-*-*, x86_64-*-*
	targets.
	* gcc.dg/attr-ms_struct-2.c: Likewise.
	* gcc.dg/attr-ms_struct-packed1.c: Likewise.
	* gcc.dg/bf-ms-layout.c: Likewise.
	* gcc.dg/bf-ms-layout-2.c: Likewise.
	* gcc.dg/pic-macro-define.c: Remove target restrictions.
	Require fpic support.
	* gcc.target/i386/bitfield1.c: Allow for all i?86-*-*, x86_64-*-*
	targets.
	* gcc.target/i386/bitfield2.c: Likewise.
	* gcc.target/i386/darwin-fpmath.c: Allow for x86_64-*-darwin*
	targets.
	* gfortran.dg/fmt_pf.f90: Remove i?86-*-solaris2.9* from xfail.

From-SVN: r249409

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ee1a4e265b16196bd120b8bdcbc93dad6be1cada..e22ebf5cb1681d617571991e22c778ad6c0aac54 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,34 @@
+2017-06-20  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * c-c++-common/fold-masked-cmp-1.c: Allow for i?86-*-* target.
+       * c-c++-common/fold-masked-cmp-2.c: Likewise.
+       * c-c++-common/fold-masked-cmp-3.c: Likewise.
+       * g++.dg/cpp0x/alignas4.C: Allow for i?86-*-* target, don't
+       restrict to x86_64-*-*-gnu.
+       Skip scan-assembler on *-*-darwin*.
+       * g++.dg/vect/pr70944.cc: Allow for i?86-*-* target.
+       * gcc.dg/loop-invariant.c: Likewise.
+       * gcc.dg/lto/pr70955_0.c: Likewise.
+       * gcc.dg/tree-ssa/pr69196-1.c: Likewise.
+       * gcc.dg/tree-ssa/pr79803.c: Likewise.
+       * gfortran.dg/pr68078.f90: Allow for i?86-*-linux*.
+
+       * g++.dg/debug/dwarf2/const2b.C: Allow for x86_64-*-* target.
+       * gcc.dg/attr-ms_struct-1.c: Allow for all i?86-*-*, x86_64-*-*
+       targets.
+       * gcc.dg/attr-ms_struct-2.c: Likewise.
+       * gcc.dg/attr-ms_struct-packed1.c: Likewise.
+       * gcc.dg/bf-ms-layout.c: Likewise.
+       * gcc.dg/bf-ms-layout-2.c: Likewise.
+       * gcc.dg/pic-macro-define.c: Remove target restrictions.
+       Require fpic support.
+       * gcc.target/i386/bitfield1.c: Allow for all i?86-*-*, x86_64-*-*
+       targets.
+       * gcc.target/i386/bitfield2.c: Likewise.
+       * gcc.target/i386/darwin-fpmath.c: Allow for x86_64-*-darwin*
+       targets.
+       * gfortran.dg/fmt_pf.f90: Remove i?86-*-solaris2.9* from xfail.
+
 2017-06-20  Nathan Sidwell  <nathan@acm.org>
 
        PR c++/67074

diff --git a/gcc/testsuite/c-c++-common/fold-masked-cmp-1.c b/gcc/testsuite/c-c++-common/fold-masked-cmp-1.c
index a0e9083709e471e69f8b3a357ebd80ecabe7faa0..c56adc4d662e51e927429e1371ae7fb2fb6c5bbc 100644 (file)
--- a/gcc/testsuite/c-c++-common/fold-masked-cmp-1.c
+++ b/gcc/testsuite/c-c++-common/fold-masked-cmp-1.c
@@ -1,6 +1,6 @@
 /* Based on PR 67328 */
 
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 enum output_type

diff --git a/gcc/testsuite/c-c++-common/fold-masked-cmp-2.c b/gcc/testsuite/c-c++-common/fold-masked-cmp-2.c
index 13d068aa1e0d168f27d80c9141c2e29f22935ef5..a14bceb4566eb167e1a23d08aecbd95da006ba49 100644 (file)
--- a/gcc/testsuite/c-c++-common/fold-masked-cmp-2.c
+++ b/gcc/testsuite/c-c++-common/fold-masked-cmp-2.c
@@ -1,6 +1,6 @@
 /* Based on PR 67328 */
 
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 enum output_type

diff --git a/gcc/testsuite/c-c++-common/fold-masked-cmp-3.c b/gcc/testsuite/c-c++-common/fold-masked-cmp-3.c
index 98900ec33b320b44c63f8ab294eed347e78ba63e..5531c359b813abd3edf83ab33e20f267c08bde51 100644 (file)
--- a/gcc/testsuite/c-c++-common/fold-masked-cmp-3.c
+++ b/gcc/testsuite/c-c++-common/fold-masked-cmp-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-fdump-tree-original" } */
 
 void foo (int *p, int x)

diff --git a/gcc/testsuite/g++.dg/cpp0x/alignas4.C b/gcc/testsuite/g++.dg/cpp0x/alignas4.C
index 871aaefed1ff9a679bcdd449a5cf37480ae1a84c..baa56eb8ac51d3031bc3c218967fd46ce0e2c2c2 100644 (file)
--- a/gcc/testsuite/g++.dg/cpp0x/alignas4.C
+++ b/gcc/testsuite/g++.dg/cpp0x/alignas4.C
@@ -1,6 +1,6 @@
 // PR c++/59012
 // { dg-do compile { target c++11 } }
-// { dg-final { scan-assembler "align 8" { target x86_64-*-*-gnu } } }
+// { dg-final { scan-assembler "align 8" { target { { i?86-*-* x86_64-*-* } && { ! *-*-darwin* } } } } }
 
 template <class... T>
 struct A

diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/const2b.C b/gcc/testsuite/g++.dg/debug/dwarf2/const2b.C
index 81360c2439fa5e4f1612b77a8ee9d5aa75cbd1eb..3ad1c080945f96d4aa99af244d878275a8d8e39e 100644 (file)
--- a/gcc/testsuite/g++.dg/debug/dwarf2/const2b.C
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/const2b.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i386*-*-* } } */
+/* { dg-do compile { target i386*-*-* x86_64-*-* } } */
 /* { dg-options "-O -gdwarf-2 -dA -msse" } */
 /* { dg-require-effective-target sse } */
 /* { dg-final { scan-assembler "DW_AT_const_value" } } */

diff --git a/gcc/testsuite/g++.dg/vect/pr70944.cc b/gcc/testsuite/g++.dg/vect/pr70944.cc
index f8973aaff53785e36af7954b005505899bb131db..3c9e3ceb585daf3080f54f81fde95ce120ffc76a 100644 (file)
--- a/gcc/testsuite/g++.dg/vect/pr70944.cc
+++ b/gcc/testsuite/g++.dg/vect/pr70944.cc
@@ -1,4 +1,4 @@
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-additional-options "-O3 -march=core-avx2" } */
 
 unsigned *a;

diff --git a/gcc/testsuite/gcc.dg/attr-ms_struct-1.c b/gcc/testsuite/gcc.dg/attr-ms_struct-1.c
index 0b1d0404fd3aa39945ec9974876142a004959af2..1e6cca59946df91a821d117b7e62b84893cbb6eb 100644 (file)
--- a/gcc/testsuite/gcc.dg/attr-ms_struct-1.c
+++ b/gcc/testsuite/gcc.dg/attr-ms_struct-1.c
@@ -1,5 +1,5 @@
 /* Test for MS structure sizes.  */
-/* { dg-do run { target *-*-mingw* *-*-cygwin* i?86-*-darwin* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-std=gnu99" } */
 

diff --git a/gcc/testsuite/gcc.dg/attr-ms_struct-2.c b/gcc/testsuite/gcc.dg/attr-ms_struct-2.c
index f2534b5cbab5fc594301e2d29861e1f70fc324f0..4ebf06b7d1e70e373681430e04a36aa9c0d486ec 100644 (file)
--- a/gcc/testsuite/gcc.dg/attr-ms_struct-2.c
+++ b/gcc/testsuite/gcc.dg/attr-ms_struct-2.c
@@ -1,5 +1,5 @@
 /* Test for MS structure sizes.  */
-/* { dg-do run { target *-*-mingw* *-*-cygwin* i?86-*-darwin* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-options "-std=gnu99" } */
 

diff --git a/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c b/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c
index 25388d26e2cd91afaada547836469fb3f2b72028..cc26e6ee839c559e0c8d1e8006328b9d590db9fc 100644 (file)
--- a/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c
+++ b/gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c
@@ -1,5 +1,5 @@
 /* Test for MS structure with packed attribute.  */
-/* { dg-do run { target *-*-mingw* *-*-cygwin* i?86-*-darwin* } }
+/* { dg-do run { target i?86-*-* x86_64-*-* } }
 /* { dg-options "-std=gnu99" } */
 
 extern void abort ();

diff --git a/gcc/testsuite/gcc.dg/bf-ms-layout-2.c b/gcc/testsuite/gcc.dg/bf-ms-layout-2.c
index 53a55e603c76f506686debb8f044efee2f7242ec..2d0215fbd52402d38b2c7922e812c49d104703ec 100644 (file)
--- a/gcc/testsuite/gcc.dg/bf-ms-layout-2.c
+++ b/gcc/testsuite/gcc.dg/bf-ms-layout-2.c
@@ -5,7 +5,7 @@
    posted to GCC-patches
    http://gcc.gnu.org/ml/gcc-patches/2000-08/msg00577.html */
 
-/* { dg-do run { target *-*-mingw* *-*-cygwin* i?86-*-darwin* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-D_TEST_MS_LAYOUT" } */
 /* This test uses the attribute instead of the command line option.  */
 

diff --git a/gcc/testsuite/gcc.dg/bf-ms-layout.c b/gcc/testsuite/gcc.dg/bf-ms-layout.c
index 54909d8b32e3a4caebbc5258eab2ec6c8cf0800f..92af9120723047b6981f37de29d8923c3414f50a 100644 (file)
--- a/gcc/testsuite/gcc.dg/bf-ms-layout.c
+++ b/gcc/testsuite/gcc.dg/bf-ms-layout.c
@@ -5,7 +5,7 @@
    posted to GCC-patches
    http://gcc.gnu.org/ml/gcc-patches/2000-08/msg00577.html */
 
-/* { dg-do run { target *-*-mingw* *-*-cygwin* i?86-*-darwin* } } */
+/* { dg-do run { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-mms-bitfields -D_TEST_MS_LAYOUT" } */
 
 #include <stddef.h>

diff --git a/gcc/testsuite/gcc.dg/loop-invariant.c b/gcc/testsuite/gcc.dg/loop-invariant.c
index fe66bb9aaf0544dc15888f43eb1d20f8a39c1fa5..702050b5c7eb620c51f229707f35ec27d37f4ded 100644 (file)
--- a/gcc/testsuite/gcc.dg/loop-invariant.c
+++ b/gcc/testsuite/gcc.dg/loop-invariant.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target x86_64-*-* } } */
+/* { dg-do compile { target i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fdump-rtl-loop2_invariant" } */
 /* NOTE: The target list above could be extended to other targets that have
          conditional moves, but don't have zero registers.  */

diff --git a/gcc/testsuite/gcc.dg/lto/pr70955_0.c b/gcc/testsuite/gcc.dg/lto/pr70955_0.c
index c3b75fc56b38a55b319f31908d6d110bf80bf5e3..52d000a8d586e181a3631959f51ae22894950072 100644 (file)
--- a/gcc/testsuite/gcc.dg/lto/pr70955_0.c
+++ b/gcc/testsuite/gcc.dg/lto/pr70955_0.c
@@ -1,5 +1,5 @@
-/* __builtin_ms_va_list is only supported for x86_64 -m64.  */
-/* { dg-skip-if "" { ! {x86_64-*-* && { ! ilp32 } } } } */
+/* __builtin_ms_va_list is only supported for x86 -m64.  */
+/* { dg-skip-if "" { ! { { i?86-*-* x86_64-*-* } && { ! ilp32 } } } } */
 
 #include <stdio.h>
 

diff --git a/gcc/testsuite/gcc.dg/pic-macro-define.c b/gcc/testsuite/gcc.dg/pic-macro-define.c
index 7bda6fedfef7d5143e20b6f7bd0bd054b12f0532..092343253612d5754d3ea3bb3bfb39a630993523 100644 (file)
--- a/gcc/testsuite/gcc.dg/pic-macro-define.c
+++ b/gcc/testsuite/gcc.dg/pic-macro-define.c
@@ -1,4 +1,5 @@
-/* { dg-do run { target "i?86-*-*-darwin" powerpc*-*-darwin* } } */
+/* { dg-do run } */
+/* { dg-require-effective-target fpic } */
 /* { dg-options "-fPIC" } */
 
 #if defined __PIC__ 

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr69196-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr69196-1.c
index 5f92447854bf8ea899e1d92f242135fb53c7b6c1..960491fd271be3cb184b2a0847de002219e80732 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr69196-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr69196-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target sparc*-*-* x86_64-*-* } } */
+/* { dg-do compile { target sparc*-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O2 -fdump-tree-thread1-details -fdisable-tree-ethread" } */
 
 /* { dg-final { scan-tree-dump "FSM did not thread around loop and would copy too many statements" "thread1" } } */

diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr79803.c b/gcc/testsuite/gcc.dg/tree-ssa/pr79803.c
index 51b245d4d5b0aeafb2308aa3b2f732d1a0c793ff..3b475fa674945637ec56fd25c7a76de95414d6c0 100644 (file)
--- a/gcc/testsuite/gcc.dg/tree-ssa/pr79803.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr79803.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { x86_64-*-* } } } */
+/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */
 /* { dg-options "-march=opteron-sse3 -Ofast --param l1-cache-line-size=3 -Wdisabled-optimization" } */
 /* { dg-require-effective-target indirect_jumps } */
 

diff --git a/gcc/testsuite/gcc.target/i386/bitfield1.c b/gcc/testsuite/gcc.target/i386/bitfield1.c
index e4e06cb0c0fbca85f0430053458357881f4d7389..714792c3d02699c1e1edb729b1cfefb1d21fbf71 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/bitfield1.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield1.c
@@ -2,7 +2,7 @@
 // { dg-do run }
 // { dg-require-effective-target ia32 }
 // { dg-options "-O2" }
-// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-cygwin* i?86-*-mingw*} }
+// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-* x86_64-*-* } }
 
 extern void abort (void);
 extern void exit (int);

diff --git a/gcc/testsuite/gcc.target/i386/bitfield2.c b/gcc/testsuite/gcc.target/i386/bitfield2.c
index db9d284449ebe1143601a7068fc512bf2b557c6e..5784bf0ccb454915eec379717124a7232cdfe0a9 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/bitfield2.c
+++ b/gcc/testsuite/gcc.target/i386/bitfield2.c
@@ -2,7 +2,7 @@
 // { dg-do run }
 // { dg-require-effective-target ia32 }
 // { dg-options "-O2" }
-// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-cygwin* i?86-*-mingw* } }
+// { dg-options "-mno-align-double -mno-ms-bitfields" { target i?86-*-* x86_64-*-* } }
 
 extern void abort (void);
 extern void exit (int);

diff --git a/gcc/testsuite/gcc.target/i386/darwin-fpmath.c b/gcc/testsuite/gcc.target/i386/darwin-fpmath.c
index 7db69467089a4b61ecebd29e8370fb3d4c8b719f..693bdee01f255ab0a432414ed3275330ce419f8b 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/darwin-fpmath.c
+++ b/gcc/testsuite/gcc.target/i386/darwin-fpmath.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target i?86-*-darwin* } } */
+/* { dg-do compile { target i?86-*-darwin* x86_64-*-darwin* } } */
 /* { dg-final { scan-assembler "addsd" } } */
 /* Do not add -msse or -msse2 or -mfpmath=sse to the options.  GCC is
    supposed to use SSE math on Darwin by default, and libm won't work

diff --git a/gcc/testsuite/gfortran.dg/fmt_pf.f90 b/gcc/testsuite/gfortran.dg/fmt_pf.f90
index 6cefa86e4a89557824990d98fa81590fa03bc461..743fcbf680b17239ba698c9775621f2569d806b7 100644 (file)
--- a/gcc/testsuite/gfortran.dg/fmt_pf.f90
+++ b/gcc/testsuite/gfortran.dg/fmt_pf.f90
@@ -223,4 +223,4 @@ contains
         
     end subroutine
 end program
-! { dg-output "All kinds rounded to nearest" { xfail { i?86-*-solaris2.9* hppa*-*-hpux* } } }
+! { dg-output "All kinds rounded to nearest" { xfail { hppa*-*-hpux* } } }

diff --git a/gcc/testsuite/gfortran.dg/pr68078.f90 b/gcc/testsuite/gfortran.dg/pr68078.f90
index 092ab29f4501d8e26c1099f627aac2ab1535bc42..ebe26d55d2bdfa7c852eff7912da1a89763c80c5 100644 (file)
--- a/gcc/testsuite/gfortran.dg/pr68078.f90
+++ b/gcc/testsuite/gfortran.dg/pr68078.f90
@@ -1,4 +1,4 @@
-! { dg-do run { target x86_64-*-linux* } }
+! { dg-do run { target i?86-*-linux* x86_64-*-linux* } }
 ! { dg-additional-sources set_vm_limit.c }
 !
 ! This test calls set_vm_limit to set an artificially low address space

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 04193c7563089fe938a2ac5f6e34ff03bae657dc..59c009930dd47299703cae9ff0a72f8d1542daea 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2017-06-20  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * testsuite/20_util/variant/index_type.cc: Allow for all ilp32 and
+       lp64 targets.
+
 2017-06-19  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * config/abi/post/i386-solaris2.10/baseline_symbols.txt: Regenerate.

diff --git a/libstdc++-v3/testsuite/20_util/variant/index_type.cc b/libstdc++-v3/testsuite/20_util/variant/index_type.cc
index e6d3dda40697489f57a547122f389fcb0c1be016..93dfbd320af3a76d0348a4b571ec4462eb91b838 100644 (file)
--- a/libstdc++-v3/testsuite/20_util/variant/index_type.cc
+++ b/libstdc++-v3/testsuite/20_util/variant/index_type.cc
@@ -1,5 +1,5 @@
 // { dg-options "-std=gnu++17" }
-// { dg-do compile { target x86_64-*-* powerpc*-*-* } }
+// { dg-do compile { target { ilp32 || lp64 } } }
 
 // Copyright (C) 2017 Free Software Foundation, Inc.
 //