Update test cases to use -mcpu=unset/-march=unset feature introduced in r15-3606-g7d6c6a0d15c.
gcc/testsuite/ChangeLog: * gcc.target/arm/small-multiply-m0-1.c: Use effective-target arm_arch_v6m and added option "-march=unset". * gcc.target/arm/small-multiply-m0-2.c: Likewise. * gcc.target/arm/small-multiply-m0-3.c: Likewise. * gcc.target/arm/small-multiply-m0plus-1.c: Likewise. * gcc.target/arm/small-multiply-m0plus-2.c: Likewise. * gcc.target/arm/small-multiply-m0plus-3.c: Likewise. * gcc.target/arm/small-multiply-m1-1.c: Likewise. * gcc.target/arm/small-multiply-m1-2.c: Likewise. * gcc.target/arm/small-multiply-m1-3.c: Likewise. Signed-off-by: Torbjörn SVENSSON <torbjorn.svens...@foss.st.com> --- gcc/testsuite/gcc.target/arm/small-multiply-m0-1.c | 4 ++-- gcc/testsuite/gcc.target/arm/small-multiply-m0-2.c | 4 ++-- gcc/testsuite/gcc.target/arm/small-multiply-m0-3.c | 4 ++-- gcc/testsuite/gcc.target/arm/small-multiply-m0plus-1.c | 4 ++-- gcc/testsuite/gcc.target/arm/small-multiply-m0plus-2.c | 4 ++-- gcc/testsuite/gcc.target/arm/small-multiply-m0plus-3.c | 4 ++-- gcc/testsuite/gcc.target/arm/small-multiply-m1-1.c | 4 ++-- gcc/testsuite/gcc.target/arm/small-multiply-m1-2.c | 4 ++-- gcc/testsuite/gcc.target/arm/small-multiply-m1-3.c | 4 ++-- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gcc/testsuite/gcc.target/arm/small-multiply-m0-1.c b/gcc/testsuite/gcc.target/arm/small-multiply-m0-1.c index 52c652c1cba..c62e2f97ade 100644 --- a/gcc/testsuite/gcc.target/arm/small-multiply-m0-1.c +++ b/gcc/testsuite/gcc.target/arm/small-multiply-m0-1.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ /* { dg-require-effective-target arm_thumb1_ok } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" "-march=*" } { "-mcpu=cortex-m0.small-multiply" } } */ -/* { dg-options "-mcpu=cortex-m0.small-multiply -mthumb -O2" } */ +/* { dg-options "-march=unset -mcpu=cortex-m0.small-multiply -mthumb -O2" } */ int test (int a) diff --git a/gcc/testsuite/gcc.target/arm/small-multiply-m0-2.c b/gcc/testsuite/gcc.target/arm/small-multiply-m0-2.c index 10d49e9eace..a9e076b0e60 100644 --- a/gcc/testsuite/gcc.target/arm/small-multiply-m0-2.c +++ b/gcc/testsuite/gcc.target/arm/small-multiply-m0-2.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ /* { dg-require-effective-target arm_thumb1_ok } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" "-march=*" } { "-mcpu=cortex-m0.small-multiply" } } */ -/* { dg-options "-mcpu=cortex-m0.small-multiply -mthumb -Os" } */ +/* { dg-options "-march=unset -mcpu=cortex-m0.small-multiply -mthumb -Os" } */ int test (int a) diff --git a/gcc/testsuite/gcc.target/arm/small-multiply-m0-3.c b/gcc/testsuite/gcc.target/arm/small-multiply-m0-3.c index b4af511af86..973c78aee37 100644 --- a/gcc/testsuite/gcc.target/arm/small-multiply-m0-3.c +++ b/gcc/testsuite/gcc.target/arm/small-multiply-m0-3.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ /* { dg-require-effective-target arm_thumb1_ok } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" "-march=*" } { "-mcpu=cortex-m0.small-multiply" } } */ -/* { dg-options "-mcpu=cortex-m0.small-multiply -mthumb -Os" } */ +/* { dg-options "-march=unset -mcpu=cortex-m0.small-multiply -mthumb -Os" } */ int test (int a) diff --git a/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-1.c b/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-1.c index 59dba7cf4ab..53e68ae1364 100644 --- a/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-1.c +++ b/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-1.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ /* { dg-require-effective-target arm_thumb1_ok } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" "-march=*" } { "-mcpu=cortex-m0plus.small-multiply" } } */ -/* { dg-options "-mcpu=cortex-m0plus.small-multiply -mthumb -O2" } */ +/* { dg-options "-march=unset -mcpu=cortex-m0plus.small-multiply -mthumb -O2" } */ int test (int a) diff --git a/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-2.c b/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-2.c index 685ef440776..19f941dd1b7 100644 --- a/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-2.c +++ b/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-2.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ /* { dg-require-effective-target arm_thumb1_ok } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" "-march=*" } { "-mcpu=cortex-m0plus.small-multiply" } } */ -/* { dg-options "-mcpu=cortex-m0plus.small-multiply -mthumb -Os" } */ +/* { dg-options "-march=unset -mcpu=cortex-m0plus.small-multiply -mthumb -Os" } */ int test (int a) diff --git a/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-3.c b/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-3.c index d24e720fe67..5606943c215 100644 --- a/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-3.c +++ b/gcc/testsuite/gcc.target/arm/small-multiply-m0plus-3.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ /* { dg-require-effective-target arm_thumb1_ok } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" "-march=*" } { "-mcpu=cortex-m0plus.small-multiply" } } */ -/* { dg-options "-mcpu=cortex-m0plus.small-multiply -mthumb -Os" } */ +/* { dg-options "-march=unset -mcpu=cortex-m0plus.small-multiply -mthumb -Os" } */ int test (int a) diff --git a/gcc/testsuite/gcc.target/arm/small-multiply-m1-1.c b/gcc/testsuite/gcc.target/arm/small-multiply-m1-1.c index d966ae955ce..de8c2aac987 100644 --- a/gcc/testsuite/gcc.target/arm/small-multiply-m1-1.c +++ b/gcc/testsuite/gcc.target/arm/small-multiply-m1-1.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ /* { dg-require-effective-target arm_thumb1_ok } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" "-march=*" } { "-mcpu=cortex-m1.small-multiply" } } */ -/* { dg-options "-mcpu=cortex-m1.small-multiply -mthumb -O2" } */ +/* { dg-options "-march=unset -mcpu=cortex-m1.small-multiply -mthumb -O2" } */ int test (int a) diff --git a/gcc/testsuite/gcc.target/arm/small-multiply-m1-2.c b/gcc/testsuite/gcc.target/arm/small-multiply-m1-2.c index 60576bb9ed1..da4706dd6d1 100644 --- a/gcc/testsuite/gcc.target/arm/small-multiply-m1-2.c +++ b/gcc/testsuite/gcc.target/arm/small-multiply-m1-2.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ /* { dg-require-effective-target arm_thumb1_ok } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" "-march=*" } { "-mcpu=cortex-m1.small-multiply" } } */ -/* { dg-options "-mcpu=cortex-m1.small-multiply -mthumb -Os" } */ +/* { dg-options "-march=unset -mcpu=cortex-m1.small-multiply -mthumb -Os" } */ int test (int a) diff --git a/gcc/testsuite/gcc.target/arm/small-multiply-m1-3.c b/gcc/testsuite/gcc.target/arm/small-multiply-m1-3.c index c56479d1897..a6232cf29e3 100644 --- a/gcc/testsuite/gcc.target/arm/small-multiply-m1-3.c +++ b/gcc/testsuite/gcc.target/arm/small-multiply-m1-3.c @@ -1,7 +1,7 @@ /* { dg-do compile } */ +/* { dg-require-effective-target arm_arch_v6m_ok } */ /* { dg-require-effective-target arm_thumb1_ok } */ -/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" "-march=*" } { "-mcpu=cortex-m1.small-multiply" } } */ -/* { dg-options "-mcpu=cortex-m1.small-multiply -mthumb -Os" } */ +/* { dg-options "-march=unset -mcpu=cortex-m1.small-multiply -mthumb -Os" } */ int test (int a) -- 2.25.1