5 files changed, 9 insertions, 4 deletions
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 23e9dbf5b02..db86cf68740 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-14  Richard Henderson  <rth@redhat.com>
+
+	* g++.dg/eh/builtin1.C: Update resx pattern match.
+	* g++.dg/eh/builtin2.C, g++.dg/eh/builtin3.C: Likewise.
+
 2009-09-14  Richard Sandiford  <rdsandiford@googlemail.com>
 
 	* gcc.target/mips/branch-helper.h: New file.
diff --git a/gcc/testsuite/g++.dg/eh/builtin1.C b/gcc/testsuite/g++.dg/eh/builtin1.C
index 1f56d1a833d..ed49e9a962a 100644
--- a/gcc/testsuite/g++.dg/eh/builtin1.C
+++ b/gcc/testsuite/g++.dg/eh/builtin1.C
@@ -22,5 +22,5 @@ bar ()
   __builtin_printf ("foo %d\n", a.i);
 }
 
-/* { dg-final { scan-tree-dump-times "resx 1" 2 "eh" } } */
+/* { dg-final { scan-tree-dump-times "resx" 2 "eh" } } */
 /* { dg-final { cleanup-tree-dump "eh" } } */
diff --git a/gcc/testsuite/g++.dg/eh/builtin2.C b/gcc/testsuite/g++.dg/eh/builtin2.C
index b106516da68..fe0c4de6b3e 100644
--- a/gcc/testsuite/g++.dg/eh/builtin2.C
+++ b/gcc/testsuite/g++.dg/eh/builtin2.C
@@ -21,5 +21,5 @@ bar ()
   __builtin_printf ("foo %d\n", a.i);
 }
 
-/* { dg-final { scan-tree-dump-times "resx 1" 0 "eh" } } */
+/* { dg-final { scan-tree-dump-times "resx" 0 "eh" } } */
 /* { dg-final { cleanup-tree-dump "eh" } } */
diff --git a/gcc/testsuite/g++.dg/eh/builtin3.C b/gcc/testsuite/g++.dg/eh/builtin3.C
index be1629ea5f8..45809b81553 100644
--- a/gcc/testsuite/g++.dg/eh/builtin3.C
+++ b/gcc/testsuite/g++.dg/eh/builtin3.C
@@ -12,5 +12,5 @@ bar ()
   __builtin_printf ("foo %d\n", a.i);
 }
 
-/* { dg-final { scan-tree-dump-times "resx 1" 1 "eh" } } */
+/* { dg-final { scan-tree-dump-times "resx" 1 "eh" } } */
 /* { dg-final { cleanup-tree-dump "eh" } } */
diff --git a/gcc/testsuite/g++.dg/tree-ssa/ehcleanup-1.C b/gcc/testsuite/g++.dg/tree-ssa/ehcleanup-1.C
index 3de72aac590..8dfaa52b6bb 100644
--- a/gcc/testsuite/g++.dg/tree-ssa/ehcleanup-1.C
+++ b/gcc/testsuite/g++.dg/tree-ssa/ehcleanup-1.C
@@ -19,6 +19,6 @@ t (void)
 // { dg-final { scan-tree-dump-times "Empty EH handler" 1 "ehcleanup1" } }
 //
 // And as a result also contained control flow.
-// { dg-final { scan-tree-dump-times "Removing unreachable" 1 "ehcleanup1" } }
+// { dg-final { scan-tree-dump-times "Removing unreachable" 2 "ehcleanup1" } }
 //
 // { dg-final { cleanup-tree-dump "ehcleanup1" } }