From 67ea3f4e0fd389f4f2097c5fe3faa40f18c69d30 Mon Sep 17 00:00:00 2001
From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Tue, 20 Jun 2017 13:01:32 +0000
Subject: [PATCH] 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
---
 gcc/testsuite/ChangeLog                       | 31 +++++++++++++++++++
 .../c-c++-common/fold-masked-cmp-1.c          |  2 +-
 .../c-c++-common/fold-masked-cmp-2.c          |  2 +-
 .../c-c++-common/fold-masked-cmp-3.c          |  2 +-
 gcc/testsuite/g++.dg/cpp0x/alignas4.C         |  2 +-
 gcc/testsuite/g++.dg/debug/dwarf2/const2b.C   |  2 +-
 gcc/testsuite/g++.dg/vect/pr70944.cc          |  2 +-
 gcc/testsuite/gcc.dg/attr-ms_struct-1.c       |  2 +-
 gcc/testsuite/gcc.dg/attr-ms_struct-2.c       |  2 +-
 gcc/testsuite/gcc.dg/attr-ms_struct-packed1.c |  2 +-
 gcc/testsuite/gcc.dg/bf-ms-layout-2.c         |  2 +-
 gcc/testsuite/gcc.dg/bf-ms-layout.c           |  2 +-
 gcc/testsuite/gcc.dg/loop-invariant.c         |  2 +-
 gcc/testsuite/gcc.dg/lto/pr70955_0.c          |  4 +--
 gcc/testsuite/gcc.dg/pic-macro-define.c       |  3 +-
 gcc/testsuite/gcc.dg/tree-ssa/pr69196-1.c     |  2 +-
 gcc/testsuite/gcc.dg/tree-ssa/pr79803.c       |  2 +-
 gcc/testsuite/gcc.target/i386/bitfield1.c     |  2 +-
 gcc/testsuite/gcc.target/i386/bitfield2.c     |  2 +-
 gcc/testsuite/gcc.target/i386/darwin-fpmath.c |  2 +-
 gcc/testsuite/gfortran.dg/fmt_pf.f90          |  2 +-
 gcc/testsuite/gfortran.dg/pr68078.f90         |  2 +-
 libstdc++-v3/ChangeLog                        |  5 +++
 .../testsuite/20_util/variant/index_type.cc   |  2 +-
 24 files changed, 60 insertions(+), 23 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ee1a4e265b1..e22ebf5cb16 100644
--- 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 a0e9083709e..c56adc4d662 100644
--- 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 13d068aa1e0..a14bceb4566 100644
--- 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 98900ec33b3..5531c359b81 100644
--- 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 871aaefed1f..baa56eb8ac5 100644
--- 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 81360c2439f..3ad1c080945 100644
--- 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 f8973aaff53..3c9e3ceb585 100644
--- 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 0b1d0404fd3..1e6cca59946 100644
--- 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 f2534b5cbab..4ebf06b7d1e 100644
--- 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 25388d26e2c..cc26e6ee839 100644
--- 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 53a55e603c7..2d0215fbd52 100644
--- 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 54909d8b32e..92af9120723 100644
--- 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 fe66bb9aaf0..702050b5c7e 100644
--- 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 c3b75fc56b3..52d000a8d58 100644
--- 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 7bda6fedfef..09234325361 100644
--- 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 5f92447854b..960491fd271 100644
--- 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 51b245d4d5b..3b475fa6749 100644
--- 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 e4e06cb0c0f..714792c3d02 100644
--- 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 db9d284449e..5784bf0ccb4 100644
--- 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 7db69467089..693bdee01f2 100644
--- 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 6cefa86e4a8..743fcbf680b 100644
--- 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 092ab29f450..ebe26d55d2b 100644
--- 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 04193c75630..59c009930dd 100644
--- 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 e6d3dda4069..93dfbd320af 100644
--- 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.
 //
-- 
2.30.2