[ARM][testsuite] Fix FAIL: gcc.target/arm/macro_defs0.c and macro_defs1.c when -marm...

On behalf of Mantas Mikaitis
2015-07-21  Mantas Mikaitis  <mantas.mikaitis@arm.com>

	* gcc.target/arm/macro_defs0.c: Add directive to skip
	test if -marm is present.
	* gcc.target/arm/macro_defs1.c: Likewise.

From-SVN: r226029

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3f601cbc81e000acef47458243f5eb06b6554548..7b0bc594a118a53acaaac5122d82ffc152ab4f5f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2015-07-21  Mantas Mikaitis  <mantas.mikaitis@arm.com>
+
+       * gcc.target/arm/macro_defs0.c: Add directive to skip
+       test if -marm is present.
+       * gcc.target/arm/macro_defs1.c: Likewise.
+
 2015-07-18  Uros Bizjak  <ubizjak@gmail.com>
 
        PR target/66922

diff --git a/gcc/testsuite/gcc.target/arm/macro_defs0.c b/gcc/testsuite/gcc.target/arm/macro_defs0.c
index 198243e7f6516c114aff7078d2206aefdd0c9016..32ae8239f06515f0846d1e8e287b3064b601845c 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/macro_defs0.c
+++ b/gcc/testsuite/gcc.target/arm/macro_defs0.c
@@ -1,8 +1,7 @@
 /* { dg-do compile } */
-/* { dg-skip-if "avoid conflicting multilib options"
-   { *-*-* } { "-march=*" } {"-march=armv7-m"} } */
-/* { dg-skip-if "avoid conflicting multilib options"
-   { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */
+/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-march=*" } {"-march=armv7-m"} } */
+/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */
+/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" } { "" } } */
 /* { dg-options "-march=armv7-m -mcpu=cortex-m3 -mfloat-abi=soft -mthumb" } */
 
 #ifdef __ARM_FP

diff --git a/gcc/testsuite/gcc.target/arm/macro_defs1.c b/gcc/testsuite/gcc.target/arm/macro_defs1.c
index 075b71beec0e2fcb13109f086bb4cf0d608fe332..4cc9ae604540b76a9e637f447a3979ab7c267cf2 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/macro_defs1.c
+++ b/gcc/testsuite/gcc.target/arm/macro_defs1.c
@@ -1,6 +1,6 @@
 /* { dg-do compile } */
-/* { dg-skip-if "avoid conflicting multilib options"
-   { *-*-* } { "-march=*" } { "-march=armv6-m" } } */
+/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-march=*" } { "-march=armv6-m" } } */
+/* { dg-skip-if "avoid conflicting multilib options" { *-*-* } { "-marm" } { "" } } */
 /* { dg-options "-march=armv6-m -mthumb" } */
 
 #ifdef __ARM_NEON_FP