From: Alan Modra <amodra@bigpond.net.au>
Date: Tue, 13 Dec 2005 05:05:29 +0000 (+0000)
Subject: 980523-1.c, [...]: Don't use powerpc-*-* or powerpc64-*-* in target selection strings.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=65b1344e310ec930d82b17551ff5cd63e7724761;p=gcc.git

980523-1.c, [...]: Don't use powerpc-*-* or powerpc64-*-* in target selection strings.

	* gcc.dg/980523-1.c, gcc.dg/980526-1.c, gcc.dg/20020103-1.c,
	gcc.dg/20040625-1.c, gcc.dg/asm-b.c, gcc.dg/iftrap-1.c,
	gcc.dg/iftrap-2.c, gcc.dg/simd-3.c, gcc.dg/switch-1.c,
	gcc.dg/tree-ssa/bool-1.c, gcc.dg/tree-ssa/bool-2.c,
	gcc.dg/tree-ssa/bool-4.c, gcc.dg/tree-ssa/bool-5.c,
	gcc.dg/tree-ssa/bool-6.c, gcc.dg/tree-ssa/bool-8.c,
	gcc.dg/tree-ssa/bool-9.c, gcc.target/powerpc/980827-1.c,
	gcc.target/powerpc/20040622-1.c, gcc.target/powerpc/20050603-3.c,
	gcc.target/powerpc/20050830-1.c, gcc.target/powerpc/altivec-6.c,
	gcc.target/powerpc/altivec-14.c, gcc.target/powerpc/altivec-22.c,
	gcc.target/powerpc/doloop-1.c, gcc.target/powerpc/ppc-and-1.c,
	gcc.target/powerpc/ppc-bitfield1.c, gcc.target/powerpc/ppc-compare-1.c,
	gcc.target/powerpc/ppc-mov-1.c, gcc.target/powerpc/ppc-sdata-1.c,
	gcc.target/powerpc/ppc-sdata-2.c,
	gcc.target/powerpc/ppc-stackalign-1.c,
	gcc.target/powerpc/ppc64-abi-1.c, gcc.target/powerpc/ppc64-abi-2.c,
	gcc.target/powerpc/ppc64-abi-3.c, gcc.target/powerpc/ppc64-toc.c,
	gcc.target/powerpc/pr18096-1.c, gcc.target/powerpc/rs6000-ldouble-1.c,
	gcc.target/powerpc/rs6000-ldouble-2.c,
	gcc.target/powerpc/rs6000-power2-1.c,
	gcc.target/powerpc/rs6000-power2-2.c: Don't use powerpc-*-* or
	powerpc64-*-* in target selection strings.  Instead use powerpc*-*-*
	and ilp32 or lp64 as appropriate.  Merge dg-require-effective-target
	option into target selector.
	* gcc.dg/20020919-1.c: Compile for powerpc*-*-*.  Handle powerpc64.
	* gcc.misc-tests/linkage.exp: Set native_cflags for powerpc*-*-linux*.

From-SVN: r108457
---

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8617accc364..e8b94ae9adb 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,32 @@
+2005-12-13  Alan Modra  <amodra@bigpond.net.au>
+
+	* gcc.dg/980523-1.c, gcc.dg/980526-1.c, gcc.dg/20020103-1.c,
+	gcc.dg/20040625-1.c, gcc.dg/asm-b.c, gcc.dg/iftrap-1.c,
+	gcc.dg/iftrap-2.c, gcc.dg/simd-3.c, gcc.dg/switch-1.c,
+	gcc.dg/tree-ssa/bool-1.c, gcc.dg/tree-ssa/bool-2.c,
+	gcc.dg/tree-ssa/bool-4.c, gcc.dg/tree-ssa/bool-5.c,
+	gcc.dg/tree-ssa/bool-6.c, gcc.dg/tree-ssa/bool-8.c,
+	gcc.dg/tree-ssa/bool-9.c, gcc.target/powerpc/980827-1.c,
+	gcc.target/powerpc/20040622-1.c, gcc.target/powerpc/20050603-3.c,
+	gcc.target/powerpc/20050830-1.c, gcc.target/powerpc/altivec-6.c,
+	gcc.target/powerpc/altivec-14.c, gcc.target/powerpc/altivec-22.c,
+	gcc.target/powerpc/doloop-1.c, gcc.target/powerpc/ppc-and-1.c,
+	gcc.target/powerpc/ppc-bitfield1.c, gcc.target/powerpc/ppc-compare-1.c,
+	gcc.target/powerpc/ppc-mov-1.c, gcc.target/powerpc/ppc-sdata-1.c,
+	gcc.target/powerpc/ppc-sdata-2.c,
+	gcc.target/powerpc/ppc-stackalign-1.c,
+	gcc.target/powerpc/ppc64-abi-1.c, gcc.target/powerpc/ppc64-abi-2.c,
+	gcc.target/powerpc/ppc64-abi-3.c, gcc.target/powerpc/ppc64-toc.c,
+	gcc.target/powerpc/pr18096-1.c, gcc.target/powerpc/rs6000-ldouble-1.c,
+	gcc.target/powerpc/rs6000-ldouble-2.c,
+	gcc.target/powerpc/rs6000-power2-1.c,
+	gcc.target/powerpc/rs6000-power2-2.c: Don't use powerpc-*-* or
+	powerpc64-*-* in target selection strings.  Instead use powerpc*-*-*
+	and ilp32 or lp64 as appropriate.  Merge dg-require-effective-target
+	option into target selector.
+	* gcc.dg/20020919-1.c: Compile for powerpc*-*-*.  Handle powerpc64.
+	* gcc.misc-tests/linkage.exp: Set native_cflags for powerpc*-*-linux*.
+
 2005-12-12  Andrew Pinski  <pinskia@physics.uc.edu>
 
 	PR objc/25348
diff --git a/gcc/testsuite/gcc.dg/20020103-1.c b/gcc/testsuite/gcc.dg/20020103-1.c
index 54ad83c21e5..c0612ae20db 100644
--- a/gcc/testsuite/gcc.dg/20020103-1.c
+++ b/gcc/testsuite/gcc.dg/20020103-1.c
@@ -1,6 +1,6 @@
 /* Verify that constant equivalences get reloaded properly, either by being
    spilled to the stack, or regenerated, but not dropped to memory.  */
-/* { dg-do compile { target i?86-*-* powerpc-*-* rs6000-*-* alpha*-*-* x86_64-*-*} } */
+/* { dg-do compile { target { { i?86-*-* rs6000-*-* alpha*-*-* x86_64-*-* } || { powerpc*-*-* && ilp32 } } } } */
 /* { dg-options "-O2 -fpic -fno-omit-frame-pointer -fno-asynchronous-unwind-tables" } */
 /* { dg-final { scan-assembler-not "LC\[0-9\]" } } */
 
diff --git a/gcc/testsuite/gcc.dg/20020919-1.c b/gcc/testsuite/gcc.dg/20020919-1.c
index 9c16d3d07e8..1224199407b 100644
--- a/gcc/testsuite/gcc.dg/20020919-1.c
+++ b/gcc/testsuite/gcc.dg/20020919-1.c
@@ -8,7 +8,7 @@
    You must be this tall ---> fit two long longs in asm-declared registers
    to enter this amusement.  */
 
-/* { dg-do compile { target alpha-*-* cris-*-* i?86-*-* mmix-*-* powerpc-*-* rs6000-*-* x86_64-*-* } } */
+/* { dg-do compile { target alpha-*-* cris-*-* i?86-*-* mmix-*-* powerpc*-*-* rs6000-*-* x86_64-*-* } } */
 /* { dg-options "-O2" } */
 
 /* Constructed examples; input/output (same register), output, input, and
@@ -41,8 +41,10 @@
 	|| defined (__POWERPC__) || defined (PPC) || defined (_IBMR2)
 # define REG1 "6"
 # define REG2 "7"
-# define REG3 "8"
-# define REG4 "9"
+# ifndef __powerpc64__
+#  define REG3 "8"
+#  define REG4 "9"
+# endif
 #elif defined (__x86_64__)
 # define REG1 "rax"
 # define REG2 "rdx"
diff --git a/gcc/testsuite/gcc.dg/20040625-1.c b/gcc/testsuite/gcc.dg/20040625-1.c
index bbda6fd05fc..0a576a5b643 100644
--- a/gcc/testsuite/gcc.dg/20040625-1.c
+++ b/gcc/testsuite/gcc.dg/20040625-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run } */
 /* { dg-options "-O2" } */
-/* { dg-options "-mminimal-toc" { target powerpc64-*-* powerpc-ibm-aix* } } */
+/* { dg-options "-mminimal-toc" { target { { powerpc*-*-* && lp64 } || { powerpc-ibm-aix* } } } } */
 
 extern void abort (void);
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/980523-1.c b/gcc/testsuite/gcc.dg/980523-1.c
index 71f416e5d78..6ca79efff16 100644
--- a/gcc/testsuite/gcc.dg/980523-1.c
+++ b/gcc/testsuite/gcc.dg/980523-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target rs6000-*-linux* powerpc-*-linux*} } */
+/* { dg-do run { target rs6000-*-linux* powerpc*-*-linux*} } */
 /* { dg-options "-O2 -fpic" } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.dg/980526-1.c b/gcc/testsuite/gcc.dg/980526-1.c
index 08ef6e285a1..b92f8883dfb 100644
--- a/gcc/testsuite/gcc.dg/980526-1.c
+++ b/gcc/testsuite/gcc.dg/980526-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target rs6000-*-linux* powerpc-*-linux* } } */
+/* { dg-do compile { target rs6000-*-linux* powerpc*-*-linux* } } */
 /* { dg-options "-O2 -fpic" } */
 
 int
diff --git a/gcc/testsuite/gcc.dg/asm-b.c b/gcc/testsuite/gcc.dg/asm-b.c
index 8067500e57f..cc3f9665db3 100644
--- a/gcc/testsuite/gcc.dg/asm-b.c
+++ b/gcc/testsuite/gcc.dg/asm-b.c
@@ -1,4 +1,4 @@
-/* { dg-do run  { target powerpc-*-* i?86-*-* x86_64-*-* } } */
+/* { dg-do run  { target powerpc*-*-* i?86-*-* x86_64-*-* } } */
 /* { dg-options "-O1" } */
 /* Test to make sure that inline-asm causes the tree optimizers to get the
    V_MAY_DEFs and clobber memory.  */
diff --git a/gcc/testsuite/gcc.dg/iftrap-1.c b/gcc/testsuite/gcc.dg/iftrap-1.c
index 69d754df35c..142782042a5 100644
--- a/gcc/testsuite/gcc.dg/iftrap-1.c
+++ b/gcc/testsuite/gcc.dg/iftrap-1.c
@@ -1,6 +1,6 @@
 /* Verify that we optimize to conditional traps.  */
 /* { dg-options "-O" } */
-/* { dg-do compile { target rs6000-*-* powerpc-*-* sparc*-*-* ia64-*-* } } */
+/* { dg-do compile { target rs6000-*-* powerpc*-*-* sparc*-*-* ia64-*-* } } */
 /* { dg-final { scan-assembler-not "^\t(trap|ta|break)\[ \t\]" } } */
 
 void f1(int p)
diff --git a/gcc/testsuite/gcc.dg/iftrap-2.c b/gcc/testsuite/gcc.dg/iftrap-2.c
index 4aa8ee7d62c..8c9c0577ca5 100644
--- a/gcc/testsuite/gcc.dg/iftrap-2.c
+++ b/gcc/testsuite/gcc.dg/iftrap-2.c
@@ -1,6 +1,6 @@
 /* Verify that we optimize to conditional traps.  */
 /* { dg-options "-O" } */
-/* { dg-do compile { target rs6000-*-* powerpc-*-* sparc*-*-* ia64-*-* } } */
+/* { dg-do compile { target rs6000-*-* powerpc*-*-* sparc*-*-* ia64-*-* } } */
 /* { dg-final { scan-assembler-not "^\t(trap|ta|break)\[ \t\]" } } */
 
 extern void abort(void);
diff --git a/gcc/testsuite/gcc.dg/simd-3.c b/gcc/testsuite/gcc.dg/simd-3.c
index 34ad75d9602..a806633eaeb 100644
--- a/gcc/testsuite/gcc.dg/simd-3.c
+++ b/gcc/testsuite/gcc.dg/simd-3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-maltivec" { target powerpc-*-* } } */
+/* { dg-options "-maltivec" { target powerpc*-*-* } } */
 
 __attribute__ ((vector_size (2))) signed char v1, v2, v3;
 void
diff --git a/gcc/testsuite/gcc.dg/switch-1.c b/gcc/testsuite/gcc.dg/switch-1.c
index 457c5205388..e4f5ad62859 100644
--- a/gcc/testsuite/gcc.dg/switch-1.c
+++ b/gcc/testsuite/gcc.dg/switch-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target rs6000-*-linux* powerpc-*-linux*} } */
+/* { dg-do compile { target rs6000-*-linux* powerpc*-*-linux*} } */
 /* { dg-options "-fpic -O2" } */
 
 void f (char *s)
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c
index 90cdef90c4e..699f3aba33f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-1.c
@@ -14,6 +14,6 @@ int f(_Bool x)
 
 /* There should be no adde for powerpc. Checking if we actually optimizated
    away the comparision.  */
-/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */
+/* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
 /* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c
index e46189ad9f2..2fdd496ba69 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-2.c
@@ -17,6 +17,6 @@ int f(_Bool x)
 
 /* There should be no adde for powerpc. Checking if we actually optimizated
    away the comparision.  */
-/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */
+/* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
 /* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c
index 389124f0ede..06356f62689 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-4.c
@@ -12,6 +12,6 @@ int f(_Bool x)
 
 /* There should be no adde for powerpc. Checking if we actually optimizated
    away the comparision.  */
-/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */
+/* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
 /* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c
index 1cb9de2ceda..5ea03878f66 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-5.c
@@ -14,6 +14,6 @@ int f(_Bool x)
 
 /* There should be no adde for powerpc. Checking if we actually optimizated
    away the comparision.  */
-/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */
+/* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
 /* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c
index 85f0333b826..9340397abe9 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-6.c
@@ -17,6 +17,6 @@ int f(_Bool x)
 
 /* There should be no adde for powerpc. Checking if we actually optimizated
    away the comparision.  */
-/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */
+/* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
 /* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c
index 5a133097c38..869f9b8e15f 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-8.c
@@ -12,6 +12,6 @@ int f(_Bool x)
 
 /* There should be no adde for powerpc. Checking if we actually optimizated
    away the comparision.  */
-/* { dg-final { scan-assembler-times "adde" 0 { target powerpc-*-* } } } */
+/* { dg-final { scan-assembler-times "adde" 0 { target powerpc*-*-* } } } */
 
 /* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c b/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c
index 09df2e48983..59e04178fad 100644
--- a/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c
+++ b/gcc/testsuite/gcc.dg/tree-ssa/bool-9.c
@@ -12,6 +12,6 @@ _Bool f1(_Bool x)
 
 /* There should be no subfe for powerpc. Checking if we actually optimizated
    away the comparision.  */
-/* { dg-final { scan-assembler-times "subfe" 0 { target powerpc-*-* } } } */
+/* { dg-final { scan-assembler-times "subfe" 0 { target powerpc*-*-* } } } */
 
 /* { dg-final { cleanup-tree-dump "optimized" } } */
diff --git a/gcc/testsuite/gcc.misc-tests/linkage.exp b/gcc/testsuite/gcc.misc-tests/linkage.exp
index e0808d6cd4f..6617023a46a 100644
--- a/gcc/testsuite/gcc.misc-tests/linkage.exp
+++ b/gcc/testsuite/gcc.misc-tests/linkage.exp
@@ -66,10 +66,12 @@ if [isnative] then {
 	    if [ string match "*ELF-64*" $file_string ] {
 		set native_cflags "+DD64"
 	    }
-	} elseif [istarget "powerpc64*-*-linux*"] {
+	} elseif [istarget "powerpc*-*-linux*"] {
 	    set file_string [exec file "linkage-x.o"]
 	    if [ string match "*64-bit*" $file_string ] {
 		set native_cflags "-m64"
+	    } elseif [ string match "*32-bit*" $file_string ] {
+		set native_cflags "-m32"
 	    }
 	}
 
diff --git a/gcc/testsuite/gcc.target/powerpc/20040622-1.c b/gcc/testsuite/gcc.target/powerpc/20040622-1.c
index 4562fe6eaa1..c699296d464 100644
--- a/gcc/testsuite/gcc.target/powerpc/20040622-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/20040622-1.c
@@ -1,5 +1,5 @@
 /* { dg-options "-Os -mlong-double-128" } */
-/* { dg-do compile { target rs6000-*-* powerpc-*-* } } */
+/* { dg-do compile { target { { rs6000-*-* } || { powerpc*-*-* && lp64 } } } } */
 /* Make sure compiler doesn't generate [reg+reg] address mode
    for long doubles. */
 union arg {
diff --git a/gcc/testsuite/gcc.target/powerpc/20050603-3.c b/gcc/testsuite/gcc.target/powerpc/20050603-3.c
index 35be6602155..0f328e1711f 100644
--- a/gcc/testsuite/gcc.target/powerpc/20050603-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/20050603-3.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target "powerpc-*-*" } } */
+/* { dg-do compile { target { ilp32 } } } */
 /* { dg-options "-O2" } */
 struct Q 
 {
diff --git a/gcc/testsuite/gcc.target/powerpc/20050830-1.c b/gcc/testsuite/gcc.target/powerpc/20050830-1.c
index edbf6b8e43a..4a8f71a9871 100644
--- a/gcc/testsuite/gcc.target/powerpc/20050830-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/20050830-1.c
@@ -1,5 +1,5 @@
 /* Make sure the doloop optimization is done for this loop. */
-/* { dg-do compile { target powerpc-*-* } } */
+/* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-options "-O2" } */
 /* { dg-final { scan-assembler "bdn" } } */
 extern int a[];
diff --git a/gcc/testsuite/gcc.target/powerpc/980827-1.c b/gcc/testsuite/gcc.target/powerpc/980827-1.c
index 84ba5ee4d5f..5d526d38f08 100644
--- a/gcc/testsuite/gcc.target/powerpc/980827-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/980827-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target rs6000-*-linux* powerpc-*-linux*} } */
+/* { dg-do run { target { *-*-linux* && ilp32 } } } */
 /* { dg-options -O2 } */
 
 extern void exit (int);
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-14.c b/gcc/testsuite/gcc.target/powerpc/altivec-14.c
index b5712225771..e3ca8845dfb 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-14.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-14.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc-*-* } } */
+/* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */
 /* { dg-xfail-if "" { "powerpc-*-eabispe*" "powerpc-ibm-aix*" } { "*" } { "" } } */
 /* { dg-options "-maltivec" } */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-22.c b/gcc/testsuite/gcc.target/powerpc/altivec-22.c
index 1af117c18fd..310007da403 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-22.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-22.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc-*-* } } */
+/* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */
 /* { dg-xfail-if "" { "powerpc-*-eabispe*" "powerpc-ibm-aix*" } { "*" } { "" } } */
 /* { dg-options "-O3 -maltivec" } */
 /* { dg-final { scan-assembler-not "mfcr" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-6.c b/gcc/testsuite/gcc.target/powerpc/altivec-6.c
index e0193546679..9d31046fa52 100644
--- a/gcc/testsuite/gcc.target/powerpc/altivec-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/altivec-6.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc-*-* } } */
+/* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
 /* { dg-options "-maltivec -O0 -Wall" } */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/doloop-1.c b/gcc/testsuite/gcc.target/powerpc/doloop-1.c
index 036239969e8..d4bc454153a 100644
--- a/gcc/testsuite/gcc.target/powerpc/doloop-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/doloop-1.c
@@ -2,7 +2,7 @@
    If so, "bdnz" will be generated on ppc; if not,
    you will get "ble" or "blt" or "bge".  */
 
-/* { dg-do compile { target powerpc-*-* } } */
+/* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-options "-O2" } */
 void foo (int count, char* pca, char* pcb) {
     int i;
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-and-1.c b/gcc/testsuite/gcc.target/powerpc/ppc-and-1.c
index 7f1c618ff52..80167687457 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-and-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-and-1.c
@@ -1,5 +1,4 @@
-/* { dg-do compile { target powerpc64-*-* } } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-options "-O2" } */
 
 /* { dg-final { scan-assembler "rlwinm \[0-9\]+,\[0-9\]+,0,0,30"  } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-bitfield1.c b/gcc/testsuite/gcc.target/powerpc/ppc-bitfield1.c
index 6af77541f7c..34e5a28e12d 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-bitfield1.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-bitfield1.c
@@ -1,5 +1,4 @@
-/* { dg-do compile { target powerpc64-*-* } } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-options "-O2" } */
 
 /* { dg-final { scan-assembler-not "rlwinm \[0-9\]+,\[0-9\]+,\[0-9\]+,1,31"  } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-compare-1.c b/gcc/testsuite/gcc.target/powerpc/ppc-compare-1.c
index b5670ab53b1..2566423a0ab 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-compare-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-compare-1.c
@@ -1,5 +1,4 @@
-/* { dg-do compile { target powerpc64-*-* } } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-options "-O2" } */
 
 /* { dg-final { scan-assembler-not "cmpw" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-mov-1.c b/gcc/testsuite/gcc.target/powerpc/ppc-mov-1.c
index 7b541e258a8..750cf85f08d 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-mov-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-mov-1.c
@@ -1,5 +1,4 @@
-/* { dg-do compile { target powerpc64-*-* } } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-options "-O2" } */
 
 /* { dg-final { scan-assembler-not "fmr \[0-9\]+,\[0-9\]+" } }
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-sdata-1.c b/gcc/testsuite/gcc.target/powerpc/ppc-sdata-1.c
index bd9fa6e8e34..15ccbc25e94 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-sdata-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-sdata-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc-*-linux* powerpc-*-sysv* powerpc-*-eabi* } } */
+/* { dg-do compile { target { { powerpc*-*-linux* && ilp32 } || { powerpc-*-sysv* powerpc-*-eabi* } } } } */
 /* { dg-options "-O2 -fno-common -G 8 -meabi -msdata=eabi" } */
 /* { dg-final { scan-assembler "\\.section\[ \t\]\\.sdata," } } */
 /* { dg-final { scan-assembler "\\.section\[ \t\]\\.sdata2," } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-sdata-2.c b/gcc/testsuite/gcc.target/powerpc/ppc-sdata-2.c
index 6aa96141e4f..b8ea9d2adf5 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-sdata-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-sdata-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc-*-linux* powerpc-*-sysv* powerpc-*-eabi* } } */
+/* { dg-do compile { target { { powerpc*-*-linux* && ilp32 } || { powerpc-*-sysv* powerpc-*-eabi* } } } } */
 /* { dg-options "-O2 -fno-common -G 8 -msdata=sysv" } */
 /* { dg-final { scan-assembler "\\.section\[ \t\]\\.sdata," } } */
 /* { dg-final { scan-assembler-not "\\.section\[ \t\]\\.sdata2," } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-stackalign-1.c b/gcc/testsuite/gcc.target/powerpc/ppc-stackalign-1.c
index e73e895706e..fdced2a9322 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-stackalign-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-stackalign-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target powerpc-*-linux* powerpc-*-sysv* } } */
+/* { dg-do run { target powerpc*-*-linux* powerpc-*-sysv* } } */
 /* { dg-options {} } */
 
 /* Test stack pointer alignment against variable alloca.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc64-abi-1.c b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-1.c
index d0cb9cd6c90..c2c08a8605c 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc64-abi-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-1.c
@@ -1,5 +1,4 @@
-/* { dg-do run { target powerpc64-*-* } } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do run { target { powerpc*-*-* && lp64 } } } */
 /* { dg-options "-O2" } */
 #include <stdarg.h>
 #include <signal.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc64-abi-2.c b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-2.c
index 93ce7195d0c..937dacb66e3 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc64-abi-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-2.c
@@ -1,5 +1,4 @@
-/* { dg-do run { target powerpc64-*-linux* } } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do run { target { powerpc*-*-linux* && lp64 } } } */
 /* { dg-options "-O2 -fprofile -mprofile-kernel -maltivec -mabi=altivec" } */
 #include <stdarg.h>
 #include <signal.h>
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc64-abi-3.c b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-3.c
index 346839c4f89..51e636419fb 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc64-abi-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-3.c
@@ -1,5 +1,4 @@
-/* { dg-do compile { target powerpc64-*-linux* } } */
-/* { dg-require-effective-target lp64 } */
+/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
 /* { dg-options "-Wall" } */
 /* Testcase to check for ABI compliance of parameter passing
    for the PowerPC64 ABI.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc64-toc.c b/gcc/testsuite/gcc.target/powerpc/ppc64-toc.c
index ed555a9b6d7..21090af235e 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc64-toc.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc64-toc.c
@@ -1,5 +1,5 @@
 /* { dg-do link } */
-/* { dg-options "-mminimal-toc" { target { powerpc64-*-* && lp64 } } } */
+/* { dg-options "-mminimal-toc" { target { powerpc*-*-* && lp64 } } } */
 
 char *strchr (const char *, int);
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pr18096-1.c b/gcc/testsuite/gcc.target/powerpc/pr18096-1.c
index 9c4c0cf9244..5da9705f680 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr18096-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr18096-1.c
@@ -1,5 +1,5 @@
 /* PR middle-end/18096  */
-/* { dg-do compile { target powerpc-*-* } } */
+/* { dg-do compile { target { powerpc*-*-* && ilp32 } } } */
 /* { dg-options "-O2" } */
 
 void f(char*);
diff --git a/gcc/testsuite/gcc.target/powerpc/rs6000-ldouble-1.c b/gcc/testsuite/gcc.target/powerpc/rs6000-ldouble-1.c
index 0c11a271a80..e8d8bb7c116 100644
--- a/gcc/testsuite/gcc.target/powerpc/rs6000-ldouble-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/rs6000-ldouble-1.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target powerpc*-*-darwin* powerpc*-*-aix* powerpc64-*-linux rs6000-*-* } } */
+/* { dg-do run { target { { powerpc*-*-darwin* powerpc*-*-aix* rs6000-*-* } || { powerpc*-*-linux && lp64 } } } } */
 /* { dg-options "-mlong-double-128" } */
 
 /* Check that long double values are rounded correctly when being converted
diff --git a/gcc/testsuite/gcc.target/powerpc/rs6000-ldouble-2.c b/gcc/testsuite/gcc.target/powerpc/rs6000-ldouble-2.c
index 3ef5131b966..eebb94e568f 100644
--- a/gcc/testsuite/gcc.target/powerpc/rs6000-ldouble-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/rs6000-ldouble-2.c
@@ -1,4 +1,4 @@
-/* { dg-do run { target powerpc*-*-darwin* powerpc*-*-aix* powerpc64-*-linux rs6000-*-* } } */
+/* { dg-do run { target { { powerpc*-*-darwin* powerpc*-*-aix* rs6000-*-* } || { powerpc*-*-linux && lp64 } } } } */
 /* { dg-options "-mlong-double-128" } */
 
 /* Check that LDBL_EPSILON is right for 'long double'.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/rs6000-power2-1.c b/gcc/testsuite/gcc.target/powerpc/rs6000-power2-1.c
index 193647ef781..375241ec658 100644
--- a/gcc/testsuite/gcc.target/powerpc/rs6000-power2-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/rs6000-power2-1.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc-*-* rs6000-*-* }  } */
+/* { dg-do compile { target { ilp32 } } } */
 /* { dg-options "-O3 -mcpu=power2 -fno-schedule-insns -w -mhard-float" } */
 /* This used to ICE as the peephole was not checking to see
    if the register is a floating point one (I think this cannot
diff --git a/gcc/testsuite/gcc.target/powerpc/rs6000-power2-2.c b/gcc/testsuite/gcc.target/powerpc/rs6000-power2-2.c
index c5c7c7b8fe3..88a243f59da 100644
--- a/gcc/testsuite/gcc.target/powerpc/rs6000-power2-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/rs6000-power2-2.c
@@ -1,4 +1,4 @@
-/* { dg-do compile { target powerpc-*-* rs6000-*-* }  } */
+/* { dg-do compile { target { ilp32 } } } */
 /* { dg-options "-O3 -mcpu=power2 -fno-schedule-insns -w -mhard-float" } */
 /* { dg-final { scan-assembler-not "lfd" } } */
 /* { dg-final { scan-assembler-not "sfd" } } */