ppc-spe.c: Compile for all EABI targets.

	* gcc.target/powerpc/ppc-spe.c: Compile for all EABI targets.
	Explicitly enable SPE.
	* gcc.target/powerpc/20030505.c: Likewise.  Add dg-message
	directive.

	* gcc.target/powerpc/20030218-1.c: Pass -mfloat-gprs=single.
	Expect -flax-vector-conversions message.  Adjust incompatible
	types errors.
	* gcc.target/powerpc/spe1.c: Pass -mspe and -mfloat-gprs=single.
	Make Foo extern.

	* gcc.dg/cpp/assert4.c: Recognize __PPC__.

	* g++.dg/other/opaque-1.C: Run on targets with SPE.

	* g++.dg/ext/spe-1.C: Pass -mspe and -mfloat-gprs=single.
	* g++.dg/other/opaque-2.C: Likewise.
	* g++.dg/other/opaque-3.C: Likewise.

From-SVN: r143307

10 files changed, 37 insertions, 15 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6661966..5a54e1e 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,24 @@
+2009-01-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gcc.target/powerpc/ppc-spe.c: Compile for all EABI targets.
+	Explicitly enable SPE.
+	* gcc.target/powerpc/20030505.c: Likewise.  Add dg-message
+	directive.
+
+	* gcc.target/powerpc/20030218-1.c: Pass -mfloat-gprs=single.
+	Expect -flax-vector-conversions message.  Adjust incompatible
+	types errors.
+	* gcc.target/powerpc/spe1.c: Pass -mspe and -mfloat-gprs=single.
+	Make Foo extern.
+
+	* gcc.dg/cpp/assert4.c: Recognize __PPC__.
+
+	* g++.dg/other/opaque-1.C: Run on targets with SPE.
+
+	* g++.dg/ext/spe-1.C: Pass -mspe and -mfloat-gprs=single.
+	* g++.dg/other/opaque-2.C: Likewise.
+	* g++.dg/other/opaque-3.C: Likewise.
+
 2009-01-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/32041
diff --git a/gcc/testsuite/g++.dg/ext/spe1.C b/gcc/testsuite/g++.dg/ext/spe1.C
index b9ae5e7..fdd2139 100644
--- a/gcc/testsuite/g++.dg/ext/spe1.C
+++ b/gcc/testsuite/g++.dg/ext/spe1.C
@@ -1,5 +1,5 @@
 /* { dg-do compile { target powerpc-*-eabi* } } */
-/* { dg-options "-mcpu=8540 -mabi=spe -O0" } */
+/* { dg-options "-mcpu=8540 -mspe -mabi=spe -mfloat-gprs=single -O0" } */
 
 typedef int v2si __attribute__ ((vector_size (8)));
 
diff --git a/gcc/testsuite/g++.dg/other/opaque-1.C b/gcc/testsuite/g++.dg/other/opaque-1.C
index ae1d76f..fa79f6f 100644
--- a/gcc/testsuite/g++.dg/other/opaque-1.C
+++ b/gcc/testsuite/g++.dg/other/opaque-1.C
@@ -1,4 +1,4 @@
-/* { dg-do run { target powerpc-*-eabispe* powerpc*-*-linux*spe* } } */
+/* { dg-do run { target { powerpc*-*-* && powerpc_spe } } } */
 
 #define __vector __attribute__((vector_size(8)))
 typedef float __vector __ev64_fs__;
diff --git a/gcc/testsuite/g++.dg/other/opaque-2.C b/gcc/testsuite/g++.dg/other/opaque-2.C
index 9a9b1b4..6b13ba2 100644
--- a/gcc/testsuite/g++.dg/other/opaque-2.C
+++ b/gcc/testsuite/g++.dg/other/opaque-2.C
@@ -1,5 +1,5 @@
 /* { dg-do compile { target powerpc-*-eabi* powerpc*-*-linux*spe* } } */
-/* { dg-options "-mcpu=8540 -mabi=spe" } */
+/* { dg-options "-mcpu=8540 -mspe -mabi=spe -mfloat-gprs=single" } */
 
 #define __vector __attribute__((vector_size(8)))
 typedef float __vector __ev64_fs__;
diff --git a/gcc/testsuite/g++.dg/other/opaque-3.C b/gcc/testsuite/g++.dg/other/opaque-3.C
index 8cba875..cf8119f 100644
--- a/gcc/testsuite/g++.dg/other/opaque-3.C
+++ b/gcc/testsuite/g++.dg/other/opaque-3.C
@@ -1,5 +1,5 @@
 /* { dg-do compile { target powerpc-*-eabi* powerpc*-*-linux*spe* } } */
-/* { dg-options "-mcpu=8540 -mabi=spe" } */
+/* { dg-options "-mcpu=8540 -mspe -mabi=spe -mfloat-gprs=single" } */
 
 __ev64_opaque__ o;
 #define v __attribute__((vector_size(8)))
diff --git a/gcc/testsuite/gcc.dg/cpp/assert4.c b/gcc/testsuite/gcc.dg/cpp/assert4.c
index 6a4cb3f..0bd88ce 100644
--- a/gcc/testsuite/gcc.dg/cpp/assert4.c
+++ b/gcc/testsuite/gcc.dg/cpp/assert4.c
@@ -313,7 +313,7 @@
 # error
 #endif
 
-#if defined __powerpc__
+#if defined __powerpc__ || defined __PPC__
 # if defined __powerpc64__
 #  if (#cpu(powerpc) || #machine(powerpc) \
        || !#cpu(powerpc64) || !#machine(powerpc64))
diff --git a/gcc/testsuite/gcc.target/powerpc/20030218-1.c b/gcc/testsuite/gcc.target/powerpc/20030218-1.c
index 6296d31..024f637 100644
--- a/gcc/testsuite/gcc.target/powerpc/20030218-1.c
+++ b/gcc/testsuite/gcc.target/powerpc/20030218-1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target powerpc-*-eabi* } } */
-/* { dg-options "-mspe=yes" } */
+/* { dg-options "-mspe=yes -mfloat-gprs=single" } */
 
 /* Test vectors that can interconvert without a cast.  */
 
@@ -15,10 +15,11 @@ main (void)
 
   opp = vfloat;
   vshort = opp;
-  vfloat = vshort; /* { dg-error "incompatible types in assignment" } */
+  vfloat = vshort; /* { dg-error "incompatible types when assigning" } */
 
   /* Just because this is a V2SI, it doesn't make it an opaque.  */
-  vint = vshort; /* { dg-error "incompatible types in assignment" } */
+  vint = vshort; /* { dg-message "note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts" } */
+  /* { dg-error "incompatible types when assigning" "" { target *-*-* } 21 } */
 
   return 0;
 }
diff --git a/gcc/testsuite/gcc.target/powerpc/20030505.c b/gcc/testsuite/gcc.target/powerpc/20030505.c
index 0df1c03..a828393 100644
--- a/gcc/testsuite/gcc.target/powerpc/20030505.c
+++ b/gcc/testsuite/gcc.target/powerpc/20030505.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-eabispe* } } */
-/* { dg-options "-W" } */
+/* { dg-do compile { target powerpc-*-eabi* } } */
+/* { dg-options "-W -mcpu=8540 -mspe -mabi=spe -mfloat-gprs=single" } */
 
 #define __vector __attribute__((vector_size(8)))
 
@@ -9,7 +9,7 @@ __ev64_opaque__ *p1;
 __ev64_fs__ *p2;
 int *x;
 
-extern void f (__ev64_opaque__ *);
+extern void f (__ev64_opaque__ *); /* { dg-message "expected.*but argument is of type" } */
 
 int main ()
 {
diff --git a/gcc/testsuite/gcc.target/powerpc/ppc-spe.c b/gcc/testsuite/gcc.target/powerpc/ppc-spe.c
index b35b2e9..841073b 100644
--- a/gcc/testsuite/gcc.target/powerpc/ppc-spe.c
+++ b/gcc/testsuite/gcc.target/powerpc/ppc-spe.c
@@ -1,5 +1,5 @@
-/* { dg-do compile { target powerpc-*-eabispe } } */
-/* { dg-options "-mcpu=8540 -mabi=spe -O0" } */
+/* { dg-do compile { target powerpc-*-eabi* } } */
+/* { dg-options "-mcpu=8540 -mspe -mabi=spe -mfloat-gprs=single -O0" } */
 
 /* (Test with -O0 so we don't optimize any of them away).  */
 
diff --git a/gcc/testsuite/gcc.target/powerpc/spe1.c b/gcc/testsuite/gcc.target/powerpc/spe1.c
index 9ce56e0..9803d8f 100644
--- a/gcc/testsuite/gcc.target/powerpc/spe1.c
+++ b/gcc/testsuite/gcc.target/powerpc/spe1.c
@@ -1,12 +1,12 @@
 /* { dg-do compile { target powerpc-*-eabi* } } */
-/* { dg-options "-mcpu=8540 -mabi=spe -O0" } */
+/* { dg-options "-mcpu=8540 -mspe -mabi=spe -mfloat-gprs=single -O0" } */
 
 /* (Test with -O0 so we don't optimize any of them away).  */
 
 
 typedef float __attribute__((vector_size(8))) __ev64_fs__;
 
-static __ev64_opaque__ Foo (void);
+__ev64_opaque__ Foo (void);
 
 void Bar ()
 {