mla-1.c: Ignore warnings about conflicting switches.

	* gcc.target/arm/mla-1.c: Ignore warnings about conflicting switches.
	* gcc.target/arm/pr39839.c: Likewise.
	* gcc.target/arm/pr40657-2.c: Likewise.
	* gcc.target/arm/pr40956.c: Likewise.
	* gcc.target/arm/pr41679.c: Likewise.
	* gcc.target/arm/pr42235.c: Likewise.
	* gcc.target/arm/pr42495.c: Likewise.
	* gcc.target/arm/pr42505.c: Likewise.
	* gcc.target/arm/pr42574.c: Likewise.
	* gcc.target/arm/pr46883.c: Likewise.
	* gcc.target/arm/pr46934.c: Likewise.
	* gcc.target/arm/xor-and.c: Likewise.

From-SVN: r175046

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e32f53e..648debf 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,18 @@
+2011-06-14  Janis Johnson  <janisjo@codesourcery.com>
+
+       * gcc.target/arm/mla-1.c: Ignore warnings about conflicting switches.
+       * gcc.target/arm/pr39839.c: Likewise.
+       * gcc.target/arm/pr40657-2.c: Likewise.
+       * gcc.target/arm/pr40956.c: Likewise.
+       * gcc.target/arm/pr41679.c: Likewise.
+       * gcc.target/arm/pr42235.c: Likewise.
+       * gcc.target/arm/pr42495.c: Likewise.
+       * gcc.target/arm/pr42505.c: Likewise.
+       * gcc.target/arm/pr42574.c: Likewise.
+       * gcc.target/arm/pr46883.c: Likewise.
+       * gcc.target/arm/pr46934.c: Likewise.
+       * gcc.target/arm/xor-and.c: Likewise.
+
 2011-06-14  Jason Merrill  <jason@redhat.com>
 
        * g++.dg/other/error23.C: Adjust error message.

diff --git a/gcc/testsuite/gcc.target/arm/mla-1.c b/gcc/testsuite/gcc.target/arm/mla-1.c
index f39dcff..6d5ee73 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/mla-1.c
+++ b/gcc/testsuite/gcc.target/arm/mla-1.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O2 -march=armv5te" } */
+/* { dg-prune-output "switch .* conflicts with" } */
 
 
 int

diff --git a/gcc/testsuite/gcc.target/arm/pr39839.c b/gcc/testsuite/gcc.target/arm/pr39839.c
index 31e865a..b5628a9 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr39839.c
+++ b/gcc/testsuite/gcc.target/arm/pr39839.c
@@ -1,5 +1,6 @@
 /* { dg-options "-mthumb -Os -march=armv5te -mthumb-interwork -fpic" }  */
 /* { dg-require-effective-target arm_thumb1_ok } */
+/* { dg-prune-output "switch .* conflicts with" } */
 /* { dg-final { scan-assembler-not "str\[\\t \]*r.,\[\\t \]*.sp," } } */
 
 struct S

diff --git a/gcc/testsuite/gcc.target/arm/pr40657-2.c b/gcc/testsuite/gcc.target/arm/pr40657-2.c
index 31d4837..da3328d 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr40657-2.c
+++ b/gcc/testsuite/gcc.target/arm/pr40657-2.c
@@ -1,5 +1,6 @@
 /* { dg-options "-Os -march=armv4t -mthumb" }  */
 /* { dg-require-effective-target arm_thumb1_ok } */
+/* { dg-prune-output "switch .* conflicts with" } */
 /* { dg-final { scan-assembler-not "sub\[\\t \]*sp,\[\\t \]*sp" } } */
 /* { dg-final { scan-assembler-not "add\[\\t \]*sp,\[\\t \]*sp" } } */
 

diff --git a/gcc/testsuite/gcc.target/arm/pr40956.c b/gcc/testsuite/gcc.target/arm/pr40956.c
index 5719b72..332b9d6 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr40956.c
+++ b/gcc/testsuite/gcc.target/arm/pr40956.c
@@ -1,6 +1,7 @@
 /* { dg-options "-mthumb -Os -fpic -march=armv5te" }  */
 /* { dg-require-effective-target arm_thumb1_ok } */
 /* { dg-require-effective-target fpic } */
+/* { dg-prune-output "switch .* conflicts with" } */
 /* Make sure the constant "0" is loaded into register only once.  */
 /* { dg-final { scan-assembler-times "mov\[\\t \]*r., #0" 1 } } */
 

diff --git a/gcc/testsuite/gcc.target/arm/pr41679.c b/gcc/testsuite/gcc.target/arm/pr41679.c
index 8b24898..5ca565a 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr41679.c
+++ b/gcc/testsuite/gcc.target/arm/pr41679.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-march=armv5te -g -O2" } */
+/* { dg-prune-output "switch .* conflicts with" } */
 
 extern int a;
 extern char b;

diff --git a/gcc/testsuite/gcc.target/arm/pr42235.c b/gcc/testsuite/gcc.target/arm/pr42235.c
index 478abcc..df2d338 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr42235.c
+++ b/gcc/testsuite/gcc.target/arm/pr42235.c
@@ -1,5 +1,6 @@
 /* { dg-options "-mthumb -O2 -march=armv5te" }  */
 /* { dg-require-effective-target arm_thumb1_ok } */
+/* { dg-prune-output "switch .* conflicts with" } */
 /* { dg-final { scan-assembler-not "add\[\\t \]*r.,\[\\t \]*r.,\[\\t \]*\#1" } } */
 /* { dg-final { scan-assembler-not "add\[\\t \]*r.,\[\\t \]*\#1" } } */
 

diff --git a/gcc/testsuite/gcc.target/arm/pr42495.c b/gcc/testsuite/gcc.target/arm/pr42495.c
index f65f3c1..854c1c2 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr42495.c
+++ b/gcc/testsuite/gcc.target/arm/pr42495.c
@@ -1,6 +1,7 @@
 /* { dg-options "-mthumb -Os -fpic -march=armv5te -fdump-rtl-hoist" }  */
 /* { dg-require-effective-target arm_thumb1_ok } */
 /* { dg-require-effective-target fpic } */
+/* { dg-prune-output "switch .* conflicts with" } */
 /* Make sure all calculations of gObj's address get hoisted to one location.  */
 /* { dg-final { scan-rtl-dump "PRE/HOIST: end of bb .* copying expression" "hoist" } } */
 

diff --git a/gcc/testsuite/gcc.target/arm/pr42505.c b/gcc/testsuite/gcc.target/arm/pr42505.c
index 60902c3..4a357fa 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr42505.c
+++ b/gcc/testsuite/gcc.target/arm/pr42505.c
@@ -1,5 +1,6 @@
 /* { dg-options "-mthumb -Os -march=armv5te" }  */
 /* { dg-require-effective-target arm_thumb1_ok } */
+/* { dg-prune-output "switch .* conflicts with" } */
 /* { dg-final { scan-assembler-not "str\[\\t \]*r.,\[\\t \]*.sp," } } */
 
 struct A {

diff --git a/gcc/testsuite/gcc.target/arm/pr42574.c b/gcc/testsuite/gcc.target/arm/pr42574.c
index 6bb4233..d91517c 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr42574.c
+++ b/gcc/testsuite/gcc.target/arm/pr42574.c
@@ -1,6 +1,7 @@
 /* { dg-options "-mthumb -Os -fpic -march=armv5te" }  */
 /* { dg-require-effective-target arm_thumb1_ok } */
 /* { dg-require-effective-target fpic } */
+/* { dg-prune-output "switch .* conflicts with" } */
 /* Make sure the address of glob.c is calculated only once and using
    a logical shift for the offset (200<<1).  */
 /* { dg-final { scan-assembler-times "lsl" 1 } } */

diff --git a/gcc/testsuite/gcc.target/arm/pr46883.c b/gcc/testsuite/gcc.target/arm/pr46883.c
index c85b902..ba14327 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr46883.c
+++ b/gcc/testsuite/gcc.target/arm/pr46883.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O1 -march=armv5te" } */
+/* { dg-prune-output "switch .* conflicts with" } */
 
 void bar (unsigned char *q, unsigned short *data16s, int len)
 {

diff --git a/gcc/testsuite/gcc.target/arm/pr46934.c b/gcc/testsuite/gcc.target/arm/pr46934.c
index 22b8aa8..cbb692f 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/pr46934.c
+++ b/gcc/testsuite/gcc.target/arm/pr46934.c
@@ -1,6 +1,7 @@
 /* { dg-do compile } */
 /* { dg-options "-march=armv5te -mthumb -Os" }  */
 /* { dg-require-effective-target arm_thumb1_ok } */
+/* { dg-prune-output "switch .* conflicts with" } */
 
 int caller (unsigned int reg_type)
 {

diff --git a/gcc/testsuite/gcc.target/arm/xor-and.c b/gcc/testsuite/gcc.target/arm/xor-and.c
index 4b0f790..53dff85 100644 (file)
--- a/gcc/testsuite/gcc.target/arm/xor-and.c
+++ b/gcc/testsuite/gcc.target/arm/xor-and.c
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-options "-O -march=armv6" } */
+/* { dg-prune-output "switch .* conflicts with" } */
 
 unsigned short foo (unsigned short x)
 {