Index: gcc.target/arm/pr39839.c
===================================================================
--- gcc.target/arm/pr39839.c	(revision 175921)
+++ gcc.target/arm/pr39839.c	(working copy)
@@ -1,6 +1,5 @@
-/* { dg-options "-mthumb -Os -march=armv5te -mthumb-interwork -fpic" }  */
+/* { dg-options "-mthumb -Os -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
Index: gcc.target/arm/pr40657-2.c
===================================================================
--- gcc.target/arm/pr40657-2.c	(revision 175921)
+++ gcc.target/arm/pr40657-2.c	(working copy)
@@ -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" } } */
 
Index: gcc.target/arm/pr40956.c
===================================================================
--- gcc.target/arm/pr40956.c	(revision 175921)
+++ gcc.target/arm/pr40956.c	(working copy)
@@ -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 constant "0" is loaded into register only once.  */
 /* { dg-final { scan-assembler-times "mov\[\\t \]*r., #0" 1 } } */
 
Index: gcc.target/arm/pr42235.c
===================================================================
--- gcc.target/arm/pr42235.c	(revision 175921)
+++ gcc.target/arm/pr42235.c	(working copy)
@@ -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" } } */
 
Index: gcc.target/arm/pr42495.c
===================================================================
--- gcc.target/arm/pr42495.c	(revision 175921)
+++ gcc.target/arm/pr42495.c	(working copy)
@@ -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" } } */
 
Index: gcc.target/arm/pr42505.c
===================================================================
--- gcc.target/arm/pr42505.c	(revision 175921)
+++ gcc.target/arm/pr42505.c	(working copy)
@@ -1,6 +1,5 @@
-/* { dg-options "-mthumb -Os -march=armv5te" }  */
+/* { dg-options "-mthumb -Os" }  */
 /* { 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 {
Index: gcc.target/arm/pr42574.c
===================================================================
--- gcc.target/arm/pr42574.c	(revision 175921)
+++ gcc.target/arm/pr42574.c	(working copy)
@@ -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 } } */
Index: gcc.target/arm/pr46934.c
===================================================================
--- gcc.target/arm/pr46934.c	(revision 175921)
+++ gcc.target/arm/pr46934.c	(working copy)
@@ -1,7 +1,6 @@
 /* { dg-do compile } */
-/* { dg-options "-march=armv5te -mthumb -Os" }  */
+/* { dg-options "-mthumb -Os" }  */
 /* { dg-require-effective-target arm_thumb1_ok } */
-/* { dg-prune-output "switch .* conflicts with" } */
 
 int caller (unsigned int reg_type)
 {
Index: gcc.target/arm/thumb-branch1.c
===================================================================
--- gcc.target/arm/thumb-branch1.c	(revision 175921)
+++ gcc.target/arm/thumb-branch1.c	(working copy)
@@ -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)
 {
