https://gcc.gnu.org/g:7a9a6091b81d8579ab0470e4e21b5682d4ee4ef4
commit r15-714-g7a9a6091b81d8579ab0470e4e21b5682d4ee4ef4
Author: Kewen Lin <li...@linux.ibm.com>
Date: Mon May 20 21:01:08 2024 -0500
testsuite, rs6000: Remove effective target powerpc_405_nocache
With the introduction of -mdejagnu-cpu=, when the test case
is specifying -mdejagnu-cpu=405, it would override the other
possibly given -mcpu=, so it would compile for PowerPC 405
for sure. This patch is to remove the effective target
powerpc_405_nocache and update all its uses.
gcc/testsuite/ChangeLog:
* gcc.target/powerpc/405-dlmzb-strlen-1.c: Remove the line using
powerpc_405_nocache check.
* gcc.target/powerpc/405-macchw-1.c: Likewise.
* gcc.target/powerpc/405-macchw-2.c: Likewise.
* gcc.target/powerpc/405-macchwu-1.c: Likewise.
* gcc.target/powerpc/405-macchwu-2.c: Likewise.
* gcc.target/powerpc/405-machhw-1.c: Likewise.
* gcc.target/powerpc/405-machhw-2.c: Likewise.
* gcc.target/powerpc/405-machhwu-1.c: Likewise.
* gcc.target/powerpc/405-machhwu-2.c: Likewise.
* gcc.target/powerpc/405-maclhw-1.c: Likewise.
* gcc.target/powerpc/405-maclhw-2.c: Likewise.
* gcc.target/powerpc/405-maclhwu-1.c: Likewise.
* gcc.target/powerpc/405-maclhwu-2.c: Likewise.
* gcc.target/powerpc/405-mulchw-1.c: Likewise.
* gcc.target/powerpc/405-mulchw-2.c: Likewise.
* gcc.target/powerpc/405-mulchwu-1.c: Likewise.
* gcc.target/powerpc/405-mulchwu-2.c: Likewise.
* gcc.target/powerpc/405-mulhhw-1.c: Likewise.
* gcc.target/powerpc/405-mulhhw-2.c: Likewise.
* gcc.target/powerpc/405-mulhhwu-1.c: Likewise.
* gcc.target/powerpc/405-mulhhwu-2.c: Likewise.
* gcc.target/powerpc/405-mullhw-1.c: Likewise.
* gcc.target/powerpc/405-mullhw-2.c: Likewise.
* gcc.target/powerpc/405-mullhwu-1.c: Likewise.
* gcc.target/powerpc/405-mullhwu-2.c: Likewise.
* gcc.target/powerpc/405-nmacchw-1.c: Likewise.
* gcc.target/powerpc/405-nmacchw-2.c: Likewise.
* gcc.target/powerpc/405-nmachhw-1.c: Likewise.
* gcc.target/powerpc/405-nmachhw-2.c: Likewise.
* gcc.target/powerpc/405-nmaclhw-1.c: Likewise.
* gcc.target/powerpc/405-nmaclhw-2.c: Likewise.
* lib/target-supports.exp
(check_effective_target_powerpc_405_nocache): Remove.
Diff:
---
gcc/testsuite/gcc.target/powerpc/405-dlmzb-strlen-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-macchw-1.c | 6 +++++-
gcc/testsuite/gcc.target/powerpc/405-macchw-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-macchwu-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-macchwu-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-machhw-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-machhw-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-machhwu-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-machhwu-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-maclhw-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-maclhw-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-maclhwu-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-maclhwu-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mulchw-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mulchw-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mulchwu-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mulchwu-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mulhhw-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mulhhw-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mulhhwu-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mulhhwu-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mullhw-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mullhw-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mullhwu-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-mullhwu-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-nmacchw-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-nmacchw-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-nmachhw-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-nmachhw-2.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-nmaclhw-1.c | 1 -
gcc/testsuite/gcc.target/powerpc/405-nmaclhw-2.c | 1 -
gcc/testsuite/lib/target-supports.exp | 17 -----------------
32 files changed, 5 insertions(+), 48 deletions(-)
diff --git a/gcc/testsuite/gcc.target/powerpc/405-dlmzb-strlen-1.c
b/gcc/testsuite/gcc.target/powerpc/405-dlmzb-strlen-1.c
index 5ee427a3b4a9..984ffe7144c4 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-dlmzb-strlen-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-dlmzb-strlen-1.c
@@ -4,7 +4,6 @@
/* { dg-skip-if "" { powerpc*-*-aix* } } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "dlmzb\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-macchw-1.c
b/gcc/testsuite/gcc.target/powerpc/405-macchw-1.c
index 2253a9c9deb8..10ea9cc10f8f 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-macchw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-macchw-1.c
@@ -3,10 +3,14 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "macchw " } } */
+/* Ensure -mdejagnu-cpu=405 always defines __PPC405__. */
+#ifndef __PPC405__
+#error not a PPC405
+#endif
+
int
f(int a, int b, int c)
{
diff --git a/gcc/testsuite/gcc.target/powerpc/405-macchw-2.c
b/gcc/testsuite/gcc.target/powerpc/405-macchw-2.c
index aa16413217e8..6e0eff2126ce 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-macchw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-macchw-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "macchw\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-macchwu-1.c
b/gcc/testsuite/gcc.target/powerpc/405-macchwu-1.c
index 3a6a1b80df98..e615959f4360 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-macchwu-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-macchwu-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "macchwu " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-macchwu-2.c
b/gcc/testsuite/gcc.target/powerpc/405-macchwu-2.c
index c1baf82f9325..19cbc16ea343 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-macchwu-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-macchwu-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "macchwu\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-machhw-1.c
b/gcc/testsuite/gcc.target/powerpc/405-machhw-1.c
index 54d37599af53..134cd2d509f5 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-machhw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-machhw-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "machhw " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-machhw-2.c
b/gcc/testsuite/gcc.target/powerpc/405-machhw-2.c
index 96a5433e4e74..e04cbe42208e 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-machhw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-machhw-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "machhw\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-machhwu-1.c
b/gcc/testsuite/gcc.target/powerpc/405-machhwu-1.c
index c61f61ad0cd9..507736b8c559 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-machhwu-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-machhwu-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "machhwu " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-machhwu-2.c
b/gcc/testsuite/gcc.target/powerpc/405-machhwu-2.c
index fa4c2fc0cccf..8d2fd5c9ced5 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-machhwu-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-machhwu-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "machhwu\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-maclhw-1.c
b/gcc/testsuite/gcc.target/powerpc/405-maclhw-1.c
index 619a22a40759..f171f76ac0f3 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-maclhw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-maclhw-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "maclhw " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-maclhw-2.c
b/gcc/testsuite/gcc.target/powerpc/405-maclhw-2.c
index b55dcaa662cc..953f70b2287f 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-maclhw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-maclhw-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "maclhw\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-maclhwu-1.c
b/gcc/testsuite/gcc.target/powerpc/405-maclhwu-1.c
index c4ca9a43fedb..73b97e02a103 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-maclhwu-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-maclhwu-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "maclhwu " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-maclhwu-2.c
b/gcc/testsuite/gcc.target/powerpc/405-maclhwu-2.c
index 74be5924729d..f395e4934515 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-maclhwu-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-maclhwu-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "maclhwu\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mulchw-1.c
b/gcc/testsuite/gcc.target/powerpc/405-mulchw-1.c
index 1f29428f5729..ad77d16d3595 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mulchw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mulchw-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mulchw " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mulchw-2.c
b/gcc/testsuite/gcc.target/powerpc/405-mulchw-2.c
index 2d40fa3ba8cc..9b65fa5115bb 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mulchw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mulchw-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mulchw\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mulchwu-1.c
b/gcc/testsuite/gcc.target/powerpc/405-mulchwu-1.c
index 8fdd9fa9ea3c..741742c412e8 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mulchwu-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mulchwu-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mulchwu " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mulchwu-2.c
b/gcc/testsuite/gcc.target/powerpc/405-mulchwu-2.c
index af8713882be1..82ff7c4a432c 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mulchwu-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mulchwu-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mulchwu\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mulhhw-1.c
b/gcc/testsuite/gcc.target/powerpc/405-mulhhw-1.c
index 65747009d486..644665011e53 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mulhhw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mulhhw-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mulhhw " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mulhhw-2.c
b/gcc/testsuite/gcc.target/powerpc/405-mulhhw-2.c
index b3d9a028c109..9c53a9e3de9c 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mulhhw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mulhhw-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mulhhw\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mulhhwu-1.c
b/gcc/testsuite/gcc.target/powerpc/405-mulhhwu-1.c
index cc96bb8f0b7a..ab80a410b18b 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mulhhwu-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mulhhwu-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mulhhwu " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mulhhwu-2.c
b/gcc/testsuite/gcc.target/powerpc/405-mulhhwu-2.c
index f921e4f2dc9f..d56b9597782c 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mulhhwu-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mulhhwu-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mulhhwu\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mullhw-1.c
b/gcc/testsuite/gcc.target/powerpc/405-mullhw-1.c
index b70f6712ff40..4079887e777e 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mullhw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mullhw-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mullhw " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mullhw-2.c
b/gcc/testsuite/gcc.target/powerpc/405-mullhw-2.c
index b3fa19c8e1f8..c92078a7bcff 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mullhw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mullhw-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mullhw\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mullhwu-1.c
b/gcc/testsuite/gcc.target/powerpc/405-mullhwu-1.c
index 7707ff321425..dec08dc2bae1 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mullhwu-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mullhwu-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mullhwu " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-mullhwu-2.c
b/gcc/testsuite/gcc.target/powerpc/405-mullhwu-2.c
index 6e4d92c1ebde..d2b57bd08cfc 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-mullhwu-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-mullhwu-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "mullhwu\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-nmacchw-1.c
b/gcc/testsuite/gcc.target/powerpc/405-nmacchw-1.c
index b5585d8bd04c..fefbb2b302bb 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-nmacchw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-nmacchw-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "nmacchw " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-nmacchw-2.c
b/gcc/testsuite/gcc.target/powerpc/405-nmacchw-2.c
index ce2a16c24cba..3930d560a7ed 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-nmacchw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-nmacchw-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "nmacchw\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-nmachhw-1.c
b/gcc/testsuite/gcc.target/powerpc/405-nmachhw-1.c
index d0cf9fe2c58e..d71e27950cdd 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-nmachhw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-nmachhw-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "nmachhw " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-nmachhw-2.c
b/gcc/testsuite/gcc.target/powerpc/405-nmachhw-2.c
index 396456921861..ec64c5ceef7b 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-nmachhw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-nmachhw-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "nmachhw\\. " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-nmaclhw-1.c
b/gcc/testsuite/gcc.target/powerpc/405-nmaclhw-1.c
index f5cb17b8f6d3..e704cda241d5 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-nmaclhw-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-nmaclhw-1.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "nmaclhw " } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/405-nmaclhw-2.c
b/gcc/testsuite/gcc.target/powerpc/405-nmaclhw-2.c
index fb84421dc227..bd37b2557fc3 100644
--- a/gcc/testsuite/gcc.target/powerpc/405-nmaclhw-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/405-nmaclhw-2.c
@@ -3,7 +3,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target ilp32 } */
/* { dg-options "-O2 -mdejagnu-cpu=405" } */
-/* { dg-skip-if "other options override -mcpu=405" { ! powerpc_405_nocache } }
*/
/* { dg-final { scan-assembler "nmaclhw\\. " } } */
diff --git a/gcc/testsuite/lib/target-supports.exp
b/gcc/testsuite/lib/target-supports.exp
index 07687466f9c3..cf5512074ad5 100644
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -7248,23 +7248,6 @@ proc check_effective_target_powerpc_altivec { } {
}
}
-# Return 1 if this is a PowerPC 405 target. The check includes options
-# specified by dg-options for this test, so don't cache the result.
-
-proc check_effective_target_powerpc_405_nocache { } {
- if { [istarget powerpc*-*-*] || [istarget rs6000-*-*] } {
- return [check_no_compiler_messages_nocache powerpc_405 object {
- #ifdef __PPC405__
- int dummy;
- #else
- #error not a PPC405
- #endif
- } [current_compiler_flags]]
- } else {
- return 0
- }
-}
-
# Return 1 if this is a PowerPC target using the ELFv2 ABI.
proc check_effective_target_powerpc_elfv2 { } {
