altivec-32.c: Don't use -m64.

	* gcc.target/powerpc/altivec-32.c: Don't use -m64.
	* gcc.target/powerpc/const-compare.c: Require lp64, don't use -m64.
	* gcc.target/powerpc/darwin-bool-1.c: Require ilp32, remove dg-skip-if.
	* gcc.target/powerpc/paired-1.c: Require ilp32, don't use -m32.
	* gcc.target/powerpc/paired-2.c: Ditto.
	* gcc.target/powerpc/paired-3.c: Ditto.
	* gcc.target/powerpc/paired-4.c: Ditto.
	* gcc.target/powerpc/paired-5.c: Ditto.
	* gcc.target/powerpc/paired-6.c: Ditto.
	* gcc.target/powerpc/paired-7.c: Ditto.
	* gcc.target/powerpc/paired-8.c: Ditto.
	* gcc.target/powerpc/paired-9.c: Ditto.
	* gcc.target/powerpc/paired-10.c: Ditto.
	* gcc.target/powerpc/popcount-2.c: Don't use -m32.
	* gcc.target/powerpc/popcount-3.c: Don't use -m64.
	* gcc.target/powerpc/ppc-paired.c: Require ilp32, don't use -m32.
	* gcc.target/powerpc/pr39457.c: Don't use -m64.
	* gcc.target/powerpc/vsx-vector-1.c: Ditto.
	* gcc.target/powerpc/vsx-vector-2.c: Ditto.
	* gcc.target/powerpc/vsx-vector-3.c: Ditto.
	* gcc.target/powerpc/vsx-vector-4.c: Ditto.

From-SVN: r154512

22 files changed, 57 insertions, 34 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8f132c5..2888410 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,27 @@
+2009-11-24  Janis Johnson  <janis187@us.ibm.com>
+
+	* gcc.target/powerpc/altivec-32.c: Don't use -m64.
+	* gcc.target/powerpc/const-compare.c: Require lp64, don't use -m64.
+	* gcc.target/powerpc/darwin-bool-1.c: Require ilp32, remove dg-skip-if.
+	* gcc.target/powerpc/paired-1.c: Require ilp32, don't use -m32.
+	* gcc.target/powerpc/paired-2.c: Ditto.
+	* gcc.target/powerpc/paired-3.c: Ditto.
+	* gcc.target/powerpc/paired-4.c: Ditto.
+	* gcc.target/powerpc/paired-5.c: Ditto.
+	* gcc.target/powerpc/paired-6.c: Ditto.
+	* gcc.target/powerpc/paired-7.c: Ditto.
+	* gcc.target/powerpc/paired-8.c: Ditto.
+	* gcc.target/powerpc/paired-9.c: Ditto.
+	* gcc.target/powerpc/paired-10.c: Ditto.
+	* gcc.target/powerpc/popcount-2.c: Don't use -m32.
+	* gcc.target/powerpc/popcount-3.c: Don't use -m64.
+	* gcc.target/powerpc/ppc-paired.c: Require ilp32, don't use -m32.
+	* gcc.target/powerpc/pr39457.c: Don't use -m64.
+	* gcc.target/powerpc/vsx-vector-1.c: Ditto.
+	* gcc.target/powerpc/vsx-vector-2.c: Ditto.
+	* gcc.target/powerpc/vsx-vector-3.c: Ditto.
+	* gcc.target/powerpc/vsx-vector-4.c: Ditto.
+
 2009-11-24  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* g++.dg/debug/dwarf2/anonname1.C: Escape backslash in
diff --git a/gcc/testsuite/gcc.target/powerpc/altivec-32.c b/gcc/testsuite/gcc.target/powerpc/altivec-32.c
index 83105f8..fd9f4bc 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 -mcpu=power6 -m64 -maltivec" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power6 -maltivec" } */
 /* { dg-final { scan-assembler "vsel" } } */
 /* { dg-final { scan-assembler "vrfim" } } */
 /* { dg-final { scan-assembler "vrfip" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/const-compare.c b/gcc/testsuite/gcc.target/powerpc/const-compare.c
index c9e50cf..a09957d 100644
--- a/gcc/testsuite/gcc.target/powerpc/const-compare.c
+++ b/gcc/testsuite/gcc.target/powerpc/const-compare.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc*-*-darwin* } } */
-/* { dg-options "-m64 -O1 -static" } */
+/* { dg-do compile { target { powerpc*-*-darwin* && lp64 } } } */
+/* { dg-options "-O1 -static" } */
 typedef unsigned long long uint64_t;
 
 static int
diff --git a/gcc/testsuite/gcc.target/powerpc/darwin-bool-1.c b/gcc/testsuite/gcc.target/powerpc/darwin-bool-1.c
index fe4b726..2f147d0 100644
--- a/gcc/testsuite/gcc.target/powerpc/darwin-bool-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/darwin-bool-1.c
@@ -1,7 +1,6 @@
 /* Check that sizeof(bool) is 4 if we don't use special options. */
 /* Matt Austern  <austern@apple.com> */
-/* { dg-do run { target powerpc*-*-darwin* } } */
-/* { dg-skip-if "" { powerpc*-*-darwin* } { "-m64" } { "" } } */
+/* { dg-do run { target { powerpc*-*-darwin* && ilp32 } } } */
 
 int dummy1[sizeof(_Bool) - 3];
 int dummy2[5 - sizeof(_Bool)];
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-1.c b/gcc/testsuite/gcc.target/powerpc/paired-1.c
index 641a8e0..19a66a1 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-1.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only " } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32} } } */
+/* { dg-options "-mpaired -ffinite-math-only " } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-10.c b/gcc/testsuite/gcc.target/powerpc/paired-10.c
index 114f5f7..1f904c2 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-10.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-10.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only " } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only " } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-2.c b/gcc/testsuite/gcc.target/powerpc/paired-2.c
index ef40902..181bbf1 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-2.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-3.c b/gcc/testsuite/gcc.target/powerpc/paired-3.c
index 756d6e1..2e4bbf4 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-3.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-4.c b/gcc/testsuite/gcc.target/powerpc/paired-4.c
index 3d5c154..2c7cb1b 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-4.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-5.c b/gcc/testsuite/gcc.target/powerpc/paired-5.c
index df3bb44..3914c2a 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-5.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-5.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-6.c b/gcc/testsuite/gcc.target/powerpc/paired-6.c
index 0d6ab52..25dd428 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-6.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-6.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-7.c b/gcc/testsuite/gcc.target/powerpc/paired-7.c
index aa1edd0..6e4b809 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-7.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-7.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-8.c b/gcc/testsuite/gcc.target/powerpc/paired-8.c
index 03e4da2..1dfaf51 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-8.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-8.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only " } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only " } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/paired-9.c b/gcc/testsuite/gcc.target/powerpc/paired-9.c
index 2d96cd4..c72132f 100644
--- a/gcc/testsuite/gcc.target/powerpc/paired-9.c
+++ b/gcc/testsuite/gcc.target/powerpc/paired-9.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only " } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only " } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/popcount-2.c b/gcc/testsuite/gcc.target/powerpc/popcount-2.c
index 7546a3b..43b2ce7 100644
--- a/gcc/testsuite/gcc.target/powerpc/popcount-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/popcount-2.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target { ilp32 } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
-/* { dg-options "-O2 -mcpu=power7 -m32" } */
+/* { dg-options "-O2 -mcpu=power7" } */
 /* { dg-final { scan-assembler "popcntw" } } */
 
 int foo(int x)
diff --git a/gcc/testsuite/gcc.target/powerpc/popcount-3.c b/gcc/testsuite/gcc.target/powerpc/popcount-3.c
index c803532..341816f 100644
--- a/gcc/testsuite/gcc.target/powerpc/popcount-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/popcount-3.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
-/* { dg-options "-O2 -mcpu=power7 -m64" } */
+/* { dg-options "-O2 -mcpu=power7" } */
 /* { dg-final { scan-assembler "popcntd" } } */
 
 long foo(int x)
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-paired.c b/gcc/testsuite/gcc.target/powerpc/ppc-paired.c
index a3b61fd..be84e43 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-paired.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-paired.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-linux*paired* } } */
-/* { dg-options "-mpaired -m32 -ffinite-math-only" } */
+/* { dg-do compile { target { powerpc-*-linux*paired* && ilp32 } } } */
+/* { dg-options "-mpaired -ffinite-math-only" } */
 
 /* Test PowerPC PAIRED extensions.  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/pr39457.c b/gcc/testsuite/gcc.target/powerpc/pr39457.c
index 22057e5..c4828bb 100644
--- a/gcc/testsuite/gcc.target/powerpc/pr39457.c
+++ b/gcc/testsuite/gcc.target/powerpc/pr39457.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
-/* { dg-options "-m64 -O2 -mminimal-toc" } */
+/* { dg-options "-O2 -mminimal-toc" } */
 
 /* PR 39457 -- fix breakage because the compiler ran out of registers and
    wanted to stash a floating point value to the LR/CTR register.  */
diff --git a/gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c b/gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c
index 0bf3a7f..5d23c0a 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsx-vector-1.c
@@ -1,7 +1,7 @@
 /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
 /* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -m64 -ffast-math" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -ffast-math" } */
 /* { dg-final { scan-assembler "xvadddp" } } */
 /* { dg-final { scan-assembler "xvsubdp" } } */
 /* { dg-final { scan-assembler "xvmuldp" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c b/gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c
index ba27b46..404e040 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsx-vector-2.c
@@ -1,7 +1,7 @@
 /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
 /* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -m64 -ffast-math" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -ffast-math" } */
 /* { dg-final { scan-assembler "xvaddsp" } } */
 /* { dg-final { scan-assembler "xvsubsp" } } */
 /* { dg-final { scan-assembler "xvmulsp" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c b/gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c
index 5f3bf5b..25cf376f 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsx-vector-3.c
@@ -1,7 +1,7 @@
 /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
 /* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -m64" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power7" } */
 /* { dg-final { scan-assembler "xvadddp" } } */
 /* { dg-final { scan-assembler "xvsubdp" } } */
 /* { dg-final { scan-assembler "xvmuldp" } } */
diff --git a/gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c b/gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c
index a34ba8f..f2a9c59 100644
--- a/gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c
+++ b/gcc/testsuite/gcc.target/powerpc/vsx-vector-4.c
@@ -1,7 +1,7 @@
 /* { dg-do compile { target { powerpc*-*-* && lp64 } } } */
 /* { dg-skip-if "" { powerpc*-*-darwin* } { "*" } { "" } } */
 /* { dg-require-effective-target powerpc_vsx_ok } */
-/* { dg-options "-O2 -ftree-vectorize -mcpu=power7 -m64" } */
+/* { dg-options "-O2 -ftree-vectorize -mcpu=power7" } */
 /* { dg-final { scan-assembler "xvaddsp" } } */
 /* { dg-final { scan-assembler "xvsubsp" } } */
 /* { dg-final { scan-assembler "xvmulsp" } } */