pr40657-2.c: Remove -march option and unneeded dg-prune-output.

	* gcc.target/arm/pr40657-2.c: Remove -march option and unneeded
	dg-prune-output.
	* gcc.target/arm/pr42235.c: Likewise.
	* gcc.target/arm/pr42495.c: Likewise.
	* gcc.target/arm/pr42574.c: Likewise.
	* gcc.target/arm/thumb-branch1.c: Likewise.

From-SVN: r175997

6 files changed, 12 insertions, 10 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1f3d305..0ddca2a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 2011-07-07  Janis Johnson  <janisjo@codesourcery.com>
 
+	* gcc.target/arm/pr40657-2.c: Remove -march option and unneeded
+	dg-prune-output.
+	* gcc.target/arm/pr42235.c: Likewise.
+	* gcc.target/arm/pr42495.c: Likewise.
+	* gcc.target/arm/pr42574.c: Likewise.
+	* gcc.target/arm/thumb-branch1.c: Likewise.
+
 	* gcc.target/arm/pr39839.c: Don't specify -mthumb or -march, remove
 	unneeded prune of possible warning.
 	* gcc.target/arm/pr40956.c: Likewise.
diff --git a/gcc/testsuite/gcc.target/arm/pr40657-2.c b/gcc/testsuite/gcc.target/arm/pr40657-2.c
index da3328d..afd469a 100644
--- a/gcc/testsuite/gcc.target/arm/pr40657-2.c
+++ b/gcc/testsuite/gcc.target/arm/pr40657-2.c
@@ -1,6 +1,5 @@
-/* { dg-options "-Os -march=armv4t -mthumb" }  */
+/* { dg-options "-Os -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/pr42235.c b/gcc/testsuite/gcc.target/arm/pr42235.c
index df2d338..582c8a2 100644
--- a/gcc/testsuite/gcc.target/arm/pr42235.c
+++ b/gcc/testsuite/gcc.target/arm/pr42235.c
@@ -1,6 +1,5 @@
-/* { dg-options "-mthumb -O2 -march=armv5te" }  */
+/* { dg-options "-mthumb -O2" }  */
 /* { 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 854c1c2..7e08cf2 100644
--- a/gcc/testsuite/gcc.target/arm/pr42495.c
+++ b/gcc/testsuite/gcc.target/arm/pr42495.c
@@ -1,7 +1,6 @@
-/* { dg-options "-mthumb -Os -fpic -march=armv5te -fdump-rtl-hoist" }  */
+/* { dg-options "-mthumb -Os -fpic -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/pr42574.c b/gcc/testsuite/gcc.target/arm/pr42574.c
index d91517c..0ccd05f 100644
--- a/gcc/testsuite/gcc.target/arm/pr42574.c
+++ b/gcc/testsuite/gcc.target/arm/pr42574.c
@@ -1,7 +1,6 @@
-/* { dg-options "-mthumb -Os -fpic -march=armv5te" }  */
+/* { dg-options "-mthumb -Os -fpic" }  */
 /* { 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/thumb-branch1.c b/gcc/testsuite/gcc.target/arm/thumb-branch1.c
index eac2e79..73f6cf7 100644
--- a/gcc/testsuite/gcc.target/arm/thumb-branch1.c
+++ b/gcc/testsuite/gcc.target/arm/thumb-branch1.c
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
 /* { dg-skip-if "" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */
-/* { dg-options "-Os -mthumb -march=armv5te" } */
-/* { dg-prune-output "switch .* conflicts with" } */
+/* { dg-options "-Os -mthumb" } */
 
 int returnbool(int a, int b)
 {