[gcc(refs/users/ppalka/heads/libstdcxx-constrained-algos)] More uses of effective-target march_option for cris

[Patrick Palka]

https://gcc.gnu.org/g:95a5c0336e18f84bfe0f6be6a2e1c63e733e91c1

commit 95a5c0336e18f84bfe0f6be6a2e1c63e733e91c1
Author: Hans-Peter Nilsson <hp@axis.com>
Date:   Wed Jan 22 00:09:14 2020 +0100

    More uses of effective-target march_option for cris
    
    	* gcc.target/cris/asm-v8.S, gcc.target/cris/inasm-v8.c,
    	gcc.target/cris/sync-1.c: Apply effective_target_march_option.
    
    Oops.  A few stragglers, same as recent update: differing
    -march=... options is an error, noticed with e.g.
    "make check RUNTESTFLAGS=--target_board=cris-sim/arch=v10"

Diff:
---
 gcc/testsuite/ChangeLog                  | 5 +++++
 gcc/testsuite/gcc.target/cris/asm-v8.S   | 2 +-
 gcc/testsuite/gcc.target/cris/inasm-v8.c | 2 +-
 gcc/testsuite/gcc.target/cris/sync-1.c   | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 2130870b..2fffb91b 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2020-01-22  Hans-Peter Nilsson  <hp@axis.com>
+
+	* gcc.target/cris/asm-v8.S, gcc.target/cris/inasm-v8.c,
+	gcc.target/cris/sync-1.c: Apply effective_target_march_option.
+
 2020-01-21  Uros Bizjak  <ubizjak@gmail.com>
 
 	PR target/93319
diff --git a/gcc/testsuite/gcc.target/cris/asm-v8.S b/gcc/testsuite/gcc.target/cris/asm-v8.S
index 3fba318..8946ba9 100644
--- a/gcc/testsuite/gcc.target/cris/asm-v8.S
+++ b/gcc/testsuite/gcc.target/cris/asm-v8.S
@@ -1,5 +1,5 @@
 /* { dg-do assemble } */
-/* { dg-options "-DOTHER_ISA=8 -march=v8" } */
+/* { dg-options "-DOTHER_ISA=8 -march=v8" { target { ! march_option } } } */
 
 /* Check that -march=v8 is also recognized.  */
 
diff --git a/gcc/testsuite/gcc.target/cris/inasm-v8.c b/gcc/testsuite/gcc.target/cris/inasm-v8.c
index b2fb305..f8f15e8 100644
--- a/gcc/testsuite/gcc.target/cris/inasm-v8.c
+++ b/gcc/testsuite/gcc.target/cris/inasm-v8.c
@@ -1,5 +1,5 @@
 /* { dg-do assemble } */
-/* { dg-options "-DOTHER_ISA=8 -march=v8" } */
+/* { dg-options "-DOTHER_ISA=8 -march=v8" { target { ! march_option } } } */
 
 /* Check that -march=v8 is also recognized.  */
 
diff --git a/gcc/testsuite/gcc.target/cris/sync-1.c b/gcc/testsuite/gcc.target/cris/sync-1.c
index 1bc9a67..bf08017 100644
--- a/gcc/testsuite/gcc.target/cris/sync-1.c
+++ b/gcc/testsuite/gcc.target/cris/sync-1.c
@@ -1,6 +1,6 @@
 /* Check that we can assemble both base atomic variants, for v0.  */
 /* { dg-do assemble } */
-/* { dg-options "-O2 -march=v0" } */
+/* { dg-options "-O2 -march=v0" { target { ! march_option } } } */
 
 #ifndef type
 #define type char