Backport from 3.4 branch:

	* gcc.dg/altivec-1.c: Pass -mcpu=7400 along with -maltivec.
	* gcc.dg/altivec-2.c: Likewise.
	* gcc.dg/altivec-3.c: Likewise.
	* gcc.dg/altivec-4.c: Likewise.
	* gcc.dg/altivec-5.c: Likewise.
	* gcc.dg/altivec-6.c: Likewise.
	* gcc.dg/altivec-7.c: Likewise.
	* gcc.dg/altivec-8.c: Likewise.
	* gcc.dg/altivec-9.c: Likewise.
	* gcc.dg/altivec-10.c: Likewise.
	* gcc.dg/altivec-11.c: Likewise.
	* gcc.dg/altivec-12.c: Likewise.
	* gcc.dg/altivec-13.c: Likewise.
	* gcc.dg/altivec-14.c: Likewise.
	* gcc.dg/altivec-15.c: Likewise.
	* gcc.dg/altivec-16.c: Likewise.
	* gcc.dg/altivec-17.c: Likewise.
	* g++.dg/ext/altivec-1.C: Likewise.
	* g++.dg/ext/altivec-2.C: Likewise.
	* g++.dg/ext/altivec-3.C: Likewise.
	* g++.dg/ext/altivec-4.C: Likewise.
	* g++.dg/ext/altivec-5.C: Likewise.
	* g++.dg/ext/altivec-6.C: Likewise.
	* g++.dg/ext/altivec-7.C: Likewise.
	* g++.dg/ext/altivec-8.C: Likewise.
	* g++.dg/ext/altivec-9.C: Likewise.
	* g++.dg/ext/altivec-10.C: Likewise.
	* g++.dg/ext/altivec-11.C: Likewise.
	* g++.dg/ext/altivec-12.C: Likewise.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/csl-3_4_3-linux-branch@97051 138bc75d-0d04-0410-961f-82ee72b054a4

30 files changed, 30 insertions, 30 deletions

diff --git a/gcc/testsuite/g++.dg/ext/altivec-1.C b/gcc/testsuite/g++.dg/ext/altivec-1.C
index 6b266716fae..4fa993d516c 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-1.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-1.C
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
  
diff --git a/gcc/testsuite/g++.dg/ext/altivec-10.C b/gcc/testsuite/g++.dg/ext/altivec-10.C
index 3b790f5ebfe..13b5d4e21e7 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-10.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-10.C
@@ -2,7 +2,7 @@
 /* Author:  Ziemowit Laski  <zlaski@apple.com>.  */
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-save-temps -maltivec" } */
+/* { dg-options "-save-temps -mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-11.C b/gcc/testsuite/g++.dg/ext/altivec-11.C
index 5df53110d11..64ea769740c 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-11.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-11.C
@@ -1,7 +1,7 @@
 /* Test handling of literal constant for dss operation.  */
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-12.C b/gcc/testsuite/g++.dg/ext/altivec-12.C
index a52b7d22e17..458606e4466 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-12.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-12.C
@@ -1,7 +1,7 @@
 /* Test vec_dst* functions with float pointer as first argument.  */
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-2.C b/gcc/testsuite/g++.dg/ext/altivec-2.C
index 9b5dac62307..ec2e9157972 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-2.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-2.C
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec -Wall" } */
+/* { dg-options "-mcpu=7400 -maltivec -Wall" } */
 
 /* This test checks if AltiVec builtins accept const-qualified
    arguments.  */
diff --git a/gcc/testsuite/g++.dg/ext/altivec-3.C b/gcc/testsuite/g++.dg/ext/altivec-3.C
index a5e7308bb05..2673a250f5e 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-3.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-3.C
@@ -1,6 +1,6 @@
 /* { dg-do run { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 /* Test for correct handling of AltiVec constants passed
    through '...' (va_arg).  */
diff --git a/gcc/testsuite/g++.dg/ext/altivec-4.C b/gcc/testsuite/g++.dg/ext/altivec-4.C
index 8f22fb3b98d..69c5dea777e 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-4.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-4.C
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 /* PR c++/14425 */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-5.C b/gcc/testsuite/g++.dg/ext/altivec-5.C
index c5a67c5835b..470d7e12781 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-5.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-5.C
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 /* PR c++/14426 */
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-6.C b/gcc/testsuite/g++.dg/ext/altivec-6.C
index 24ed52a0f33..09cddc9659e 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-6.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-6.C
@@ -2,7 +2,7 @@
 /* Author: Ziemowit Laski  <zlaski@apple.com>  */
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-7.C b/gcc/testsuite/g++.dg/ext/altivec-7.C
index fabe1c41333..089cb7e7732 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-7.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-7.C
@@ -1,7 +1,7 @@
 /* Test for AltiVec type overloading and name mangling.  */
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/g++.dg/ext/altivec-8.C b/gcc/testsuite/g++.dg/ext/altivec-8.C
index 50fb0d8ad29..526625d4eae 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-8.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-8.C
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 /* Author: Ziemowit Laski  <zlaski@apple.com>  */
 
 /* This test case exercises intrinsic/argument combinations that,
diff --git a/gcc/testsuite/g++.dg/ext/altivec-9.C b/gcc/testsuite/g++.dg/ext/altivec-9.C
index e8dea9e74aa..d93469b8a5f 100644
--- a/gcc/testsuite/g++.dg/ext/altivec-9.C
+++ b/gcc/testsuite/g++.dg/ext/altivec-9.C
@@ -1,7 +1,7 @@
 /* Test for AltiVec function vec_ld, passing a pointer to const vector */
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.dg/altivec-1.c b/gcc/testsuite/gcc.dg/altivec-1.c
index 65c8fa79bf9..c36444b4215 100644
--- a/gcc/testsuite/gcc.dg/altivec-1.c
+++ b/gcc/testsuite/gcc.dg/altivec-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-*-eabispe*" "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 /* Program to test PowerPC AltiVec instructions.  */
 
diff --git a/gcc/testsuite/gcc.dg/altivec-10.c b/gcc/testsuite/gcc.dg/altivec-10.c
index f65ea71ed49..4ea8ce7cc48 100644
--- a/gcc/testsuite/gcc.dg/altivec-10.c
+++ b/gcc/testsuite/gcc.dg/altivec-10.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec -mabi=altivec -fno-inline" } */
+/* { dg-options "-mcpu=7400 -maltivec -mabi=altivec -fno-inline" } */
 
 #include <altivec.h>
 #include <signal.h>
diff --git a/gcc/testsuite/gcc.dg/altivec-11.c b/gcc/testsuite/gcc.dg/altivec-11.c
index 82ea51a3644..c52839c5245 100644
--- a/gcc/testsuite/gcc.dg/altivec-11.c
+++ b/gcc/testsuite/gcc.dg/altivec-11.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-O2 -maltivec -mabi=altivec" } */
+/* { dg-options "-O2 -mcpu=7400 -maltivec -mabi=altivec" } */
 /* { dg-final { scan-assembler-not "lvx" } } */
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.dg/altivec-12.c b/gcc/testsuite/gcc.dg/altivec-12.c
index 0a32b64fe87..917cbafe904 100644
--- a/gcc/testsuite/gcc.dg/altivec-12.c
+++ b/gcc/testsuite/gcc.dg/altivec-12.c
@@ -1,6 +1,6 @@
 /* { dg-do run { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 /* Program to test PowerPC AltiVec instructions.  */
 
diff --git a/gcc/testsuite/gcc.dg/altivec-13.c b/gcc/testsuite/gcc.dg/altivec-13.c
index 8675e2c7cc7..fb50b0b38de 100644
--- a/gcc/testsuite/gcc.dg/altivec-13.c
+++ b/gcc/testsuite/gcc.dg/altivec-13.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 /* Author: Ziemowit Laski  <zlaski@apple.com>  */
 
 /* This test case exercises intrinsic/argument combinations that,
diff --git a/gcc/testsuite/gcc.dg/altivec-14.c b/gcc/testsuite/gcc.dg/altivec-14.c
index b67c529377b..47d7d08165b 100644
--- a/gcc/testsuite/gcc.dg/altivec-14.c
+++ b/gcc/testsuite/gcc.dg/altivec-14.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.dg/altivec-15.c b/gcc/testsuite/gcc.dg/altivec-15.c
index 5d9f9ff37da..3aae25ea7cd 100644
--- a/gcc/testsuite/gcc.dg/altivec-15.c
+++ b/gcc/testsuite/gcc.dg/altivec-15.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.dg/altivec-16.c b/gcc/testsuite/gcc.dg/altivec-16.c
index 3b790f5ebfe..13b5d4e21e7 100644
--- a/gcc/testsuite/gcc.dg/altivec-16.c
+++ b/gcc/testsuite/gcc.dg/altivec-16.c
@@ -2,7 +2,7 @@
 /* Author:  Ziemowit Laski  <zlaski@apple.com>.  */
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-save-temps -maltivec" } */
+/* { dg-options "-save-temps -mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.dg/altivec-17.c b/gcc/testsuite/gcc.dg/altivec-17.c
index 463062ef086..fc1888524d9 100644
--- a/gcc/testsuite/gcc.dg/altivec-17.c
+++ b/gcc/testsuite/gcc.dg/altivec-17.c
@@ -3,7 +3,7 @@
 
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec -mabi=altivec" } */
+/* { dg-options "-mcpu=7400 -maltivec -mabi=altivec" } */
 
 typedef unsigned int ui;
 typedef signed char sc;
diff --git a/gcc/testsuite/gcc.dg/altivec-2.c b/gcc/testsuite/gcc.dg/altivec-2.c
index f64081ff813..c74c23f3228 100644
--- a/gcc/testsuite/gcc.dg/altivec-2.c
+++ b/gcc/testsuite/gcc.dg/altivec-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 /* 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.dg/altivec-3.c b/gcc/testsuite/gcc.dg/altivec-3.c
index 57b975a5e25..b29d06c2f04 100644
--- a/gcc/testsuite/gcc.dg/altivec-3.c
+++ b/gcc/testsuite/gcc.dg/altivec-3.c
@@ -1,6 +1,6 @@
 /* { dg-do run { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-*-eabispe*" "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include "altivec_check.h"
 
diff --git a/gcc/testsuite/gcc.dg/altivec-4.c b/gcc/testsuite/gcc.dg/altivec-4.c
index c2d4356a9a5..5c4838e080a 100644
--- a/gcc/testsuite/gcc.dg/altivec-4.c
+++ b/gcc/testsuite/gcc.dg/altivec-4.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec -O0 -Wall" } */
+/* { dg-options "-mcpu=7400 -maltivec -O0 -Wall" } */
 
 #define vector __attribute__((vector_size(16)))
 
diff --git a/gcc/testsuite/gcc.dg/altivec-5.c b/gcc/testsuite/gcc.dg/altivec-5.c
index 0adfdb84d19..2e50f1523c8 100644
--- a/gcc/testsuite/gcc.dg/altivec-5.c
+++ b/gcc/testsuite/gcc.dg/altivec-5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-options "-maltivec -O2" } */
+/* { dg-options "-mcpu=7400 -maltivec -O2" } */
 
 #define vector __attribute__((vector_size(16)))
 
diff --git a/gcc/testsuite/gcc.dg/altivec-6.c b/gcc/testsuite/gcc.dg/altivec-6.c
index e0193546679..7c37f9b9027 100644
--- a/gcc/testsuite/gcc.dg/altivec-6.c
+++ b/gcc/testsuite/gcc.dg/altivec-6.c
@@ -1,6 +1,6 @@
 /* { dg-do compile { target powerpc-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec -O0 -Wall" } */
+/* { dg-options "-mcpu=7400 -maltivec -O0 -Wall" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.dg/altivec-7.c b/gcc/testsuite/gcc.dg/altivec-7.c
index 9a23940d271..75fefee6083 100644
--- a/gcc/testsuite/gcc.dg/altivec-7.c
+++ b/gcc/testsuite/gcc.dg/altivec-7.c
@@ -2,7 +2,7 @@
 
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.dg/altivec-8.c b/gcc/testsuite/gcc.dg/altivec-8.c
index 661cce76221..c06b52eabcf 100644
--- a/gcc/testsuite/gcc.dg/altivec-8.c
+++ b/gcc/testsuite/gcc.dg/altivec-8.c
@@ -3,7 +3,7 @@
 
 /* { dg-do compile { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec" } */
+/* { dg-options "-mcpu=7400 -maltivec" } */
 
 #include <altivec.h>
 
diff --git a/gcc/testsuite/gcc.dg/altivec-9.c b/gcc/testsuite/gcc.dg/altivec-9.c
index 36c79d3453b..e482598b45e 100644
--- a/gcc/testsuite/gcc.dg/altivec-9.c
+++ b/gcc/testsuite/gcc.dg/altivec-9.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target powerpc*-*-* } } */
-/* { dg-options "-maltivec -mabi=altivec -g" } */
+/* { dg-options "-mcpu=7400 -maltivec -mabi=altivec -g" } */
 
 /* PR9564 */
 
diff --git a/gcc/testsuite/gcc.dg/altivec-varargs-1.c b/gcc/testsuite/gcc.dg/altivec-varargs-1.c
index 135d3a9230f..e1925f723e0 100644
--- a/gcc/testsuite/gcc.dg/altivec-varargs-1.c
+++ b/gcc/testsuite/gcc.dg/altivec-varargs-1.c
@@ -1,6 +1,6 @@
 /* { dg-do run { target powerpc*-*-* } } */
 /* { dg-xfail-if "" { "powerpc-*-eabispe*" "powerpc-ibm-aix*" } { "-maltivec" } { "" } } */
-/* { dg-options "-maltivec -mabi=altivec -fno-inline" } */
+/* { dg-options "-mcpu=7400 -maltivec -mabi=altivec -fno-inline" } */
 
 #include <stdarg.h>
 #include <signal.h>