[committed] testsuite: Make use of effective-target march_option for cris

[committed] testsuite: Make use of effective-target march_option for cris

[Hans-Peter Nilsson]

With march_option in place, here's the rest.  (And yes, that
cris-linux line in the last context goes away in the patchset
putting that target down.)

gcc/testsuite:
	* gcc.dg/torture/pr26515.c (cris*-*-*): Conditionalize
	-march=v10 option on target ! march_option.
	* gcc.target/cris/asm-v10.S, gcc.target/cris/inasm-v10.c,
	gcc.target/cris/sync-1-v10.c: Similar.
---
 gcc/testsuite/gcc.dg/torture/pr26515.c     | 2 +-
 gcc/testsuite/gcc.target/cris/asm-v10.S    | 2 +-
 gcc/testsuite/gcc.target/cris/inasm-v10.c  | 2 +-
 gcc/testsuite/gcc.target/cris/sync-1-v10.c | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gcc/testsuite/gcc.dg/torture/pr26515.c b/gcc/testsuite/gcc.dg/torture/pr26515.c
index a051e2e..ff765ba 100644
--- a/gcc/testsuite/gcc.dg/torture/pr26515.c
+++ b/gcc/testsuite/gcc.dg/torture/pr26515.c
@@ -1,4 +1,4 @@
-/* { dg-options "-march=v10" { target cris*-*-* } } */
+/* { dg-options "-march=v10" { target { cris*-*-* && { ! march_option } } } } */
 struct i
 {
   long long i_size;
diff --git a/gcc/testsuite/gcc.target/cris/asm-v10.S b/gcc/testsuite/gcc.target/cris/asm-v10.S
index c85ebe2..8bb0c29 100644
--- a/gcc/testsuite/gcc.target/cris/asm-v10.S
+++ b/gcc/testsuite/gcc.target/cris/asm-v10.S
@@ -1,5 +1,5 @@
 /* { dg-do assemble } */
-/* { dg-options "-DOTHER_ISA=10 -march=v10" } */
+/* { dg-options "-DOTHER_ISA=10 -march=v10" { target { ! march_option } } } */
 
 /* Check that -march=v10 is also recognized.  */
 
diff --git a/gcc/testsuite/gcc.target/cris/inasm-v10.c b/gcc/testsuite/gcc.target/cris/inasm-v10.c
index 75379b3..774cd03 100644
--- a/gcc/testsuite/gcc.target/cris/inasm-v10.c
+++ b/gcc/testsuite/gcc.target/cris/inasm-v10.c
@@ -1,5 +1,5 @@
 /* { dg-do assemble } */
-/* { dg-options "-DOTHER_ISA=10 -march=v10" } */
+/* { dg-options "-DOTHER_ISA=10 -march=v10" { target { ! march_option } } } */
 
 /* Check that -march=v10 is also recognized.  */
 
diff --git a/gcc/testsuite/gcc.target/cris/sync-1-v10.c b/gcc/testsuite/gcc.target/cris/sync-1-v10.c
index 6c8dd1a..861fc8c 100644
--- a/gcc/testsuite/gcc.target/cris/sync-1-v10.c
+++ b/gcc/testsuite/gcc.target/cris/sync-1-v10.c
@@ -1,5 +1,5 @@
 /* Check that we can assemble both base atomic variants.  */
 /* { dg-do assemble } */
-/* { dg-options "-O2 -march=v10" } */
+/* { dg-options "-O2 -march=v10" { target { ! march_option } } } */
 /* { dg-additional-options "-mno-unaligned-atomic-may-use-library" { target cris*-*-linux* } } */
 #include "sync-1.c"
-- 
2.11.0

brgds, H-P