diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 0a77dbdf980c..5be1848129ef 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,28 @@
+2020-05-15  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* gcc.target/powerpc/pdep-0.c: Change -mcpu= to -mdejagnu-cpu=.
+	* gcc.target/powerpc/pdep-1.c: Ditto.
+	* gcc.target/powerpc/pextd-0.c: Ditto.
+	* gcc.target/powerpc/pextd-1.c: Ditto.
+	* gcc.target/powerpc/pr90763.c: Ditto.
+	* gcc.target/powerpc/pr91275.c: Ditto.
+	* gcc.target/powerpc/pr92796.c: Ditto.
+	* gcc.target/powerpc/pr93658.c: Ditto.
+	* gcc.target/powerpc/pr93800.c: Ditto.
+	* gcc.target/powerpc/setbceq.c: Ditto.
+	* gcc.target/powerpc/setbcge.c: Ditto.
+	* gcc.target/powerpc/setbcgt.c: Ditto.
+	* gcc.target/powerpc/setbcle.c: Ditto.
+	* gcc.target/powerpc/setbclt.c: Ditto.
+	* gcc.target/powerpc/setbcne.c: Ditto.
+	* gcc.target/powerpc/setnbceq.c: Ditto.
+	* gcc.target/powerpc/setnbcge.c: Ditto.
+	* gcc.target/powerpc/setnbcgt.c: Ditto.
+	* gcc.target/powerpc/setnbcle.c: Ditto.
+	* gcc.target/powerpc/setnbclt.c: Ditto.
+	* gcc.target/powerpc/setnbcne.c: Ditto.
+	* gcc.target/powerpc/xxgenpc-runnable.c: Ditto.
+
 2020-05-15  Patrick Palka  <ppalka@redhat.com>
 
 	PR c++/90996
diff --git a/gcc/testsuite/gcc.target/powerpc/pdep-0.c b/gcc/testsuite/gcc.target/powerpc/pdep-0.c
index 5c6afb33169d..bdf90dd8e375 100644
--- a/gcc/testsuite/gcc.target/powerpc/pdep-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/pdep-0.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target powerpc64 } */
-/* { dg-options "-mcpu=future" } */
+/* { dg-options "-mdejagnu-cpu=future" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pdep-1.c b/gcc/testsuite/gcc.target/powerpc/pdep-1.c
index 40532ee11773..62eb6b253108 100644
--- a/gcc/testsuite/gcc.target/powerpc/pdep-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pdep-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-require-effective-target powerpc_future_hw } */
 /* { dg-require-effective-target powerpc64 } */
-/* { dg-options "-mcpu=future" } */
+/* { dg-options "-mdejagnu-cpu=future" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pextd-0.c b/gcc/testsuite/gcc.target/powerpc/pextd-0.c
index 23a952dc2c69..1a8ccadc2841 100644
--- a/gcc/testsuite/gcc.target/powerpc/pextd-0.c
+++ b/gcc/testsuite/gcc.target/powerpc/pextd-0.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-effective-target powerpc64 } */
-/* { dg-options "-mcpu=future" } */
+/* { dg-options "-mdejagnu-cpu=future" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pextd-1.c b/gcc/testsuite/gcc.target/powerpc/pextd-1.c
index 814ce4325a03..462af98353aa 100644
--- a/gcc/testsuite/gcc.target/powerpc/pextd-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pextd-1.c
@@ -1,7 +1,7 @@
 /* { dg-do run } */
 /* { dg-require-effective-target powerpc_future_hw } */
 /* { dg-require-effective-target powerpc64 } */
-/* { dg-options "-mcpu=future" } */
+/* { dg-options "-mdejagnu-cpu=future" } */
 
 extern void abort (void);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pr90763.c b/gcc/testsuite/gcc.target/powerpc/pr90763.c
index 55f1d461e824..33a462177e36 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr90763.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr90763.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-require-effective-target powerpc_p9vector_ok } */
-/* { dg-options "-mcpu=power9 -O2" } */
+/* { dg-options "-mdejagnu-cpu=power9 -O2" } */
 
 /* PR90763: PowerPC vec_xl_len should take const.
 */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr91275.c b/gcc/testsuite/gcc.target/powerpc/pr91275.c
index bcceec16a0cc..39fcd738bc20 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr91275.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr91275.c
@@ -1,7 +1,7 @@
 /* Test that we generate vpmsumd correctly without a swap error.  */
 
 /* { dg-do run { target { p8vector_hw } } } */
-/* { dg-options "-O2 -std=gnu11 -mcpu=power8" } */
+/* { dg-options "-O2 -std=gnu11 -mdejagnu-cpu=power8" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pr92796.c b/gcc/testsuite/gcc.target/powerpc/pr92796.c
index da4b6a47a6ae..1e671e175def 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr92796.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr92796.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -fstack-protector-strong -mcpu=power8" } */
+/* { dg-options "-O2 -fstack-protector-strong -mdejagnu-cpu=power8" } */
 /* { dg-require-effective-target ppc_ieee128_ok } */
 
 typedef union
diff --git a/gcc/testsuite/gcc.target/powerpc/pr93658.c b/gcc/testsuite/gcc.target/powerpc/pr93658.c
index 0170d34d2595..d1010ee26b0e 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr93658.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr93658.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -fstack-protector-strong -mcpu=power8" } */
+/* { dg-options "-O3 -fstack-protector-strong -mdejagnu-cpu=power8" } */
 /* { dg-require-effective-target powerpc_vsx_ok } */
 
 /* PR93658: Failure compiling this test is an infinite loop in LRA's
diff --git a/gcc/testsuite/gcc.target/powerpc/pr93800.c b/gcc/testsuite/gcc.target/powerpc/pr93800.c
index f8dfbe7c0822..6b0dc76e0f22 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr93800.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr93800.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-mcpu=860 -O2" } */
+/* { dg-options "-mdejagnu-cpu=860 -O2" } */
 /* { dg-require-effective-target ilp32 } */
 /* { dg-final { scan-assembler-not "\\.p2align 4" } } */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/setbceq.c b/gcc/testsuite/gcc.target/powerpc/setbceq.c
index ee3cbffa6f53..32ed03784472 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbceq.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbceq.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME eq
 #define CODE ==
diff --git a/gcc/testsuite/gcc.target/powerpc/setbcge.c b/gcc/testsuite/gcc.target/powerpc/setbcge.c
index 06d581597686..809e59b59323 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbcge.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbcge.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME ge
 #define CODE >=
diff --git a/gcc/testsuite/gcc.target/powerpc/setbcgt.c b/gcc/testsuite/gcc.target/powerpc/setbcgt.c
index 864ae3a7e44d..79b92efb7549 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbcgt.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbcgt.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME gt
 #define CODE >
diff --git a/gcc/testsuite/gcc.target/powerpc/setbcle.c b/gcc/testsuite/gcc.target/powerpc/setbcle.c
index 05df4075b1c5..91da7d743354 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbcle.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbcle.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME le
 #define CODE <=
diff --git a/gcc/testsuite/gcc.target/powerpc/setbclt.c b/gcc/testsuite/gcc.target/powerpc/setbclt.c
index 52ffb1fd7e16..add90ced6afd 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbclt.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbclt.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME lt
 #define CODE <
diff --git a/gcc/testsuite/gcc.target/powerpc/setbcne.c b/gcc/testsuite/gcc.target/powerpc/setbcne.c
index 841448ab5e58..5191384aa10c 100644
--- a/gcc/testsuite/gcc.target/powerpc/setbcne.c
+++ b/gcc/testsuite/gcc.target/powerpc/setbcne.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME ne
 #define CODE !=
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbceq.c b/gcc/testsuite/gcc.target/powerpc/setnbceq.c
index ff4af8f71fa8..b97301b90af9 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbceq.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbceq.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME eq
 #define CODE ==
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbcge.c b/gcc/testsuite/gcc.target/powerpc/setnbcge.c
index 68ee6bda0d0e..e13d5d24ff04 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbcge.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbcge.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME ge
 #define CODE >=
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbcgt.c b/gcc/testsuite/gcc.target/powerpc/setnbcgt.c
index e0f51d49bd1d..7dbd6c0c8f0b 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbcgt.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbcgt.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME gt
 #define CODE >
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbcle.c b/gcc/testsuite/gcc.target/powerpc/setnbcle.c
index 33a5da96964a..a0d739b2c79b 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbcle.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbcle.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME le
 #define CODE <=
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbclt.c b/gcc/testsuite/gcc.target/powerpc/setnbclt.c
index 127d7bfece49..3f55c382cdbe 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbclt.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbclt.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME lt
 #define CODE <
diff --git a/gcc/testsuite/gcc.target/powerpc/setnbcne.c b/gcc/testsuite/gcc.target/powerpc/setnbcne.c
index be1624d6ec2b..f6a5e94bb2d3 100644
--- a/gcc/testsuite/gcc.target/powerpc/setnbcne.c
+++ b/gcc/testsuite/gcc.target/powerpc/setnbcne.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2 -mcpu=future" } */
+/* { dg-options "-O2 -mdejagnu-cpu=future" } */
 
 #define NAME ne
 #define CODE !=
diff --git a/gcc/testsuite/gcc.target/powerpc/xxgenpc-runnable.c b/gcc/testsuite/gcc.target/powerpc/xxgenpc-runnable.c
index de309efd449b..199513b4ffb3 100644
--- a/gcc/testsuite/gcc.target/powerpc/xxgenpc-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/xxgenpc-runnable.c
@@ -1,5 +1,5 @@
 /* { dg-do run } */
-/* { dg-options "-mcpu=future -O2" } */
+/* { dg-options "-mdejagnu-cpu=future -O2" } */
 /* { dg-require-effective-target powerpc_future_hw } */
 
 #include <altivec.h>