testsuite, rs6000: Replace powerpc_altivec_ok with powerpc_altivec [PR114842]

diff --git a/gcc/testsuite/c-c++-common/pr72747-1.c b/gcc/testsuite/c-c++-common/pr72747-1.c
index e87069df0f6..f825dfafa69 100644
--- a/gcc/testsuite/c-c++-common/pr72747-1.c
+++ b/gcc/testsuite/c-c++-common/pr72747-1.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -fdump-tree-gimple" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* PR 72747: Test that cascaded definition is happening for constant vectors. */

diff --git a/gcc/testsuite/c-c++-common/pr72747-2.c b/gcc/testsuite/c-c++-common/pr72747-2.c
index 080d6fc4251..407840f19c4 100644
--- a/gcc/testsuite/c-c++-common/pr72747-2.c
+++ b/gcc/testsuite/c-c++-common/pr72747-2.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-c -maltivec -fdump-tree-gimple" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* PR 72747: test that cascaded definition is happening for non constants. */

diff --git a/gcc/testsuite/g++.dg/torture/pr79905.C b/gcc/testsuite/g++.dg/torture/pr79905.C
index ab9d07c6373..678f1a3e792 100644
--- a/gcc/testsuite/g++.dg/torture/pr79905.C
+++ b/gcc/testsuite/g++.dg/torture/pr79905.C
@@ -1,7 +1,7 @@ 
 // PR target/79905
 // { dg-do compile { target { powerpc*-*-* } } }
-// { dg-require-effective-target powerpc_altivec_ok }
 // { dg-options "-maltivec" }
+// { dg-require-effective-target powerpc_altivec }

 typedef int V4i __attribute__((vector_size(16)));
 void a (V4i) {
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-1.C b/gcc/testsuite/g++.target/powerpc/altivec-1.C
index a809de2a3bf..1b06c7651a9 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-1.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-1.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-10.C b/gcc/testsuite/g++.target/powerpc/altivec-10.C
index c9c47542611..257db81af55 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-10.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-10.C
@@ -1,8 +1,8 @@ 
 /* This is a compile-only test for interaction of "-maltivec" and "-save-temps".  */
 /* Author:  Ziemowit Laski  <zlaski@apple.com>.  */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-save-temps -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-11.C b/gcc/testsuite/g++.target/powerpc/altivec-11.C
index c767715c8b6..49b61955b8f 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-11.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-11.C
@@ -1,7 +1,7 @@ 
 /* Test handling of literal constant for dss operation.  */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-12.C b/gcc/testsuite/g++.target/powerpc/altivec-12.C
index f57923e7155..a6659c86b6e 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-12.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-12.C
@@ -1,7 +1,7 @@ 
 /* Test vec_dst* functions with float pointer as first argument.  */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-13.C b/gcc/testsuite/g++.target/powerpc/altivec-13.C
index 286d7789076..7b63b0e5ceb 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-13.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-13.C
@@ -3,8 +3,8 @@ 
    AltiVec testsuite.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-14.C b/gcc/testsuite/g++.target/powerpc/altivec-14.C
index 8f4cb6af652..cd6b269d2f4 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-14.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-14.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 void f (__attribute__((altivec (vector__))) signed int * a,
 	__attribute__((altivec (vector__))) signed int * const b);
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-15.C b/gcc/testsuite/g++.target/powerpc/altivec-15.C
index dc5d9552c36..3a6ca133c78 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-15.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-15.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* This test was added for an internal compiler error.  The number and
    content of error messages is irrelevant.  */
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-16.C b/gcc/testsuite/g++.target/powerpc/altivec-16.C
index cdfbc6d74aa..b49747f5ca1 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-16.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-16.C
@@ -1,7 +1,7 @@ 
 // PR c++/36662
 // { dg-do compile }
-// { dg-require-effective-target powerpc_altivec_ok }
 // { dg-options "-maltivec" }
+// { dg-require-effective-target powerpc_altivec }

 #define vector __attribute__((altivec (vector__)))

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-17.C b/gcc/testsuite/g++.target/powerpc/altivec-17.C
index d95ac16a699..97b9026a529 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-17.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-17.C
@@ -1,6 +1,6 @@ 
 // { dg-do compile }
-// { dg-require-effective-target powerpc_altivec_ok }
 // { dg-options "-maltivec" }
+// { dg-require-effective-target powerpc_altivec }

 // Make sure that bool vectors have distinct names to int vectors

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-18.C b/gcc/testsuite/g++.target/powerpc/altivec-18.C
index ddfca943c0c..2bba33946e9 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-18.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-18.C
@@ -1,7 +1,7 @@ 
 // PR target/82112
 // { dg-do compile }
-// { dg-require-effective-target powerpc_altivec_ok }
 // { dg-options "-maltivec" }
+// { dg-require-effective-target powerpc_altivec }

 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-2.C b/gcc/testsuite/g++.target/powerpc/altivec-2.C
index b2eaf62a0ed..9e8645246a9 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-2.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-2.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -Wall -Wno-unused-but-set-variable -Wno-deprecated" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* This test checks if AltiVec builtins accept const-qualified
    arguments.  */
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-3.C b/gcc/testsuite/g++.target/powerpc/altivec-3.C
index 522d62bd3ff..eeda0778fbe 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-3.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-3.C
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { vmx_hw } } } */
 /* { dg-do compile { target { ! vmx_hw } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Test for correct handling of AltiVec constants passed
    through '...' (va_arg).  */
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-4.C b/gcc/testsuite/g++.target/powerpc/altivec-4.C
index 9ac1fbf38a3..9af75a67339 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-4.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-4.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* PR c++/14425 */

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-5.C b/gcc/testsuite/g++.target/powerpc/altivec-5.C
index d11f1fabd25..a32f6cf6f6f 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-5.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-5.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* PR c++/14426 */

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-6.C b/gcc/testsuite/g++.target/powerpc/altivec-6.C
index cfbfa4edc50..c961cf64a15 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-6.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-6.C
@@ -1,8 +1,8 @@ 
 /* Test for correct handling of literal arguments. */
 /* Author: Ziemowit Laski  <zlaski@apple.com>  */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-7.C b/gcc/testsuite/g++.target/powerpc/altivec-7.C
index de166879a16..d5ea699e6c0 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-7.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-7.C
@@ -1,7 +1,7 @@ 
 /* Test for AltiVec type overloading and name mangling.  */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-8.C b/gcc/testsuite/g++.target/powerpc/altivec-8.C
index 2a5891ca0cf..841b111fdba 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-8.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-8.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* Author: Ziemowit Laski  <zlaski@apple.com>  */

 /* This test case exercises intrinsic/argument combinations that,
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-9.C b/gcc/testsuite/g++.target/powerpc/altivec-9.C
index 6f07bdf3027..5b6d132c112 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-9.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-9.C
@@ -1,7 +1,7 @@ 
 /* Test for AltiVec function vec_ld, passing a pointer to const vector */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-cell-1.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-1.C
index cdef3222ad9..fb4be8bb19a 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-cell-1.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-1.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Basic test for the new VMX intrinsics.  */
 #include <altivec.h>
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-cell-2.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-2.C
index 9601545913b..158344c387b 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-cell-2.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-2.C
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { vmx_hw } } } */
 /* { dg-do compile { target { ! vmx_hw } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* Test the vec_extract VMX intrinsics.  */
 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-cell-3.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-3.C
index 76624009c69..21e7f63bafa 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-cell-3.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-3.C
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { vmx_hw } } } */
 /* { dg-do compile { target { ! vmx_hw } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* Test the vec_splats and vec_promote VMX intrinsics.  */
 #include <altivec.h>

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-cell-4.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-4.C
index cbe77972404..e222c7b6f0c 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-cell-4.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-4.C
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { vmx_hw } } } */
 /* { dg-do compile { target { ! vmx_hw } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Test the vec_splats and vec_promote VMX intrinsics.  */
 #include <altivec.h>
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-cell-5.C b/gcc/testsuite/g++.target/powerpc/altivec-cell-5.C
index 13320f6537c..bd62b1c8984 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-cell-5.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-cell-5.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Basic test for the new VMX intrinsics and error messages.  */
 #include <altivec.h>
diff --git a/gcc/testsuite/g++.target/powerpc/altivec-types-1.C b/gcc/testsuite/g++.target/powerpc/altivec-types-1.C
index fe8e11fe07b..4a2652e63a2 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-types-1.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-types-1.C
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx -std=c++98" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Valid AltiVec vector types should be accepted with no warnings.  */

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-types-2.C b/gcc/testsuite/g++.target/powerpc/altivec-types-2.C
index 44b557e92a1..e01b19d2321 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-types-2.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-types-2.C
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* These should get warnings for 32-bit code.  */

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-types-3.C b/gcc/testsuite/g++.target/powerpc/altivec-types-3.C
index 8cb41394e2d..044f89217e9 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-types-3.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-types-3.C
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-require-effective-target lp64 } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */
+/* { dg-require-effective-target lp64 } */

 /* These should be rejected for 64-bit code.  */

diff --git a/gcc/testsuite/g++.target/powerpc/altivec-types-4.C b/gcc/testsuite/g++.target/powerpc/altivec-types-4.C
index 86592da7100..95dee2de057 100644
--- a/gcc/testsuite/g++.target/powerpc/altivec-types-4.C
+++ b/gcc/testsuite/g++.target/powerpc/altivec-types-4.C
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx -mno-warn-altivec-long" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* These should not get warnings for 32-bit code when the warning is
    disabled.  */
diff --git a/gcc/testsuite/g++.target/powerpc/const2.C b/gcc/testsuite/g++.target/powerpc/const2.C
index 27f4c265851..b3d92cdb8c5 100644
--- a/gcc/testsuite/g++.target/powerpc/const2.C
+++ b/gcc/testsuite/g++.target/powerpc/const2.C
@@ -1,5 +1,6 @@ 
-/* { dg-do compile { target powerpc_altivec_ok } } */
+/* { dg-do compile } */
 /* { dg-options "-O -gdwarf-2 -dA -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler "DW_AT_const_value" } } */

 typedef float FloatVect __attribute__((__vector_size__(16)));
diff --git a/gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c b/gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c
index b139122fdeb..ec17ba439f3 100644
--- a/gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c
+++ b/gcc/testsuite/gcc.dg/debug/dwarf2/const-2.c
@@ -1,5 +1,6 @@ 
-/* { dg-do compile { target powerpc_altivec_ok } } */
+/* { dg-do compile } */
 /* { dg-options "-O -gdwarf -dA -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler "DW_AT_const_value" } } */

 typedef float FloatVect __attribute__((__vector_size__(16)));
diff --git a/gcc/testsuite/gcc.dg/dfp/altivec-types.c b/gcc/testsuite/gcc.dg/dfp/altivec-types.c
index 6663a8f649a..3cf93c15f8e 100644
--- a/gcc/testsuite/gcc.dg/dfp/altivec-types.c
+++ b/gcc/testsuite/gcc.dg/dfp/altivec-types.c
@@ -1,5 +1,6 @@ 
-/* { dg-do compile { target { powerpc*-*-linux* && powerpc_altivec_ok } } } */
+/* { dg-do compile { target powerpc*-*-linux* } } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* GNU extension: PowerPC AltiVec Built-in Functions.
    These should be rejected as invalid AltiVec types.  */
diff --git a/gcc/testsuite/gcc.dg/ubsan/pr88234.c b/gcc/testsuite/gcc.dg/ubsan/pr88234.c
index 2983cd88aa0..5e4243bcaa4 100644
--- a/gcc/testsuite/gcc.dg/ubsan/pr88234.c
+++ b/gcc/testsuite/gcc.dg/ubsan/pr88234.c
@@ -1,7 +1,7 @@ 
 /* PR target/88234 */
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-fsanitize=signed-integer-overflow -fno-sanitize-recover=signed-integer-overflow -O2 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.dg/vect/vect-82_64.c b/gcc/testsuite/gcc.dg/vect/vect-82_64.c
index 58fc50d474b..2ed02504b08 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-82_64.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-82_64.c
@@ -1,6 +1,7 @@ 
-/* { dg-do run { target { { powerpc*-*-* && lp64 } && powerpc_altivec_ok } } } */
-/* { dg-do compile { target { { powerpc*-*-* && ilp32 } && powerpc_altivec_ok } } } */
+/* { dg-do run { target { powerpc*-*-* && lp64 } } } */
+/* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */
 /* { dg-additional-options "-mpowerpc64 -maltivec -fdump-tree-optimized-details-blocks" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-skip-if "" { powerpc-ibm-aix* } } */

 #include <stdarg.h>
diff --git a/gcc/testsuite/gcc.dg/vect/vect-83_64.c b/gcc/testsuite/gcc.dg/vect/vect-83_64.c
index 88128d34c22..4dd4d005831 100644
--- a/gcc/testsuite/gcc.dg/vect/vect-83_64.c
+++ b/gcc/testsuite/gcc.dg/vect/vect-83_64.c
@@ -1,6 +1,7 @@ 
-/* { dg-do run { target { { powerpc*-*-* && lp64 } && powerpc_altivec_ok } } } */
-/* { dg-do compile { target { { powerpc*-*-* && ilp32 } && powerpc_altivec_ok } } } */
+/* { dg-do run { target { powerpc*-*-* && lp64 } } } */
+/* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */
 /* { dg-additional-options "-mpowerpc64 -maltivec -fdump-tree-optimized-details-blocks" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-skip-if "" { powerpc-ibm-aix* } } */

 #include <stdarg.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-1-runnable.c b/gcc/testsuite/gcc.target/powerpc/altivec-1-runnable.c
index da8ebbc30ba..4e32860a169 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-1-runnable.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-1-runnable.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-1.c b/gcc/testsuite/gcc.target/powerpc/altivec-1.c
index b1809fe2c9c..002fb83feab 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-1.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Program to test PowerPC AltiVec instructions.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-10.c b/gcc/testsuite/gcc.target/powerpc/altivec-10.c
index f532eebbfab..50e84dba669 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-10.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mabi=altivec -fno-inline" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-11.c b/gcc/testsuite/gcc.target/powerpc/altivec-11.c
index 7e3510c3160..217ec5342fe 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-11.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-11.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mno-vsx -mabi=altivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-not "lvx" } } */
 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-12.c b/gcc/testsuite/gcc.target/powerpc/altivec-12.c
index 1f3175f9793..2d7863d0b26 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-12.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-12.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Program to test PowerPC AltiVec instructions.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-13.c b/gcc/testsuite/gcc.target/powerpc/altivec-13.c
index 31ff5092014..6f472b05e53 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-13.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-13.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Author: Ziemowit Laski  <zlaski@apple.com>  */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-14.c b/gcc/testsuite/gcc.target/powerpc/altivec-14.c
index 55acb0b35ce..452539c1b3e 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-14.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-15.c b/gcc/testsuite/gcc.target/powerpc/altivec-15.c
index 4e48cb7652f..d4997a69ba6 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-15.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-15.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-16.c b/gcc/testsuite/gcc.target/powerpc/altivec-16.c
index c36c3914b1a..bc9a7db25c7 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-16.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-16.c
@@ -1,8 +1,8 @@ 
 /* This is a compile-only test for interaction of "-maltivec" and "-save-temps".  */
 /* Author:  Ziemowit Laski  <zlaski@apple.com>.  */
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-save-temps -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-17.c b/gcc/testsuite/gcc.target/powerpc/altivec-17.c
index 8b108326862..7fb604b0f4a 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-17.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-17.c
@@ -2,8 +2,8 @@ 
    typedef name as a vector type specifier.  */

 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mabi=altivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 typedef unsigned int ui;
 typedef signed char sc;
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-18.c b/gcc/testsuite/gcc.target/powerpc/altivec-18.c
index 5d988582049..f7a85436329 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-18.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-18.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mabi=altivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler "vcmpgtub" { target *-*-linux* } } } */
 /* { dg-final { scan-assembler "vcmpgtsb" { target *-*-darwin* } } } */
 /* { dg-final { scan-assembler "vcmpgtsh" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-19.c b/gcc/testsuite/gcc.target/powerpc/altivec-19.c
index 80f305a5447..35c233b6d8c 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-19.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-19.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler "dst" } } */

 void foo ( char* image )
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-2.c b/gcc/testsuite/gcc.target/powerpc/altivec-2.c
index a91ac0c43ac..9e73d36e237 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-2.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Program to test the vector_size attribute.  This needs to run on a
    target that has vectors, so use AltiVec.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-20.c b/gcc/testsuite/gcc.target/powerpc/altivec-20.c
index 4af0bf9d88f..8e5ccd6f5da 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-20.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-20.c
@@ -1,5 +1,7 @@ 
-/* { dg-do compile { target powerpc_altivec_ok } } */
+/* { dg-do compile } */
 /* { dg-options "-maltivec -mdejagnu-cpu=G5 -O2 -Wno-deprecated" } */
+/* { dg-require-effective-target powerpc_altivec } */
+

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-21.c b/gcc/testsuite/gcc.target/powerpc/altivec-21.c
index 906aa197abf..580f989e50e 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-21.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-21.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-22.c b/gcc/testsuite/gcc.target/powerpc/altivec-22.c
index 3c07309e43f..95b26d7dc10 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-22.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-22.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O3 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-not "mfcr" } } */

 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-23.c b/gcc/testsuite/gcc.target/powerpc/altivec-23.c
index 3b039f73b0b..1e6f6d27ea4 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-23.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-23.c
@@ -3,8 +3,8 @@ 
    initializer of automatic ones.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mabi=altivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-24.c b/gcc/testsuite/gcc.target/powerpc/altivec-24.c
index d296fe24658..5c6db80e487 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-24.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-24.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-25.c b/gcc/testsuite/gcc.target/powerpc/altivec-25.c
index a3bd0fd001d..d60a7c1cf36 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-25.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-25.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -Wall" } */
+/* { dg-require-effective-target powerpc_altivec } */


 #define vector __attribute__((__vector_size__(16) ))
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-26.c b/gcc/testsuite/gcc.target/powerpc/altivec-26.c
index 689d13a514f..96369ec54ae 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-26.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-26.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* A compiler implementing context-sensitive keywords must define this
    preprocessor macro so that altivec.h does not provide the vector,
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-27.c b/gcc/testsuite/gcc.target/powerpc/altivec-27.c
index 7db0ea01f2c..51f4fd3c173 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-27.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-27.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #define f0() void x0 (vector float x) { }
 f0 ()
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-28.c b/gcc/testsuite/gcc.target/powerpc/altivec-28.c
index db6c25ac7e8..03ea5d128e2 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-28.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-28.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #define B bool
 #define P pixel
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-29.c b/gcc/testsuite/gcc.target/powerpc/altivec-29.c
index fbce0f76c9d..d69d720af7c 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-29.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-29.c
@@ -1,7 +1,7 @@ 
 /* PR target/39558 */
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -save-temps" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #define ATTRIBUTE_UNUSED __attribute__((unused))

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-3.c b/gcc/testsuite/gcc.target/powerpc/altivec-3.c
index d388ad299a4..9df1ae40625 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-3.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 extern void exit (int);
 extern void abort (void);
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-30.c b/gcc/testsuite/gcc.target/powerpc/altivec-30.c
index 99783191db9..583507dda7e 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-30.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-30.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <stdbool.h>
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-31.c b/gcc/testsuite/gcc.target/powerpc/altivec-31.c
index 233efe1bebb..22f5bdb8df2 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-31.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-31.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #define f0(type) void x0##type (vector _Bool type x) { }
 f0 (int)
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-32.c b/gcc/testsuite/gcc.target/powerpc/altivec-32.c
index 99b9a68c09a..e805c3620c1 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-32.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-32.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -ftree-vectorize -mdejagnu-cpu=power6 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler "vsel" } } */
 /* { dg-final { scan-assembler "vrfim" } } */
 /* { dg-final { scan-assembler "vrfip" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-33.c b/gcc/testsuite/gcc.target/powerpc/altivec-33.c
index 8e912679d2f..2a2f2a57973 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-33.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-33.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* We should only produce one vspltw as we already splatted the value.  */
 /* { dg-final { scan-assembler-times "vspltw" 1 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-34.c b/gcc/testsuite/gcc.target/powerpc/altivec-34.c
index 98fa5d2d419..40ba51639ce 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-34.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-34.c
@@ -1,7 +1,7 @@ 
 /* PR target/49621 */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-35.c b/gcc/testsuite/gcc.target/powerpc/altivec-35.c
index 8173dca94ac..cac46ec3e8e 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-35.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-35.c
@@ -1,7 +1,7 @@ 

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx -O0" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-36.c b/gcc/testsuite/gcc.target/powerpc/altivec-36.c
index ce9e6a36b5d..c7c75867888 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-36.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-36.c
@@ -1,7 +1,7 @@ 
 /* PR target/70296 */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -std=gnu11" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #define c(x) x
 #define f(x)
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-4.c b/gcc/testsuite/gcc.target/powerpc/altivec-4.c
index 2c78f6586d6..204a3c5275a 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-4.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O0 -Wall" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #define vector __attribute__((vector_size(16)))

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-5.c b/gcc/testsuite/gcc.target/powerpc/altivec-5.c
index ae85cdbdc74..4f251d1d0d2 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-5.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #define vector __attribute__((vector_size(16)))

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-6.c b/gcc/testsuite/gcc.target/powerpc/altivec-6.c
index 29856fd0794..109944f539d 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-6.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O0 -Wall -Wno-deprecated" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-7.c b/gcc/testsuite/gcc.target/powerpc/altivec-7.c
index 42c04a1ed79..460feffabcc 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-7.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Origin: Aldy Hernandez  <aldyh@redhat.com>  */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-8.c b/gcc/testsuite/gcc.target/powerpc/altivec-8.c
index 6668cf2db80..326c836fe7b 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-8.c
@@ -2,8 +2,8 @@ 
 /* Test rs6000_legitimate_address.  PRE_INC should be invalid.  */

 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-9.c b/gcc/testsuite/gcc.target/powerpc/altivec-9.c
index b34dc1b51be..3abafdac51e 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-9.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mabi=altivec -g" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* PR9564 */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-cell-1.c b/gcc/testsuite/gcc.target/powerpc/altivec-cell-1.c
index 20d29bf0529..61a2729db13 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-cell-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-cell-1.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Basic test for the new VMX intrinsics.  */
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-cell-2.c b/gcc/testsuite/gcc.target/powerpc/altivec-cell-2.c
index fdb375c9efe..f566fddb84c 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-cell-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-cell-2.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* Test the vec_extract VMX intrinsics.  */
 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-cell-3.c b/gcc/testsuite/gcc.target/powerpc/altivec-cell-3.c
index b941ab186fa..09e2af8f41b 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-cell-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-cell-3.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* Test the vec_splats and vec_promote VMX intrinsics.  */
 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-cell-4.c b/gcc/testsuite/gcc.target/powerpc/altivec-cell-4.c
index c694691d475..8422b5e2d55 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-cell-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-cell-4.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Test the vec_splats and vec_promote VMX intrinsics.  */
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c b/gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c
index 7e5bc78d568..54c6aa076e9 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Basic test for the new VMX intrinsics and error messages.  */
 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-cell-6.c b/gcc/testsuite/gcc.target/powerpc/altivec-cell-6.c
index b29838a64ee..3616df88686 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-cell-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-cell-6.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile  } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mabi=altivec -mdejagnu-cpu=cell" } */
+/* { dg-require-effective-target powerpc_altivec } */
 #include <altivec.h>

 /* This used to ICE with reloading of a constant address. */
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-cell-7.c b/gcc/testsuite/gcc.target/powerpc/altivec-cell-7.c
index cbe5fb9f8a7..50fe1834dd5 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-cell-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-cell-7.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile  } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mabi=altivec -mdejagnu-cpu=cell" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-times "vor" 2 } } */
 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-consts.c b/gcc/testsuite/gcc.target/powerpc/altivec-consts.c
index c68c68125d1..0f4dc6017a7 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-consts.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-consts.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target vmx_hw } } */
 /* { dg-do compile { target { ! vmx_hw } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mabi=altivec -O2 -save-temps" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Check that "easy" AltiVec constants are correctly synthesized.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-macros.c b/gcc/testsuite/gcc.target/powerpc/altivec-macros.c
index e5a09308ea6..33eb4087e18 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-macros.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-macros.c
@@ -1,8 +1,8 @@ 
 /* Copyright (C) 2007 Free Software Foundation, Inc.  */

 /* { dg-do preprocess } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Conditional macros should not be expanded by pragmas.  */
 #pragma __vector
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-perm-1.c b/gcc/testsuite/gcc.target/powerpc/altivec-perm-1.c
index c3cf67e44f4..f67868efcf2 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-perm-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-perm-1.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O -maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 typedef unsigned char V __attribute__((vector_size(16)));

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-perm-2.c b/gcc/testsuite/gcc.target/powerpc/altivec-perm-2.c
index 1b90bb9567c..710e5a6fc97 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-perm-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-perm-2.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O -maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 typedef unsigned short V __attribute__((vector_size(16)));

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-perm-3.c b/gcc/testsuite/gcc.target/powerpc/altivec-perm-3.c
index e6cf2f0464d..ecec504f175 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-perm-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-perm-3.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-skip-if "" { powerpc*le-*-* } } */
 /* { dg-options "-O -maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 typedef unsigned char V __attribute__((vector_size(16)));

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-perm-4.c b/gcc/testsuite/gcc.target/powerpc/altivec-perm-4.c
index 9598edfb010..a1dff4c3eb7 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-perm-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-perm-4.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O -maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 typedef unsigned int V __attribute__((vector_size(16)));

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-pr22085.c b/gcc/testsuite/gcc.target/powerpc/altivec-pr22085.c
index a7b81bbad56..3c3ac9ecf81 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-pr22085.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-pr22085.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -fpreprocessed" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Program to test AltiVec with -fpreprocessed.  */
 int foo(__attribute__((altivec(vector__))) float x,
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-splat.c b/gcc/testsuite/gcc.target/powerpc/altivec-splat.c
index 91ab72d783d..e8e346158a4 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-splat.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-splat.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mabi=altivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Testcase by Richard Guenther and Steven Bosscher.
    Check that "easy" AltiVec constants are correctly synthesized
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-types-1.c b/gcc/testsuite/gcc.target/powerpc/altivec-types-1.c
index b26f16ed3a8..fa4d3f0973c 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-types-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-types-1.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-linux* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Valid AltiVec vector types should be accepted with no warnings.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-types-2.c b/gcc/testsuite/gcc.target/powerpc/altivec-types-2.c
index 4df12da0b19..36a8dcf492b 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-types-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-types-2.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target powerpc*-*-linux* } } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* These should get warnings for 32-bit code.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-types-3.c b/gcc/testsuite/gcc.target/powerpc/altivec-types-3.c
index fe28e53b4e4..2eb21f6c693 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-types-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-types-3.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target powerpc*-*-linux* } } */
-/* { dg-require-effective-target lp64 } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target lp64 } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* These should be rejected for 64-bit code.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-types-4.c b/gcc/testsuite/gcc.target/powerpc/altivec-types-4.c
index 52fa91453d5..7aaf01f3620 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-types-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-types-4.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target powerpc*-*-linux* } } */
-/* { dg-require-effective-target ilp32 } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-warn-altivec-long -mno-vsx" } */
+/* { dg-require-effective-target ilp32 } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* These should not get warnings for 32-bit code when the warning is
    disabled.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-varargs-1.c b/gcc/testsuite/gcc.target/powerpc/altivec-varargs-1.c
index d62f5bb8e47..8b106dc45f4 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-varargs-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-varargs-1.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mabi=altivec -fno-inline" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <stdarg.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-vec-merge.c b/gcc/testsuite/gcc.target/powerpc/altivec-vec-merge.c
index b1ed8b86491..28d667ff698 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-vec-merge.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-vec-merge.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -Wno-deprecated" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-volatile.c b/gcc/testsuite/gcc.target/powerpc/altivec-volatile.c
index a2aa111459e..b3b12b119be 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-volatile.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-volatile.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Check that "volatile" type qualifier is propagated to vector type.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-1.c b/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-1.c
index eb6d1ebd40f..55549e40b08 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec_vld_vst_addr-1.c
@@ -1,5 +1,5 @@ 
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Test vec_ld and vec_st can support both scalar and vector
    type address points, the list is:
diff --git a/gcc/testsuite/gcc.target/powerpc/bool2-av.c b/gcc/testsuite/gcc.target/powerpc/bool2-av.c
index 2d361e062ae..db8be1bd506 100644
--- a/gcc/testsuite/gcc.target/powerpc/bool2-av.c
+++ b/gcc/testsuite/gcc.target/powerpc/bool2-av.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -mdejagnu-cpu=power6 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-not "\[ \t\]and "     } } */
 /* { dg-final { scan-assembler-not "\[ \t\]or "      } } */
 /* { dg-final { scan-assembler-not "\[ \t\]xor "     } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/bool2-p5.c b/gcc/testsuite/gcc.target/powerpc/bool2-p5.c
index 99ac143d99e..86c71a1406d 100644
--- a/gcc/testsuite/gcc.target/powerpc/bool2-p5.c
+++ b/gcc/testsuite/gcc.target/powerpc/bool2-p5.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -mdejagnu-cpu=power5 -mabi=altivec -mno-altivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler	   "\[ \t\]and "     } } */
 /* { dg-final { scan-assembler	   "\[ \t\]or "      } } */
 /* { dg-final { scan-assembler	   "\[ \t\]xor "     } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/bool3-av.c b/gcc/testsuite/gcc.target/powerpc/bool3-av.c
index 92b5ed49925..e0f88d44b81 100644
--- a/gcc/testsuite/gcc.target/powerpc/bool3-av.c
+++ b/gcc/testsuite/gcc.target/powerpc/bool3-av.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -mdejagnu-cpu=power6 -mabi=altivec -maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler	   "\[ \t\]and "     } } */
 /* { dg-final { scan-assembler	   "\[ \t\]or "      } } */
 /* { dg-final { scan-assembler	   "\[ \t\]xor "     } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/builtin-vec-sums-be-int.c b/gcc/testsuite/gcc.target/powerpc/builtin-vec-sums-be-int.c
index b4dfd0637e4..b033ae523d3 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtin-vec-sums-be-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtin-vec-sums-be-int.c
@@ -2,8 +2,8 @@ 
    It produces just the instruction vsumsws in LE and BE modes.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/builtins-3.c b/gcc/testsuite/gcc.target/powerpc/builtins-3.c
index e048e8b2355..0b9aeafa955 100644
--- a/gcc/testsuite/gcc.target/powerpc/builtins-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/builtins-3.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c b/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c
index efcbc03ecbc..831289bc33d 100644
--- a/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/cell_builtin-3.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mdejagnu-cpu=cell" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-times "lvrx" 19 } } */

 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c b/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c
index db4282292eb..283285bc5a2 100644
--- a/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/cell_builtin-5.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mdejagnu-cpu=cell" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-times "stvlx" 19 } } */

 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c b/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c
index ada27ea0d9c..0fbf6f2e9ff 100644
--- a/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/cell_builtin-6.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mdejagnu-cpu=cell" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-times "stvlxl" 19 } } */

 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c b/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c
index ab401568a1c..bdf1827f767 100644
--- a/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/cell_builtin-7.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mdejagnu-cpu=cell" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-times "stvrx" 19 } } */

 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c b/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c
index bbc81cd884d..289091862dc 100644
--- a/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/cell_builtin-8.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mdejagnu-cpu=cell" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-times "stvrxl" 19 } } */

 #include <altivec.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/darwin-save-world-1.c b/gcc/testsuite/gcc.target/powerpc/darwin-save-world-1.c
index c45a90f0f5c..3326765f4fb 100644
--- a/gcc/testsuite/gcc.target/powerpc/darwin-save-world-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/darwin-save-world-1.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-skip-if "need to be able to execute AltiVec" { ! { powerpc_altivec_ok && vmx_hw } } } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
+/* { dg-skip-if "need to be able to execute AltiVec" { ! { powerpc_altivec_ok && vmx_hw } } } */

 /* With altivec turned on, Darwin wants to save the world but we did not mark lr as being saved any more
    as saving the lr is not needed for saving altivec registers.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-char-fwrapv.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-char-fwrapv.c
index 8b9887dd161..1a0add90853 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-char-fwrapv.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-char-fwrapv.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -fwrapv" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-char.c
index 1f303b8d5b7..75e38a4aba1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.c
index 22eec38f25e..37acdea9d8e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -fwrapv" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p7.c
index b27c8a3205d..62ee53aa993 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p7.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results when -mcpu=power7 is specified.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -mdejagnu-cpu=power7 -fwrapv" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p8.c
index 4a154657a68..0d1884f8269 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int-fwrapv.p8.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results when -mcpu=power8 is specified.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -mdejagnu-cpu=power8 -fwrapv" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.c
index 4fb3fbe8664..8f0eb4d2a5b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p7.c
index 6f437bdd2c5..310d26f7002 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p7.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code when -mcpu=power7 is specified.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -mdejagnu-cpu=power7" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p8.c
index 8c712d34ae5..eb8ba359ad6 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-int.p8.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code when -mcpu=power8 is specified.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -mdejagnu-cpu=power8" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-short-fwrapv.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-short-fwrapv.c
index 705bbe97429..0a867f33ae1 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-short-fwrapv.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-short-fwrapv.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -fwrapv" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-short.c
index 0ad850f06b3..1ac66195afb 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-abs-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-1.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-1.c
index 4ffdb81e709..3b6c39bb2e8 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-1.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-2.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-2.c
index c3b5e1d4aec..bc6369afb85 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-2.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-3.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-3.c
index bb7e644caad..da21f5b8937 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-3.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-5.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-5.c
index cc1d8c443a1..976b7647381 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-add-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-add-5.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-double.p7.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-double.p7.c
index e69d9253e2d..a0ba94976ac 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-double.p7.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-extract-double.p7.c
@@ -2,9 +2,9 @@ 
    double inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-mdejagnu-cpu=power7 -O2" } */
 /* { dg-additional-options "-mbig-endian" { target powerpc*-*-linux* } } */
+/* { dg-require-effective-target powerpc_altivec } */

 // targeting P7 (BE), 2 tests.
 // P7 constants: xxpermdi
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-char.c
index 9ed1a94231b..018e331c9f8 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-float.c
index ff6b965c040..8b5abfa286d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-float.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-int.c
index 8a477d0bf61..fa3c635825c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-short.c
index bb4835b59ef..d99375736c6 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-ld-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-short.c
index 0e78f3585f5..44ee7a07cf9 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-madd-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-char.c
index 1762603ec7f..acbb5deb180 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-float.c
index 989101635b0..fc9d659d947 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-float.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-int.c
index 4da09fd8411..ee1f6830338 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 " } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-short.c
index b3a0362ee18..e394737518a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mergehl-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-char.c
index 6c412a4ed25..d35ff12a612 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-int.c
index 0dea882db9f..c1a9742361b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-short.c
index 02d12aa3fb9..5fd1cdd9aa3 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-minmax-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-missing-lhs.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-missing-lhs.c
index 6add9038288..225c4e35d03 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-missing-lhs.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-missing-lhs.c
@@ -4,8 +4,8 @@ 
    This was noticed during debug of PR81317.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-msum-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-msum-char.c
index 53519d50293..6ad4b93984d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-msum-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-msum-char.c
@@ -2,8 +2,8 @@ 
    produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-msum-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-msum-short.c
index 2e590ab8066..805dc140519 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-msum-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-msum-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mule-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mule-char.c
index 02d9789f86f..1aaf2e77b72 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mule-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mule-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mule-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mule-short.c
index 79b44d530e5..2d387097e11 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mule-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mule-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-char.c
index 3f946e56fcf..1834d903667 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-short.c
index e7504db720f..54011805a1c 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-mult-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-int.c
index 940faf36755..37cc506b357 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-short.c
index 37cd191dbd8..02a95aacd35 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-pack-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-char.c
index 56a89f3f79b..15b57c6e07d 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-float.c
index 64b8ac78dea..cdc5dcbbe33 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-float.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-int.c
index a6dd59524cb..c936326534b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-pixel.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-pixel.c
index 54fccd26e01..b1be1f4ff44 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-pixel.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-pixel.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-short.c
index 6a5d1a7df96..e5391b25859 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-perm-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-char.c
index ebe91e7bfcd..e16c08d9848 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-int.c
index e9c5fe1ad33..9d384b5e489 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-fwrapv.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-fwrapv.c
index 34264807b89..89dafb1f87a 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-fwrapv.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left-fwrapv.c
@@ -2,8 +2,8 @@ 
 /* This test covers the shift left tests with the -fwrapv option. */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -fwrapv" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left.c
index 36f92b431a4..4136b9e51dc 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-left.c
@@ -2,8 +2,8 @@ 
  * This is a counterpart to the fold-vec-shift-left-frwapv test.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-short.c
index 4ca7c1802a1..d906d87fa56 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-shift-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-32.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-32.c
index f59849edf3e..48c05092622 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-32.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-32.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-8.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-8.c
index 64d6320bbaf..ebe3c37bcfe 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-8.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-char.c
index fbe347c67e6..c789b4077a0 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-int.c
index 5df96d11acb..dd3e1c806d9 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-short.c
index 92bdfa4525f..bfbc52e70df 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splat-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-char.c
index 8f211537d28..c6f1231d674 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 " } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-int.c
index dff0f559599..98c65613437 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile { target lp64 } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 " } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-short.c
index 18102ac1254..2ffc80a6b87 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-splats-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c
index d8de63fdeba..0f2ad5f65b7 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c
index 61780fb308b..f98b96a2cf5 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-float.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c
index 4155a8f130f..56094f15e09 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>
 // void vec_st (vector signed int, int, vector signed int *);
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c
index d9b7a0754a6..f9d5af11d23 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-st-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>
 // vector signed short vec_ld (int, const vector signed short *);
diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-char.c
index 5063bd8cb10..d2e21c1b9d0 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-float.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-float.c
index 8a29def8cc2..21ddc4a6a58 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-float.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-float.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int.c
index 1fac1dc0eeb..a52ecc0c40b 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-short.c
index 67052a2474d..6768ffc1822 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sub-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right results.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-sums-int.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-sums-int.c
index e1047facbff..eba75a860be 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-sums-int.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-sums-int.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-char.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-char.c
index 7f4b3721b20..7b0d546d02e 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-char.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-char.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-pixel.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-pixel.c
index 8e7d11026e9..0f427dbc434 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-pixel.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-pixel.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-short.c b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-short.c
index da5101271f4..6772cad0300 100644
--- a/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-short.c
+++ b/gcc/testsuite/gcc.target/powerpc/fold-vec-unpack-short.c
@@ -2,8 +2,8 @@ 
    inputs produce the right code.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/le-altivec-consts.c b/gcc/testsuite/gcc.target/powerpc/le-altivec-consts.c
index a1db5e92f87..48e103e6809 100644
--- a/gcc/testsuite/gcc.target/powerpc/le-altivec-consts.c
+++ b/gcc/testsuite/gcc.target/powerpc/le-altivec-consts.c
@@ -1,7 +1,7 @@ 
 /* { dg-do run { target vmx_hw } } */
 /* { dg-do compile { target { ! vmx_hw } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mabi=altivec -O2 -save-temps" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Check that "easy" AltiVec constants are correctly synthesized.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fma-3.c b/gcc/testsuite/gcc.target/powerpc/ppc-fma-3.c
index 8608116e2ee..f10b9e3eb39 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fma-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fma-3.c
@@ -1,8 +1,8 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-require-effective-target powerpc_fprs } */
 /* { dg-options "-O3 -ftree-vectorize -mdejagnu-cpu=power6 -maltivec -ffast-math -fno-unroll-loops" } */
+/* { dg-require-effective-target powerpc_altivec } */
+/* { dg-require-effective-target powerpc_fprs } */
 /* { dg-final { scan-assembler-times "vmaddfp" 2 } } */
 /* { dg-final { scan-assembler-times "fmadd " 2 } } */
 /* { dg-final { scan-assembler-times "fmadds" 2 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fma-4.c b/gcc/testsuite/gcc.target/powerpc/ppc-fma-4.c
index 291c2eec4d4..48b61099c0a 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fma-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fma-4.c
@@ -1,8 +1,8 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-require-effective-target powerpc_fprs } */
 /* { dg-options "-O3 -ftree-vectorize -mdejagnu-cpu=power6 -maltivec -ffast-math -ffp-contract=off -fno-unroll-loops" } */
+/* { dg-require-effective-target powerpc_altivec } */
+/* { dg-require-effective-target powerpc_fprs } */
 /* { dg-final { scan-assembler-times "vmaddfp" 1 } } */
 /* { dg-final { scan-assembler-times "fmadd " 1 } } */
 /* { dg-final { scan-assembler-times "fmadds" 1 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-fma-7.c b/gcc/testsuite/gcc.target/powerpc/ppc-fma-7.c
index 05299798c9b..4092e463452 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-fma-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-fma-7.c
@@ -1,8 +1,8 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-require-effective-target powerpc_fprs } */
 /* { dg-options "-O3 -ftree-vectorize -mdejagnu-cpu=power6 -ffast-math" } */
+/* { dg-require-effective-target powerpc_altivec } */
+/* { dg-require-effective-target powerpc_fprs } */
 /* { dg-final { scan-assembler-times "fmadd" 1 } } */
 /* { dg-final { scan-assembler-times "fmsub " 1 } } */
 /* { dg-final { scan-assembler-not "fmul" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-vector-memcpy.c b/gcc/testsuite/gcc.target/powerpc/ppc-vector-memcpy.c
index 74646258265..fa90de3669d 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-vector-memcpy.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-vector-memcpy.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O -maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler "lvx" } } */

 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-vector-memset.c b/gcc/testsuite/gcc.target/powerpc/ppc-vector-memset.c
index 175a756eca7..0d4b9d6b29f 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-vector-memset.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-vector-memset.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O -maltivec -mno-vsx" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler "stvx" } } */

 #include <string.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/pr100645.c b/gcc/testsuite/gcc.target/powerpc/pr100645.c
index c4e92cc8052..fc55cf306a3 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr100645.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr100645.c
@@ -1,5 +1,5 @@ 
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-mdejagnu-cpu=power6 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* This used to ICE.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/pr101384-1.c b/gcc/testsuite/gcc.target/powerpc/pr101384-1.c
index 41cf84bf8bc..8ada48cc5e0 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr101384-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr101384-1.c
@@ -1,7 +1,7 @@ 
 /* PR target/101384 */
 /* { dg-do compile { target le } } */
 /* { dg-options "-O2 -maltivec" } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-times {\mvspltis[whb] [^\n\r]*,-1\M|\mxxspltib[^\n\r]*,255\M} 9 } } */
 /* { dg-final { scan-assembler-times {\mvslw\M} 3 } } */
 /* { dg-final { scan-assembler-times {\mvslh\M} 3 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr101384-2.c b/gcc/testsuite/gcc.target/powerpc/pr101384-2.c
index c14891b5ab4..124dbeb83b6 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr101384-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr101384-2.c
@@ -1,7 +1,7 @@ 
 /* PR target/101384 */
 /* { dg-do compile { target be } } */
 /* { dg-options "-O2 -maltivec" } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* { dg-final { scan-assembler-times {\mvspltis[whb] [^\n\r]*,-1\M|\mxxspltib [^\n\r]*,255\M} 9 } } */
 /* { dg-final { scan-assembler-times {\mvslw\M} 3 } } */
 /* { dg-final { scan-assembler-times {\mvslh\M} 3 } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr103353.c b/gcc/testsuite/gcc.target/powerpc/pr103353.c
index 5d519fb1b7b..0473e6d0cda 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr103353.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr103353.c
@@ -1,8 +1,8 @@ 
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-options "-maltivec -mdejagnu-cpu=power6" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* If the default cpu type is power10 or later, MMA is enabled by default.
    To keep the test point available all the time, this case specifies
    -mdejagnu-cpu=power6 to make it be tested without MMA.  */
-/* { dg-options "-maltivec -mdejagnu-cpu=power6" } */

 /* Verify there is no ICE and don't check the error messages on MMA
    requirement since they could be fragile and are not test points
diff --git a/gcc/testsuite/gcc.target/powerpc/pr103702.c b/gcc/testsuite/gcc.target/powerpc/pr103702.c
index 585946fd64b..37b98e7672b 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr103702.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr103702.c
@@ -1,5 +1,3 @@ 
-/* We don't have one powerpc.*_ok for Power6, use altivec_ok conservatively.  */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-mdejagnu-cpu=power6 -O2 -ftree-loop-vectorize -fno-tree-scev-cprop" } */

 /* Verify there is no ICE.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr108348-1.c b/gcc/testsuite/gcc.target/powerpc/pr108348-1.c
index 29cbe7abffc..630980ec936 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr108348-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr108348-1.c
@@ -1,10 +1,10 @@ 
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mabi=no-altivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* If the default cpu type is power10 or later, type __vector_quad is
    supported.  To keep the test point available all the time, this case
    specifies -mdejagnu-cpu=power9 here.  This needs -mabi=no-altivec
    to do the copying for pass-by-reference function argument on 32 bit
    environment.  */
-/* { dg-options "-mdejagnu-cpu=power9 -mabi=no-altivec" } */

 /* Verify there is no ICE on 32 bit and don't check the error messages
    on unsupported type since they could be fragile and are not test
diff --git a/gcc/testsuite/gcc.target/powerpc/pr108348-2.c b/gcc/testsuite/gcc.target/powerpc/pr108348-2.c
index 9aa8939e2f4..c7e8c6cd96d 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr108348-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr108348-2.c
@@ -1,10 +1,10 @@ 
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-options "-mdejagnu-cpu=power9 -mabi=no-altivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 /* If the default cpu type is power10 or later, type __vector_pair is
    supported.  To keep the test point available all the time, this case
    specifies -mdejagnu-cpu=power9 here.  This needs -mabi=no-altivec
    to do the copying for pass-by-reference function argument on 32 bit
    environment.  */
-/* { dg-options "-mdejagnu-cpu=power9 -mabi=no-altivec" } */

 /* Verify there is no ICE on 32 bit and don't check the error messages
    on unsupported type since they could be fragile and are not test
diff --git a/gcc/testsuite/gcc.target/powerpc/pr109932-1.c b/gcc/testsuite/gcc.target/powerpc/pr109932-1.c
index 374d9f60618..e2acf28950f 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr109932-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr109932-1.c
@@ -1,6 +1,6 @@ 
-/* { dg-require-effective-target int128 } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target int128 } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Verify there is no ICE but one expected error message instead.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/pr109932-2.c b/gcc/testsuite/gcc.target/powerpc/pr109932-2.c
index 374d9f60618..e2acf28950f 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr109932-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr109932-2.c
@@ -1,6 +1,6 @@ 
-/* { dg-require-effective-target int128 } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mno-vsx" } */
+/* { dg-require-effective-target int128 } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Verify there is no ICE but one expected error message instead.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/pr110776.c b/gcc/testsuite/gcc.target/powerpc/pr110776.c
index 749159fd675..e0c93004a3d 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr110776.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr110776.c
@@ -1,5 +1,5 @@ 
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -mdejagnu-cpu=power6 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Verify there is no ICE.  */

diff --git a/gcc/testsuite/gcc.target/powerpc/pr16155.c b/gcc/testsuite/gcc.target/powerpc/pr16155.c
index fffe957dcc4..0b2dfb220e8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr16155.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr16155.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -ansi" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* PR 16155
  * Compilation of a simple altivec test program fails if the -ansi flag is
diff --git a/gcc/testsuite/gcc.target/powerpc/pr16286.c b/gcc/testsuite/gcc.target/powerpc/pr16286.c
index 790b6409fbc..82a4351f9a7 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr16286.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr16286.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* PR 16286
    Compilation of a simple Altivec test program fails if vector, pixel
diff --git a/gcc/testsuite/gcc.target/powerpc/pr27158.c b/gcc/testsuite/gcc.target/powerpc/pr27158.c
index 5476577a924..abdedf831d6 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr27158.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr27158.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */
 #define REGLIST                                                              \
          "77",  "78",  "79",  "80",  "81",  "82",  "83",  "84",  "85",  "86",\
          "87",  "88",  "89",  "90",  "91",  "92",  "93",  "94",  "95",  "96",\
diff --git a/gcc/testsuite/gcc.target/powerpc/pr35907.c b/gcc/testsuite/gcc.target/powerpc/pr35907.c
index 7d5465ea151..82f58ab5871 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr35907.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr35907.c
@@ -1,8 +1,8 @@ 
 /* PR target/35907 */
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
 /* { dg-do compile { target { powerpc*-*-* && { ! vmx_hw } } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #define vector __attribute__((vector_size (16)))
 union
diff --git a/gcc/testsuite/gcc.target/powerpc/pr37168.c b/gcc/testsuite/gcc.target/powerpc/pr37168.c
index 8d35157d0f4..43477255082 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr37168.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr37168.c
@@ -1,7 +1,7 @@ 
 /* PR target/37168 */
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #define C 3.68249351546114573519399405666776E-44f
 #define vector __attribute__ ((altivec (vector__)))
diff --git a/gcc/testsuite/gcc.target/powerpc/pr47197.c b/gcc/testsuite/gcc.target/powerpc/pr47197.c
index a8930f2a5c8..b1e587480d8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr47197.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr47197.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Compile-only test to ensure that expressions can be passed to
    Altivec builtins without error.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr67071-1.c b/gcc/testsuite/gcc.target/powerpc/pr67071-1.c
index 9a98dee9589..72c571b851c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr67071-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr67071-1.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-mdejagnu-cpu=power6 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 vector unsigned char
 foo_char (void)
diff --git a/gcc/testsuite/gcc.target/powerpc/pr67071-2.c b/gcc/testsuite/gcc.target/powerpc/pr67071-2.c
index b2146e28729..d35a62125b4 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr67071-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr67071-2.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-mdejagnu-cpu=power6 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 vector unsigned char
 foo_char (void)
diff --git a/gcc/testsuite/gcc.target/powerpc/pr67071-3.c b/gcc/testsuite/gcc.target/powerpc/pr67071-3.c
index c22511d5da9..b13f1ac59c7 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr67071-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr67071-3.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-mdejagnu-cpu=power6 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */


 vector unsigned char
diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010-2.c b/gcc/testsuite/gcc.target/powerpc/pr70010-2.c
index dd242081537..bcd290177d3 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr70010-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010-2.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
 /* { dg-options "-O2 -flto -maltivec -mno-vsx" } */
 /* { dg-require-effective-target lto } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-require-effective-target powerpc_altivec } */

 vector int c, a, b;

diff --git a/gcc/testsuite/gcc.target/powerpc/pr70010-3.c b/gcc/testsuite/gcc.target/powerpc/pr70010-3.c
index 9fd97d10074..ff72a2409d9 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr70010-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr70010-3.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
 /* { dg-options "-O2 -maltivec -mno-vsx" } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-require-effective-target powerpc_altivec } */

 vector int c, a, b;

diff --git a/gcc/testsuite/gcc.target/powerpc/pr71297.c b/gcc/testsuite/gcc.target/powerpc/pr71297.c
index db1aaf016cd..0bbc086bb3f 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr71297.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr71297.c
@@ -1,6 +1,6 @@ 
 /* PR target/71763 */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-require-effective-target powerpc_altivec } */

 int main ()
 {
diff --git a/gcc/testsuite/gcc.target/powerpc/pr82112.c b/gcc/testsuite/gcc.target/powerpc/pr82112.c
index fbb0f9d3d06..afb2306f6d8 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr82112.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr82112.c
@@ -1,7 +1,7 @@ 
 /* PR target/82112 */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -std=gnu90" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/pr84220-sld.c b/gcc/testsuite/gcc.target/powerpc/pr84220-sld.c
index 2536fc30b98..6f910ba9a17 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84220-sld.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84220-sld.c
@@ -2,8 +2,8 @@ 
 /* Test to ensure we generate invalid parameter errors rather than an ICE
     when calling builtin_vec_sld() with invalid parameters.  */
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/pr84878.c b/gcc/testsuite/gcc.target/powerpc/pr84878.c
index f96d3803d06..8f47235a8db 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr84878.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr84878.c
@@ -1,7 +1,7 @@ 
 /* PR rtl-optimization/84878 */
 /* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -maltivec -mno-vsx -fmodulo-sched -ftree-vectorize -funroll-loops -fassociative-math -fno-signed-zeros -fno-trapping-math" } */
+/* { dg-require-effective-target powerpc_altivec } */

 int ek;
 float zu;
diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv.c b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv.c
index f312550f04d..7fdfbe4b00c 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr86731-fwrapv.c
@@ -4,9 +4,9 @@ 
    gimple folding of the vec_sl() intrinsic.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-require-effective-target lp64 } */
 /* { dg-options "-maltivec -O3 -fwrapv " } */
+/* { dg-require-effective-target powerpc_altivec } */
+/* { dg-require-effective-target lp64 } */

 #include <altivec.h>
 /* original test as reported.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr86731.c b/gcc/testsuite/gcc.target/powerpc/pr86731.c
index 19fefa584fe..c30060d3c97 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr86731.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr86731.c
@@ -2,9 +2,9 @@ 
    left shift properly.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-require-effective-target lp64 } */
 /* { dg-options "-maltivec -O3" } */
+/* { dg-require-effective-target powerpc_altivec } */
+/* { dg-require-effective-target lp64 } */

 #include <altivec.h>
 /* The original test as reported.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/pr88100.c b/gcc/testsuite/gcc.target/powerpc/pr88100.c
index 764c897a497..dd678a326a7 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr88100.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr88100.c
@@ -2,8 +2,8 @@ 
    vec_splat_{su}{8,16,32} invalid data properly. */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/pragma_power6.c b/gcc/testsuite/gcc.target/powerpc/pragma_power6.c
index a9120b77415..c21463f8a6e 100644
--- a/gcc/testsuite/gcc.target/powerpc/pragma_power6.c
+++ b/gcc/testsuite/gcc.target/powerpc/pragma_power6.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-mdejagnu-cpu=power6 -maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/pragma_power7.c b/gcc/testsuite/gcc.target/powerpc/pragma_power7.c
index 2e5b7c2b369..d2e9add07c9 100644
--- a/gcc/testsuite/gcc.target/powerpc/pragma_power7.c
+++ b/gcc/testsuite/gcc.target/powerpc/pragma_power7.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-require-effective-target lp64 } */
 /* { dg-options "-mdejagnu-cpu=power6 -maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */
+/* { dg-require-effective-target lp64 } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/pragma_power9.c b/gcc/testsuite/gcc.target/powerpc/pragma_power9.c
index e05f1f4ddfa..2fbc5fa17ef 100644
--- a/gcc/testsuite/gcc.target/powerpc/pragma_power9.c
+++ b/gcc/testsuite/gcc.target/powerpc/pragma_power9.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
-/* { dg-require-effective-target lp64 } */
 /* { dg-options "-mdejagnu-cpu=power6 -maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */
+/* { dg-require-effective-target lp64 } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/swaps-p8-21.c b/gcc/testsuite/gcc.target/powerpc/swaps-p8-21.c
index f50e2659528..e192ebffb73 100644
--- a/gcc/testsuite/gcc.target/powerpc/swaps-p8-21.c
+++ b/gcc/testsuite/gcc.target/powerpc/swaps-p8-21.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-O2 -mdejagnu-cpu=power8 -maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* The expansion for vector character multiply introduces a vperm operation.
    This tests that changing the vperm mask allows us to remove all swaps
diff --git a/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-1.c b/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-1.c
index dceb5b89bd1..bef112bb10d 100644
--- a/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/unpack-vectorize-1.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2 -ftree-vectorize -fno-vect-cost-model -fno-unroll-loops -fdump-tree-vect-details" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Test if unpack vectorization succeeds for type signed/unsigned
    short and char.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cg.c b/gcc/testsuite/gcc.target/powerpc/vec-cg.c
index c31d217d880..dd6bf3bb805 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cg.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cg.c
@@ -4,8 +4,8 @@ 
    etc. */

 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O0" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/vec-cmpne.c b/gcc/testsuite/gcc.target/powerpc/vec-cmpne.c
index b57e0ac8638..ad93abdb9c3 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-cmpne.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-cmpne.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Test that the vec_cmpne builtin generates the expected Altivec
    instructions.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-constvolatile.c b/gcc/testsuite/gcc.target/powerpc/vec-constvolatile.c
index 07cbd5c291a..3b65cc1654e 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-constvolatile.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-constvolatile.c
@@ -1,8 +1,8 @@ 
 /* Test that const and volatile qualifiers can mix on vec_mul operands.  */

 /* { dg-do compile } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec -mvsx" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/vec-mult-char-1.c b/gcc/testsuite/gcc.target/powerpc/vec-mult-char-1.c
index 4c9dbdc8188..c06bb4e9c76 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-mult-char-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-mult-char-1.c
@@ -1,6 +1,6 @@ 
 /* { dg-do run { target { powerpc*-*-* && vmx_hw } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/vec-mult-char-2.c b/gcc/testsuite/gcc.target/powerpc/vec-mult-char-2.c
index dcfa270a1ee..bffd50bc383 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-mult-char-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-mult-char-2.c
@@ -1,6 +1,6 @@ 
 /* { dg-do compile { target { powerpc*-*-* && vmx_hw } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-options "-maltivec" } */
+/* { dg-require-effective-target powerpc_altivec } */

 #include <altivec.h>

diff --git a/gcc/testsuite/gcc.target/powerpc/vec-rotate-1.c b/gcc/testsuite/gcc.target/powerpc/vec-rotate-1.c
index 6fe96272dde..e1260d11fd1 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-rotate-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-rotate-1.c
@@ -1,5 +1,5 @@ 
 /* { dg-options "-O3 -maltivec" } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Check vectorizer can exploit vector rotation instructions on Power, mainly
    for the case rotation count is const number.
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-rotate-3.c b/gcc/testsuite/gcc.target/powerpc/vec-rotate-3.c
index 373056256fc..a53e2b04eeb 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-rotate-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-rotate-3.c
@@ -1,5 +1,5 @@ 
 /* { dg-options "-O3 -maltivec" } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* Check vectorizer can exploit vector rotation instructions on Power, mainly
    for the case rotation count isn't const number.
diff --git a/gcc/testsuite/gcc.target/powerpc/vec-shift.c b/gcc/testsuite/gcc.target/powerpc/vec-shift.c
index 565324f3f32..dcec88a8f86 100644
--- a/gcc/testsuite/gcc.target/powerpc/vec-shift.c
+++ b/gcc/testsuite/gcc.target/powerpc/vec-shift.c
@@ -1,7 +1,7 @@ 
 /* { dg-do compile { target { powerpc*-*-* } } } */
-/* { dg-require-effective-target powerpc_altivec_ok } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } } */
 /* { dg-options "-mdejagnu-cpu=power7 -O2" } */
+/* { dg-require-effective-target powerpc_altivec } */

 /* This used to ICE.  During gimplification, "i" is widened to an unsigned
    int.  We used to fail at expand time as we tried to cram an SImode item