testsuite: Make use of effective-target march_option for cris

	* 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.

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 9066c173bbdea07101d79792af4af86dd9a02f0f..21d31a5c6b0762d6ad5ffabb204d70c05b5bd615 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2020-01-19  Hans-Peter Nilsson  <hp@axis.com>
+
+       * 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.
+
 2020-01-19  Thomas König  <tkoenig@gcc.gnu.org>
 
        PR fortran/44960

diff --git a/gcc/testsuite/gcc.dg/torture/pr26515.c b/gcc/testsuite/gcc.dg/torture/pr26515.c
index a051e2e53c4a4fa097ef20bb0f6a6ad6f28db2be..ff765bad2dfe821b3d1780d7a5cef9805642ac03 100644 (file)
--- 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 c85ebe293bcf5b705171eacacdf38f0ee3d66e59..8bb0c295525b2f1ddadf9b60d365f2970c5016f8 100644 (file)
--- 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 75379b3c8c28225ac8ef924357386d8af913e1f8..774cd036ae2ed86661c427af0eddf9d2bed51258 100644 (file)
--- 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 6c8dd1a407dce69d8de0d6a5606bd1b4d049df46..861fc8c538d3be0bcc1b3fe37b1920d90bf2ad27 100644 (file)
--- 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"