For three tests in gcc.target/arm that don't depend on processor-specific
behavior, don't specify the -march option.  This makes dg-prune-output
for warnings about conflicts unnecessary, so remove it.

Two of these tests are for internal compiler errors that showed up with
particular values of -march.  I think it's fine to test them with normal
multilibs, some of which will use those -march values, and others of
which could trigger a closely-related ICE.

If there'a a desire to use specific options in a test, I'd prefer to see
it done in a copy of the test that is skipped for all multilibs but the
default.

OK for trunk, and for 4.6 after a few days?
2011-07-06  Janis Johnson  <jani...@codesourcery.com>

        * gcc.target/arm/pr41679.c: Remove -march options and unneeded
        dg-prune-output.
        * gcc.target/arm/pr46883.c: Likewise.
        * gcc.target/arm/xor-and.c: Likewise.

Index: gcc.target/arm/pr41679.c
===================================================================
--- gcc.target/arm/pr41679.c    (revision 175921)
+++ gcc.target/arm/pr41679.c    (working copy)
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-march=armv5te -g -O2" } */
-/* { dg-prune-output "switch .* conflicts with" } */
+/* { dg-options "-g -O2" } */
 
 extern int a;
 extern char b;
Index: gcc.target/arm/pr46883.c
===================================================================
--- gcc.target/arm/pr46883.c    (revision 175921)
+++ gcc.target/arm/pr46883.c    (working copy)
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -march=armv5te" } */
-/* { dg-prune-output "switch .* conflicts with" } */
+/* { dg-options "-O1" } */
 
 void bar (unsigned char *q, unsigned short *data16s, int len)
 {
Index: gcc.target/arm/xor-and.c
===================================================================
--- gcc.target/arm/xor-and.c    (revision 175921)
+++ gcc.target/arm/xor-and.c    (working copy)
@@ -1,6 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O -march=armv6" } */
-/* { dg-prune-output "switch .* conflicts with" } */
+/* { dg-options "-O" } */
 
 unsigned short foo (unsigned short x)
 {

Reply via email to