gcc/testsuite:

        * gcc.dg/builtin-stringop-chk-1.c: Change ARM triplet to a more
        general form.
        * gcc.dg/tree-ssa/loop-31.c: Likewise.
        * g++.dg/other/packed1.C: Likewise.
        * g++.dg/other/crash-4.C: Likewise.
        * g++.dg/ext/packed8.C: Likewise.
        * g++.dg/init/array16.C: Likewise.

Index: gcc/testsuite/gcc.dg/builtin-stringop-chk-1.c
===================================================================
--- gcc/testsuite/gcc.dg/builtin-stringop-chk-1.c	(revision 162809)
+++ gcc/testsuite/gcc.dg/builtin-stringop-chk-1.c	(working copy)
@@ -2,7 +2,7 @@
    are emitted properly.  */
 /* { dg-do compile } */
 /* { dg-options "-O2 -std=gnu99" } */
-/* { dg-options "-mstructure-size-boundary=8 -O2 -std=gnu99" { target arm-*-* } } */
+/* { dg-options "-mstructure-size-boundary=8 -O2 -std=gnu99" { target arm*-*-* } } */
 
 extern void abort (void);
 
Index: gcc/testsuite/gcc.dg/tree-ssa/loop-31.c
===================================================================
--- gcc/testsuite/gcc.dg/tree-ssa/loop-31.c	(revision 162809)
+++ gcc/testsuite/gcc.dg/tree-ssa/loop-31.c	(working copy)
@@ -15,7 +15,7 @@
 
 /* When we do not have addressing mode including multiplication,
    the memory access should be strength-reduced.  */
-/* { dg-final { scan-tree-dump-times " \\+ 2" 1 "optimized" { target arm-*-* } } } */
+/* { dg-final { scan-tree-dump-times " \\+ 2" 1 "optimized" { target arm*-*-* } } } */
 /* { dg-final { scan-tree-dump-times " \\+ 2" 1 "optimized" { target { ia64-*-* && ilp32 } } } } */
 /* { dg-final { scan-tree-dump-times " \\+ 2" 2 "optimized" { target { ia64-*-* && lp64 } } } } */
 /* { dg-final { cleanup-tree-dump "optimized" } } */
Index: gcc/testsuite/g++.dg/other/packed1.C
===================================================================
--- gcc/testsuite/g++.dg/other/packed1.C	(revision 162809)
+++ gcc/testsuite/g++.dg/other/packed1.C	(working copy)
@@ -1,4 +1,4 @@
-// { dg-do run { xfail arm-*-* sh-*-* lm32-*-* } }
+// { dg-do run { xfail arm*-*-* sh-*-* lm32-*-* } }
 
 // NMS:2003-04-21 this fails on strict aligned architectures again,
 // the patch was reverted because it broke something more important.
Index: gcc/testsuite/g++.dg/other/crash-4.C
===================================================================
--- gcc/testsuite/g++.dg/other/crash-4.C	(revision 162809)
+++ gcc/testsuite/g++.dg/other/crash-4.C	(working copy)
@@ -7,7 +7,7 @@
 // NOTE: This test assumes packed structure layout differs from unpacked
 //       structure layout.  This isn't true, e.g., with the default
 //       arm-none-elf options.
-// { dg-options "-mstructure-size-boundary=8" { target arm-*-* } }
+// { dg-options "-mstructure-size-boundary=8" { target arm*-*-* } }
 
 struct a
 {
Index: gcc/testsuite/g++.dg/ext/packed8.C
===================================================================
--- gcc/testsuite/g++.dg/ext/packed8.C	(revision 162809)
+++ gcc/testsuite/g++.dg/ext/packed8.C	(working copy)
@@ -2,7 +2,7 @@
 // NOTE: This test assumes packed structure layout differs from unpacked
 //       structure layout.  This isn't true, e.g., with the default
 //       arm-none-elf options.
-// { dg-options "-mstructure-size-boundary=8" { target arm-*-* } }
+// { dg-options "-mstructure-size-boundary=8" { target arm*-*-* } }
 
 class A
 {
Index: gcc/testsuite/g++.dg/init/array16.C
===================================================================
--- gcc/testsuite/g++.dg/init/array16.C	(revision 162809)
+++ gcc/testsuite/g++.dg/init/array16.C	(working copy)
@@ -1,7 +1,7 @@
 // Causes timeout for the MMIX simulator on a 3GHz P4 and we can't
 // have "compile" for some targets and "run" for others.
 // { dg-do run { target { ! mmix-*-* } } }
-// { dg-options "-mstructure-size-boundary=8" { target arm-*-* } }
+// { dg-options "-mstructure-size-boundary=8" { target arm*-*-* } }
 
 // Copyright (C) 2004 Free Software Foundation, Inc.
 // Contributed by Nathan Sidwell 8 Dec 2004 <nathan@codesourcery.com>