altivec-vec-merge.c: Make test usable on GNU/Linux targets and on hardware without VMX support.

	* gcc.dg/altivec-vec-merge.c: Make test usable on GNU/Linux targets
	and on hardware without VMX support.

From-SVN: r100120

gcc/testsuite/ChangeLog

 2005-05-24  Janis Johnson  <janis187@us.ibm.com>
 
+	* gcc.dg/altivec-vec-merge.c: Make test usable on GNU/Linux targets
+	and on hardware without VMX support.
+
 	* gcc.dg/altivec-vec-merge.c: Renamed from ppc-vec-merge.c.
 
 	* gcc.dg/ppc64-abi-2.c: Remove code that is now invalid.

gcc/testsuite/gcc.dg/altivec-vec-merge.c

 /* { dg-do run { target powerpc*-*-* } } */
-/* { dg-options "-faltivec -O2" } */
+/* { dg-options "-maltivec -O2" } */
+
+#include <altivec.h>
+#include "altivec_check.h"
 
 int printf(const char * , ...);
 extern void abort();
@@ -595,6 +598,8 @@ if (1){
 int main(int argc, char **argv)
 {
     char toto[32] __attribute__((aligned(16)));
+
+    altivec_check ();	/* Exit if hardware doesn't support AltiVec.  */
     foo(toto, toto, 0, 0);
     return 0;
 }