Also adjust DejaGnu directives, as specifically requiring "powerpc*-*-*" is no
longer required.
2021-04-18 Paul A. Clarke <p...@us.ibm.com>
gcc/testsuite
* g++.dg/pr65240.h: Move to g++.target/powerpc.
* g++.dg/pr93974.C: Likewise.
* g++.dg/pr65240-1.C: Move to g++.target/powerpc, adjust dg directives.
* g++.dg/pr65240-2.C: Likewise.
* g++.dg/pr65240-3.C: Likewise.
* g++.dg/pr65240-4.C: Likewise.
* g++.dg/pr65242.C: Likewise.
* g++.dg/pr67211.C: Likewise.
* g++.dg/pr69667.C: Likewise.
* g++.dg/pr71294.C: Likewise.
* g++.dg/pr84264.C: Likewise.
* g++.dg/pr84279.C: Likewise.
* g++.dg/pr85657.C: Likewise.
---
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-1.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-2.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-3.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h | 0
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C | 5 +++--
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C | 2 +-
gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C | 0
13 files changed, 27 insertions(+), 19 deletions(-)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-1.C (68%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-2.C (68%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-3.C (67%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240-4.C (65%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65240.h (100%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr65242.C (92%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr67211.C (90%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr69667.C (96%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr71294.C (96%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84264.C (79%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr84279.C (89%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr85657.C (90%)
rename gcc/testsuite/{g++.dg => g++.target/powerpc}/pr93974.C (100%)
diff --git a/gcc/testsuite/g++.dg/pr65240-1.C
b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
similarity index 68%
rename from gcc/testsuite/g++.dg/pr65240-1.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-1.C
index ff8910df6a1a..23026673e76b 100644
--- a/gcc/testsuite/g++.dg/pr65240-1.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-1.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile { target lp64 } } */
+/* Never tested on darwin, so skip there. */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small
-mno-fp-in-toc -Wno-return-type" } */
diff --git a/gcc/testsuite/g++.dg/pr65240-2.C
b/gcc/testsuite/g++.target/powerpc/pr65240-2.C
similarity index 68%
rename from gcc/testsuite/g++.dg/pr65240-2.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-2.C
index bdb7a62d73d2..ddd3b3b75f43 100644
--- a/gcc/testsuite/g++.dg/pr65240-2.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-2.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile { target lp64 } } */
+/* Never tested on darwin, so skip there. */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small
-mfp-in-toc -Wno-return-type" } */
diff --git a/gcc/testsuite/g++.dg/pr65240-3.C
b/gcc/testsuite/g++.target/powerpc/pr65240-3.C
similarity index 67%
rename from gcc/testsuite/g++.dg/pr65240-3.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-3.C
index f37db9025d12..9e826c46ae7f 100644
--- a/gcc/testsuite/g++.dg/pr65240-3.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-3.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile { target lp64 } } */
+/* Never tested on darwin, so skip there. */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=medium
-Wno-return-type" } */
diff --git a/gcc/testsuite/g++.dg/pr65240-4.C
b/gcc/testsuite/g++.target/powerpc/pr65240-4.C
similarity index 65%
rename from gcc/testsuite/g++.dg/pr65240-4.C
rename to gcc/testsuite/g++.target/powerpc/pr65240-4.C
index efb6a6c06e7c..6047f136536e 100644
--- a/gcc/testsuite/g++.dg/pr65240-4.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65240-4.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile { target lp64 } } */
+/* Never tested on darwin, so skip there. */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_vsx_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -O3 -ffast-math -Wno-return-type" } */
diff --git a/gcc/testsuite/g++.dg/pr65240.h
b/gcc/testsuite/g++.target/powerpc/pr65240.h
similarity index 100%
rename from gcc/testsuite/g++.dg/pr65240.h
rename to gcc/testsuite/g++.target/powerpc/pr65240.h
diff --git a/gcc/testsuite/g++.dg/pr65242.C
b/gcc/testsuite/g++.target/powerpc/pr65242.C
similarity index 92%
rename from gcc/testsuite/g++.dg/pr65242.C
rename to gcc/testsuite/g++.target/powerpc/pr65242.C
index 662f375015f2..09f5bb35f11d 100644
--- a/gcc/testsuite/g++.dg/pr65242.C
+++ b/gcc/testsuite/g++.target/powerpc/pr65242.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile { target lp64 } } */
+/* Never tested on darwin, so skip there. */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -O3" } */
diff --git a/gcc/testsuite/g++.dg/pr67211.C
b/gcc/testsuite/g++.target/powerpc/pr67211.C
similarity index 90%
rename from gcc/testsuite/g++.dg/pr67211.C
rename to gcc/testsuite/g++.target/powerpc/pr67211.C
index ac241818ab5b..5cd00ba98ee4 100644
--- a/gcc/testsuite/g++.dg/pr67211.C
+++ b/gcc/testsuite/g++.target/powerpc/pr67211.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile { target lp64 } } */
+/* Never tested on darwin, so skip there. */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
/* { dg-options "-mdejagnu-cpu=power7 -mdejagnu-tune=power8 -O3 -w" } */
diff --git a/gcc/testsuite/g++.dg/pr69667.C
b/gcc/testsuite/g++.target/powerpc/pr69667.C
similarity index 96%
rename from gcc/testsuite/g++.dg/pr69667.C
rename to gcc/testsuite/g++.target/powerpc/pr69667.C
index 422116dd5995..2d6d51d11a32 100644
--- a/gcc/testsuite/g++.dg/pr69667.C
+++ b/gcc/testsuite/g++.target/powerpc/pr69667.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile { target lp64 } } */
+/* Never tested on darwin, so skip there. */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
/* { dg-options "-mdejagnu-cpu=power8 -w -std=c++14" } */
diff --git a/gcc/testsuite/g++.dg/pr71294.C
b/gcc/testsuite/g++.target/powerpc/pr71294.C
similarity index 96%
rename from gcc/testsuite/g++.dg/pr71294.C
rename to gcc/testsuite/g++.target/powerpc/pr71294.C
index 716fa0d44b20..1da1e327a285 100644
--- a/gcc/testsuite/g++.dg/pr71294.C
+++ b/gcc/testsuite/g++.target/powerpc/pr71294.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target { powerpc64*-*-* && lp64 } } }
+// { dg-do compile { target lp64 } }
// { dg-require-effective-target powerpc_p8vector_ok } */
// { dg-options "-mdejagnu-cpu=power8 -O3 -fstack-protector" }
diff --git a/gcc/testsuite/g++.dg/pr84264.C
b/gcc/testsuite/g++.target/powerpc/pr84264.C
similarity index 79%
rename from gcc/testsuite/g++.dg/pr84264.C
rename to gcc/testsuite/g++.target/powerpc/pr84264.C
index 4f8a77d8ac41..c9968cf66aa7 100644
--- a/gcc/testsuite/g++.dg/pr84264.C
+++ b/gcc/testsuite/g++.target/powerpc/pr84264.C
@@ -1,4 +1,4 @@
-/* { dg-do compile { target { powerpc*-*-* } } } */
+/* { dg-do compile } */
/* { dg-options "-w -O1 -fstack-protector-strong" } */
void _setjmp ();
diff --git a/gcc/testsuite/g++.dg/pr84279.C
b/gcc/testsuite/g++.target/powerpc/pr84279.C
similarity index 89%
rename from gcc/testsuite/g++.dg/pr84279.C
rename to gcc/testsuite/g++.target/powerpc/pr84279.C
index e78201c30dbe..f551ac156cfd 100644
--- a/gcc/testsuite/g++.dg/pr84279.C
+++ b/gcc/testsuite/g++.target/powerpc/pr84279.C
@@ -1,5 +1,6 @@
-/* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } } */
+/* { dg-do compile } */
+/* Never tested on darwin, so skip there. */
+/* { dg-skip-if "" { *-*-darwin* } } */
/* { dg-require-effective-target powerpc_p8vector_ok } */
/* { dg-require-effective-target fpic } */
/* { dg-options "-O3 -mdejagnu-cpu=power8 -g -fPIC -fvisibility=hidden
-fstack-protector-strong" } */
diff --git a/gcc/testsuite/g++.dg/pr85657.C
b/gcc/testsuite/g++.target/powerpc/pr85657.C
similarity index 90%
rename from gcc/testsuite/g++.dg/pr85657.C
rename to gcc/testsuite/g++.target/powerpc/pr85657.C
index e62b62abcc5a..3a386542154d 100644
--- a/gcc/testsuite/g++.dg/pr85657.C
+++ b/gcc/testsuite/g++.target/powerpc/pr85657.C
@@ -1,4 +1,4 @@
-// { dg-do compile { target { powerpc*-*-linux* } } }
+// { dg-do compile { target { *-*-linux* } } }
// { dg-require-effective-target ppc_float128_sw }
// { dg-options "-mvsx -mfloat128 -O2 -mabi=ibmlongdouble -Wno-psabi" }
diff --git a/gcc/testsuite/g++.dg/pr93974.C
b/gcc/testsuite/g++.target/powerpc/pr93974.C
similarity index 100%
rename from gcc/testsuite/g++.dg/pr93974.C
rename to gcc/testsuite/g++.target/powerpc/pr93974.C
--
2.27.0
