I noticed that two Xscale-specific tests, gcc.target/arm/scd42-1.c and
gcc.target/arm/scd42-2.c, were incorrectly being run in test
configurations explicitly specifying some other incompatible -mcpu. The
similar test gcc.target/arm/scd42-3.c was correctly being skipped in
that case, so I copied the logic from that file to correct the other two
tests. Because this was a straight cut-and-paste, I thought this
qualified as an obvious fix, and have committed it.
-Sandra
2016-10-13 Sandra Loosemore <san...@codesourcery.com>
gcc/testsuite/
* scd42-1.c: Skip if -mcpu incompatible with Xscale is specified,
not just -march.
* scd42-2.c: Fix existing logic to skip if -mcpu is incompatible
with Xscale.
Index: gcc.target/arm/scd42-1.c
===================================================================
--- gcc.target/arm/scd42-1.c (revision 470710)
+++ gcc.target/arm/scd42-1.c (working copy)
@@ -1,6 +1,7 @@
/* Verify that mov is preferred on XScale for loading a 1 byte constant. */
/* { dg-do compile } */
-/* { dg-skip-if "incompatible options" { arm*-*-* } { "-march=*" } { "" } } */
+/* { dg-skip-if "Test is specific to Xscale" { arm*-*-* } { "-march=*" } { "-march=xscale" } } */
+/* { dg-skip-if "Test is specific to Xscale" { arm*-*-* } { "-mcpu=*" } { "-mcpu=xscale" } } */
/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=softfp" } } */
/* { dg-options "-mcpu=xscale -O -mfloat-abi=softfp" } */
Index: gcc.target/arm/scd42-2.c
===================================================================
--- gcc.target/arm/scd42-2.c (revision 470710)
+++ gcc.target/arm/scd42-2.c (working copy)
@@ -1,10 +1,10 @@
/* 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-skip-if "Test is specific to the Xscale" { arm*-*-* } { "-mcpu=*" } { "-mcpu=xscale" } } */
/* { dg-skip-if "Test is specific to ARM mode" { arm*-*-* } { "-mthumb" } { "" } } */
/* { dg-require-effective-target arm32 } */
+/* { dg-options "-mcpu=xscale -O" } */
unsigned load2(void) __attribute__ ((naked));
unsigned load2(void)
