[patch] Use dg-skip-if in several ARM testcases. (Take 2)

[kazu at codesourcery dot com (Kazu Hirata)]

Hi,

Attached is a revised patch to use dg-skip-if in several ARM
testcases.

The previous version of this patch was submitted at:

http://gcc.gnu.org/ml/gcc-patches/2008-06/msg00905.html

Without this patch, these testcases fail when multilib options
conflict with those options specified in dg-options.

I did not add xscale*-*-* to dg-skip-if as config.gcc no longer
recognizes xscale.

Tested on arm-none-eabi with the following multilibs:

DEFAULT
-mcpu=marvell-f
-mthumb
-mthumb -march=armv6-m
-mthumb -march=armv7
-mthumb -march=armv7 -mfloat-abi=softfp
-mcpu=marvell-f -mfloat-abi=softfp
-mfloat-abi=softfp

OK to apply?

Kazu Hirata

2008-08-07  Kazu Hirata  <kazu@codesourcery.com>

	* gcc.dg/arm-g2.c, gcc.dg/arm-mmx-1.c, gcc.dg/arm-scd42-2.c:
	Skip if the multilib testing specifies -march that does not
	agree with the one specified in the testcase.

Index: gcc/testsuite/gcc.dg/arm-g2.c
===================================================================
--- gcc/testsuite/gcc.dg/arm-g2.c	(revision 138828)
+++ gcc/testsuite/gcc.dg/arm-g2.c	(working copy)
@@ -1,6 +1,7 @@
 /* Verify that hardware multiply is preferred on XScale. */
 /* { dg-do compile } */
 /* { dg-options "-mcpu=xscale -O2" } */
+/* { dg-skip-if "Test is specific to the Xscale" { arm*-*-* } { "-march=*" } { "-march=xscale" } } */
 /* { dg-require-effective-target arm32 } */
 
 /* Brett Gaines' test case. */
Index: gcc/testsuite/gcc.dg/arm-mmx-1.c
===================================================================
--- gcc/testsuite/gcc.dg/arm-mmx-1.c	(revision 138828)
+++ gcc/testsuite/gcc.dg/arm-mmx-1.c	(working copy)
@@ -1,8 +1,11 @@
 /* Verify that if IP is saved to ensure stack alignment, we don't load
    it into sp.  */
 /* { dg-do compile } */
+/* { dg-skip-if "Test is specific to the iWMMXt" { arm*-*-* } { "-mcpu=*" } { "-mcpu=iwmmxt" } } */
+/* { dg-skip-if "Test is specific to the iWMMXt" { arm*-*-* } { "-mabi=*" } { "-mabi=iwmmxt" } } */
+/* { dg-skip-if "Test is specific to the iWMMXt" { arm*-*-* } { "-mfloat-abi=softfp" } { "" } } */
+/* { dg-skip-if "Test is specific to the iWMMXt" { arm*-*-* } { "-march=*" } { "-march=iwmmxt" } } */
 /* { dg-options "-O -mno-apcs-frame -mcpu=iwmmxt -mabi=iwmmxt" } */
-/* { dg-skip-if "" { *-*-* } { "-mfloat-abi=softfp" } { "" } } */
 /* { dg-require-effective-target arm32 } */
 /* { dg-final { scan-assembler "ldmfd\[ 	]sp!.*ip,\[ ]*pc" } } */
 
Index: gcc/testsuite/gcc.dg/arm-scd42-2.c
===================================================================
--- gcc/testsuite/gcc.dg/arm-scd42-2.c	(revision 138828)
+++ gcc/testsuite/gcc.dg/arm-scd42-2.c	(working copy)
@@ -1,6 +1,7 @@
 /* Verify that mov is preferred on XScale for loading a 2 byte constant. */
 /* { dg-do compile } */
 /* { dg-options "-mcpu=xscale -O" } */
+/* { dg-skip-if "Test is specific to the Xscale" { arm*-*-* } { "-march=*" } { "-march=xscale" } } */
 /* { dg-require-effective-target arm32 } */
 
 unsigned load2(void) __attribute__ ((naked));