From a28e148a865f17a858cd8aa7acbbe1390896e6dd Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@gcc.gnu.org>
Date: Sun, 25 Oct 1998 21:03:08 -0500
Subject: [PATCH] up

From-SVN: r23341
---
 gcc/testsuite/g++.old-deja/g++.jason/template18.C | 5 ++++-
 gcc/testsuite/g++.old-deja/g++.mike/p6058.C       | 2 +-
 gcc/testsuite/g++.old-deja/g++.mike/virt4.C       | 2 ++
 gcc/testsuite/g++.old-deja/g++.other/delete2.C    | 4 ++--
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template18.C b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
index caa5817badc..622e8ac7730 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template18.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
@@ -2,11 +2,14 @@
 // Bug: g++ emits template instances when it shouldn't.
 // Special g++ Options: -g -fexternal-templates
 
+// We mark this XFAIL for the 'collect2: ld returned 1 exit status' message.
+// excess errors test - XFAIL *-*-*
+
 #pragma implementation "irrelevant_file"
 #line 1 "template18.h"
 #pragma interface
 template <class T> inline T min (T a, T b) { return a<b?a:b; }
-#line 12 "template18.C" 
+#line 13 "template18.C"
 
 main()
 {
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p6058.C b/gcc/testsuite/g++.old-deja/g++.mike/p6058.C
index aa78b7ff63d..1c0c6224ebc 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/p6058.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/p6058.C
@@ -4,7 +4,7 @@
 
 void bar(struct s1 { } a) { (void)a; }			// ERROR - 
 
-struct s2*fooey()					// ERROR - XFAIL *-*-*
+struct s2*fooey()
 {
   try {
     static_cast<struct s3 { } *>(0);			// ERROR - 
diff --git a/gcc/testsuite/g++.old-deja/g++.mike/virt4.C b/gcc/testsuite/g++.old-deja/g++.mike/virt4.C
index 989701833b6..9750af6b0b5 100644
--- a/gcc/testsuite/g++.old-deja/g++.mike/virt4.C
+++ b/gcc/testsuite/g++.old-deja/g++.mike/virt4.C
@@ -1,3 +1,5 @@
+// Special g++ Options:
+
 void  Foo () {}
 
 class B {
diff --git a/gcc/testsuite/g++.old-deja/g++.other/delete2.C b/gcc/testsuite/g++.old-deja/g++.other/delete2.C
index 09362f6895f..d90def03a3f 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/delete2.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/delete2.C
@@ -5,8 +5,8 @@ struct foo {
 };
 
 void bar(foo a) {
-  delete a; // should be accepted - XFAIL *-*-*
-  delete[] a; // should be accepted - XFAIL *-*-*
+  delete a; // should be accepted
+  delete[] a; // should be accepted
   char b[1];
   delete b; // ERROR - expecting pointer type
   delete[] b; // ERROR - expecting pointer type
-- 
2.30.2