I made other changes to these tests earlier today, then the patch to
ignore warnings for conflicting options was approved.  I've committed
this to trunk.

Janis
2011-06-14  Janis Johnson  <jani...@codesourcery.com>

        * gcc.target/arm/pr45701-1.c: Ignore warnings about conflicting 
switches.
        * gcc.target/arm/pr45701-2.c: Likewise.
        * gcc.target/arm/thumb-branch1.c: Likewise.

Index: gcc.target/arm/pr45701-1.c
===================================================================
--- gcc.target/arm/pr45701-1.c  (revision 175047)
+++ gcc.target/arm/pr45701-1.c  (working copy)
@@ -1,6 +1,7 @@
 /* { dg-do compile } */
 /* { dg-skip-if "" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */
 /* { dg-options "-march=armv7-a -mthumb -Os" }  */
+/* { dg-prune-output "switch .* conflicts with" } */
 /* { dg-final { scan-assembler "push\t\{r3" } } */
 /* { dg-final { scan-assembler-not "r8" } } */
 
Index: gcc.target/arm/pr45701-2.c
===================================================================
--- gcc.target/arm/pr45701-2.c  (revision 175047)
+++ gcc.target/arm/pr45701-2.c  (working copy)
@@ -1,6 +1,7 @@
 /* { dg-do compile } */
 /* { dg-skip-if "" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */
 /* { dg-options "-march=armv7-a -mthumb -Os" }  */
+/* { dg-prune-output "switch .* conflicts with" } */
 /* { dg-final { scan-assembler "push\t\{r3" } } */
 /* { dg-final { scan-assembler-not "r8" } } */
 
Index: gcc.target/arm/thumb-branch1.c
===================================================================
--- gcc.target/arm/thumb-branch1.c      (revision 175047)
+++ gcc.target/arm/thumb-branch1.c      (working copy)
@@ -1,6 +1,7 @@
 /* { dg-do compile } */
 /* { dg-skip-if "" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */
 /* { dg-options "-Os -mthumb -march=armv5te" } */
+/* { dg-prune-output "switch .* conflicts with" } */
 
 int returnbool(int a, int b)
 {

Reply via email to