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 e32f53ea3ac515adf6c38221ffb86354b2fe28e7..648debf0ccca037b737d2551670d8968a46fa686 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 f39dcff974bc17eb323bbb3b36fb3cd05592ef20..6d5ee73b26103c69d236589351c238f470c7f9dc 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 31e865af2f553cb1609520406441f48a81fcc4c1..b5628a93daf8cd8b341000b267d9df11dd805e1c 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 31d48376730485a9e79f5cc04ba168ecdf5e7ae3..da3328d473085705ab68da9e84f1664bc611b6bf 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 5719b726a60c9591e330d5b63ba1e07df981da10..332b9d66d4836451971de8b1825a0bbaa41f6e93 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 8b248985fe00c6f5822e93581c60d3e3440ad530..5ca565a62250686874eec5e87d4c3e545cd898f2 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 478abcc076569570677b4a4142da2863d9a79f27..df2d338226ba282847470f307f7afe2a5feea264 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 f65f3c14637e770c2efe3fd10e04a035e1aa8bad..854c1c25ddbd437e05fc1828a3032d7673a1083c 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 60902c35d27b5ed524ce4ebfd03c6186a08b6cc1..4a357fab3709cfda48205aa9af7031392dcc0921 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 6bb42331dad604a4f22b882ec4712723717968e2..d91517cff9f4d11e723b6de0ae78015b44498b6b 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 c85b902d5f4dd72de4ac1348f49a65abb3e9a6bd..ba143270ea014bda6562e2fa0f469ef263c54ab3 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 22b8aa838462004ad8aec4bf569098bb55c9d86c..cbb692f3a248599ac23b373e6897e44ab9df246d 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 4b0f79013fc9ff6e0de6413331873e3664a07b39..53dff85f8f780fb99a93bbcc24180a3d0d5d3be9 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)
 {