arm: testsuite: improve compatibility of ftest-armv7m-thumb.c

This test is specific to armv7m cores which do not support hardware
floating-point.  We can improve its compatibility by having the default
options for this core specify -mfloat-abi=soft.

gcc/testsuite:

	* lib/target-supports.exp (check_effective_target_arm_arch_FUNC_ok):
	Use soft-float ABI for armv7m.
	* gcc.target/arm/ftest-armv7m-thumb.c: Use dg-require-effective-target
	to check flag compatibility.

diff --git a/gcc/testsuite/gcc.target/arm/ftest-armv7m-thumb.c b/gcc/testsuite/gcc.target/arm/ftest-armv7m-thumb.c
index 363b48b7516cca82cb510751141c823411126b72..ba1985f5b0d385b3aea910cb8958cc183eb1afdf 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/ftest-armv7m-thumb.c
+++ b/gcc/testsuite/gcc.target/arm/ftest-armv7m-thumb.c
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-march=*" } { "-march=arm7-m" } } */
-/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" } { "" } } */
+/* { dg-require-effective-target arm_arch_v7m_ok }
 /* { dg-options "-mthumb" } */
 /* { dg-add-options arm_arch_v7m } */
 

diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp
index 9d2958626ad4dc4dd50d47a530b9dc1f64c69f5d..316e34a34bed1c771ce70e34926dc9fe6175efd5 100644 (file)
--- a/gcc/testsuite/lib/target-supports.exp
+++ b/gcc/testsuite/lib/target-supports.exp
@@ -5425,7 +5425,7 @@ foreach { armfunc armflag armdefs } {
        v6m "-march=armv6-m -mthumb -mfloat-abi=soft" __ARM_ARCH_6M__
        v7a "-march=armv7-a+fp" __ARM_ARCH_7A__
        v7r "-march=armv7-r+fp" __ARM_ARCH_7R__
-       v7m "-march=armv7-m -mthumb" __ARM_ARCH_7M__
+       v7m "-march=armv7-m -mthumb -mfloat-abi=soft" __ARM_ARCH_7M__
        v7em "-march=armv7e-m+fp -mthumb" __ARM_ARCH_7EM__
        v7ve "-march=armv7ve+fp -marm"
                "__ARM_ARCH_7A__ && __ARM_FEATURE_IDIV"