From 2146a45e8e6ba1fb48a4cd5321bba73b88e3630d Mon Sep 17 00:00:00 2001
From: Alexandre Oliva <aoliva@gcc.gnu.org>
Date: Fri, 2 Feb 2001 18:27:22 +0000
Subject: [PATCH] Remove no-longer-applicable XFAIL marks for sh-*-*.  Remove
 stray **-* after arm-*-pe

From-SVN: r39411
---
 gcc/testsuite/g++.old-deja/g++.mike/dyncast1.C | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/dyncast2.C | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/dyncast3.C | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh10.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh12.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh13.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh14.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh16.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh17.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh18.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh2.C      | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh21.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh23.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh24.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh25.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh26.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh27.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh28.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh29.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh3.C      | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh31.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh33.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh34.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh35.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh36.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh37.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh38.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh39.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh40.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh41.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh42.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh44.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh46.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh47.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh48.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh49.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh5.C      | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh50.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh51.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh53.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh55.C     | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh6.C      | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh7.C      | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh8.C      | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/eh9.C      | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/p10416.C   | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/p11667.C   | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/p7912.C    | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/p9706.C    | 2 +-
 49 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/gcc/testsuite/g++.old-deja/g++.mike/dyncast1.C b/gcc/testsuite/g++.old-deja/g++.mike/dyncast1.C
index 3bddb3ce1e4..ba32d0b072a 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/dyncast1.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/dyncast1.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions -w
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <typeinfo>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/dyncast2.C b/gcc/testsuite/g++.old-deja/g++.mike/dyncast2.C
index fcf625e8c69..f2599160df6 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/dyncast2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/dyncast2.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions -w
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 // Ensure reference handling works.
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/dyncast3.C b/gcc/testsuite/g++.old-deja/g++.mike/dyncast3.C
index 627a7da23b5..aab6a8aff17 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/dyncast3.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/dyncast3.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions -w
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe**-*
 // Ensure that the return type of dynamic_cast is the real type.
 
 struct B {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh10.C b/gcc/testsuite/g++.old-deja/g++.mike/eh10.C
index 2541f2799c7..d526ed30824 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh10.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh10.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 void foo() {
   int i;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh12.C b/gcc/testsuite/g++.old-deja/g++.mike/eh12.C
index 1a42e52c82c..785dc1e6eaa 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh12.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh12.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 class MyError { };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh13.C b/gcc/testsuite/g++.old-deja/g++.mike/eh13.C
index 841202f349c..d1ece2f54aa 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh13.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh13.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* arm-*-pe
 
 #include <string>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh14.C b/gcc/testsuite/g++.old-deja/g++.mike/eh14.C
index e7c321397a2..6f087cf5805 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh14.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh14.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 class arghh {
 public:
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh16.C b/gcc/testsuite/g++.old-deja/g++.mike/eh16.C
index 2a986d54466..a74dfd0e2d9 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh16.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh16.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 int err = 1;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh17.C b/gcc/testsuite/g++.old-deja/g++.mike/eh17.C
index 482ea0434f9..4f250bb510f 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh17.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh17.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 int err = 1;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh18.C b/gcc/testsuite/g++.old-deja/g++.mike/eh18.C
index cf98bce4902..92dc8e2a5d9 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh18.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh18.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 class VB {
 public:
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh2.C b/gcc/testsuite/g++.old-deja/g++.mike/eh2.C
index d808a65d135..4fc513ff0f5 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh2.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh2.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <stdlib.h>
 #include <iostream.h>
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh21.C b/gcc/testsuite/g++.old-deja/g++.mike/eh21.C
index 261e6ea5c6e..3e1ec2ff586 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh21.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh21.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 int main () {
   try {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh23.C b/gcc/testsuite/g++.old-deja/g++.mike/eh23.C
index 2383875206a..e8f10fd49e2 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh23.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh23.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <exception>
 #include <stdlib.h>
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh24.C b/gcc/testsuite/g++.old-deja/g++.mike/eh24.C
index c9dd382f469..0eb2c7b4717 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh24.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh24.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 int fail = 0;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh25.C b/gcc/testsuite/g++.old-deja/g++.mike/eh25.C
index a179abcfe6e..7d2f8faaa46 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh25.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh25.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <exception>
 #include <stdlib.h>
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh26.C b/gcc/testsuite/g++.old-deja/g++.mike/eh26.C
index 35cafa4286a..522ad606805 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh26.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh26.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 class MyExceptionHandler { };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh27.C b/gcc/testsuite/g++.old-deja/g++.mike/eh27.C
index bd07138c753..a1ab4d2a54c 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh27.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh27.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <typeinfo>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh28.C b/gcc/testsuite/g++.old-deja/g++.mike/eh28.C
index 3f2d0a6d68b..ef197381773 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh28.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh28.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <typeinfo>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh29.C b/gcc/testsuite/g++.old-deja/g++.mike/eh29.C
index 58c1f0b3f82..fa684551950 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh29.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh29.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 int count;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh3.C b/gcc/testsuite/g++.old-deja/g++.mike/eh3.C
index e8b87bf30f7..fa827b47075 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh3.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh3.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 class foo {
 public:
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh31.C b/gcc/testsuite/g++.old-deja/g++.mike/eh31.C
index 65e683cf8fd..9f9e12d1d21 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh31.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh31.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 int count;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh33.C b/gcc/testsuite/g++.old-deja/g++.mike/eh33.C
index 234b745f3a3..d7c509ecd37 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh33.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh33.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL hppa*-*-* a29k-*-* sparc64-*-elf sh-*-* z8k-*-* arm-*-pe**-*
+// excess errors test - XFAIL hppa*-*-* a29k-*-* sparc64-*-elf z8k-*-* arm-*-pe
 
 #include <exception>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh34.C b/gcc/testsuite/g++.old-deja/g++.mike/eh34.C
index ca3d73b390c..37d552a6733 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh34.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh34.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <exception>
 #include <stdlib.h>
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh35.C b/gcc/testsuite/g++.old-deja/g++.mike/eh35.C
index d9bd34c58e6..9783c34bd0c 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh35.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh35.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 main() {
   try {  
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh36.C b/gcc/testsuite/g++.old-deja/g++.mike/eh36.C
index fbb639204a7..6a383a5f3ad 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh36.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh36.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <typeinfo>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh37.C b/gcc/testsuite/g++.old-deja/g++.mike/eh37.C
index 75f6523a3a8..0837a5e5573 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh37.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh37.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <typeinfo>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh38.C b/gcc/testsuite/g++.old-deja/g++.mike/eh38.C
index 915ef4c89e4..47d1d21cdca 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh38.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh38.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <typeinfo>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh39.C b/gcc/testsuite/g++.old-deja/g++.mike/eh39.C
index 54d10959a57..a6520278a16 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh39.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh39.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 int fail = 1;
 class B {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh40.C b/gcc/testsuite/g++.old-deja/g++.mike/eh40.C
index 16badc2d911..10a3525630b 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh40.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh40.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 int fail = 1;
 class B {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh41.C b/gcc/testsuite/g++.old-deja/g++.mike/eh41.C
index 4127402d09e..7c7b5bc5ce7 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh41.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh41.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 int fail = 0;
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh42.C b/gcc/testsuite/g++.old-deja/g++.mike/eh42.C
index 6da9bd51c96..f1167283942 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh42.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh42.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 struct none { int i[50]; };
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh44.C b/gcc/testsuite/g++.old-deja/g++.mike/eh44.C
index e612aeb793b..2935788e845 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh44.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh44.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 // prms-id: 9159
 
 static unsigned int iCounter = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh46.C b/gcc/testsuite/g++.old-deja/g++.mike/eh46.C
index e0e6553f7c7..dfce386d880 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh46.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh46.C
@@ -1,6 +1,6 @@
 // Build don't link:
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* arm-*-pe
 
 int atoi(const char *);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh47.C b/gcc/testsuite/g++.old-deja/g++.mike/eh47.C
index 043a6174a6f..5bb43de2a13 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh47.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh47.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <cstdlib>
 #include <exception>
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh48.C b/gcc/testsuite/g++.old-deja/g++.mike/eh48.C
index dd4e2a2a38f..c1ee85eca88 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh48.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh48.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <exception>
 #include <stdlib.h>
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh49.C b/gcc/testsuite/g++.old-deja/g++.mike/eh49.C
index 0505db168b2..34d30300177 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh49.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh49.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions -O9
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 void main1() {
   throw 1;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh5.C b/gcc/testsuite/g++.old-deja/g++.mike/eh5.C
index 3289d975d58..59472fd26e8 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh5.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh5.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 class foo {
 public:
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh50.C b/gcc/testsuite/g++.old-deja/g++.mike/eh50.C
index 0747e1032ef..84ccaddb9a9 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh50.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh50.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL hppa*-*-* a29k-*-* sparc64-*-elf sh-*-* z8k-*-* arm-*-pe**-*
+// excess errors test - XFAIL hppa*-*-* a29k-*-* sparc64-*-elf z8k-*-* arm-*-pe
 
 #include <exception>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh51.C b/gcc/testsuite/g++.old-deja/g++.mike/eh51.C
index ac7f620df42..9ebeb4e8221 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh51.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh51.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* z8k-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf z8k-*-* arm-*-pe
 
 #include <exception>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh53.C b/gcc/testsuite/g++.old-deja/g++.mike/eh53.C
index 7d47c6d1461..b81ca8d5b9a 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh53.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh53.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions -g
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 class zeroset {
 public:
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh55.C b/gcc/testsuite/g++.old-deja/g++.mike/eh55.C
index d61d033e97b..fbf8a831494 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh55.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh55.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 #include <exception>
 #include <stdlib.h>
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh6.C b/gcc/testsuite/g++.old-deja/g++.mike/eh6.C
index b9e7c8cc46c..db0c8e1f60e 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh6.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh6.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 extern "C" int printf(const char *, ...);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh7.C b/gcc/testsuite/g++.old-deja/g++.mike/eh7.C
index 3e2c75a67f2..dcd51ff0dec 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh7.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh7.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 main() {
   if (0)
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh8.C b/gcc/testsuite/g++.old-deja/g++.mike/eh8.C
index a9f7a902f2c..1636dd6695a 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh8.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh8.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 extern "C" int printf(const char *, ...);
 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/eh9.C b/gcc/testsuite/g++.old-deja/g++.mike/eh9.C
index febd1dc4b96..c80ce7528fb 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/eh9.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/eh9.C
@@ -1,4 +1,4 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 
 main() throw () { }
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p10416.C b/gcc/testsuite/g++.old-deja/g++.mike/p10416.C
index aa56b5ffc2a..2843f96653c 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p10416.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p10416.C
@@ -1,6 +1,6 @@
 // Build don't link:
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 // prms-id: 10416
 
 class not_ok {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p11667.C b/gcc/testsuite/g++.old-deja/g++.mike/p11667.C
index 89ab3132f47..ab89babcdf2 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p11667.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p11667.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 // prms-id: 11667
 
 extern "C" int printf(const char *,...);
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p7912.C b/gcc/testsuite/g++.old-deja/g++.mike/p7912.C
index 40f45c48c12..018b09b0465 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p7912.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p7912.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 // prms-id: 7912
 
 int count = 0;
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p9706.C b/gcc/testsuite/g++.old-deja/g++.mike/p9706.C
index 8b8739f50d1..d3906074783 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p9706.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p9706.C
@@ -1,5 +1,5 @@
 // Special g++ Options: -fexceptions
-// excess errors test - XFAIL a29k-*-* sparc64-*-elf sh-*-* arm-*-pe**-*
+// excess errors test - XFAIL a29k-*-* sparc64-*-elf arm-*-pe
 // prms-id: 9706
 
 #include <stdlib.h>
-- 
2.30.2