From 0042bafd4b5eb85ee9610b9558d7b7f00579888c Mon Sep 17 00:00:00 2001 From: Hans-Peter Nilsson Date: Sun, 19 Jan 2020 20:29:52 +0100 Subject: [PATCH] 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. --- gcc/testsuite/ChangeLog | 7 +++++++ 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 +- 5 files changed, 11 insertions(+), 4 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9066c173bbd..21d31a5c6b0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2020-01-19 Hans-Peter Nilsson + + * 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 PR fortran/44960 diff --git a/gcc/testsuite/gcc.dg/torture/pr26515.c b/gcc/testsuite/gcc.dg/torture/pr26515.c index a051e2e53c4..ff765bad2df 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 c85ebe293bc..8bb0c295525 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 75379b3c8c2..774cd036ae2 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 6c8dd1a407d..861fc8c538d 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.30.2