From 9ad9a39e3b94faa221394f97b0679c4a2be5a0fc Mon Sep 17 00:00:00 2001
From: jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 17 Nov 1998 12:41:47 +0000
Subject: [PATCH] update

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23685 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/testsuite/g++.old-deja/g++.eh/throw2.C        |  2 +-
 gcc/testsuite/g++.old-deja/g++.ext/arrnew2.C      |  2 +-
 gcc/testsuite/g++.old-deja/g++.jason/new.C        |  2 +-
 gcc/testsuite/g++.old-deja/g++.jason/template18.C |  7 ++++---
 gcc/testsuite/g++.old-deja/g++.other/dcast2.C     |  2 +-
 gcc/testsuite/g++.old-deja/g++.other/init9.C      | 12 ++++++------
 gcc/testsuite/g++.old-deja/g++.other/rttid4.C     | 12 ++++++------
 7 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/gcc/testsuite/g++.old-deja/g++.eh/throw2.C b/gcc/testsuite/g++.old-deja/g++.eh/throw2.C
index 29b8932..fbf0cec 100644
--- a/gcc/testsuite/g++.old-deja/g++.eh/throw2.C
+++ b/gcc/testsuite/g++.old-deja/g++.eh/throw2.C
@@ -6,7 +6,7 @@
 
 void athrow(const ANY & e) throw(ANY)
 {
-   throw e; // gets bogus error - discarding const - XFAIL *-*-*
+   throw e; // gets bogus error - discarding const
 }
 
 int main(void)
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/arrnew2.C b/gcc/testsuite/g++.old-deja/g++.ext/arrnew2.C
index f44ffa9..e572081 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/arrnew2.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/arrnew2.C
@@ -1,4 +1,4 @@
 // Build don't link:
 // Special g++ Options:
 
-int *foo = new int[1](0); // gets bogus error - XFAIL *-*-*
+int *foo = new int[1](0); // gets bogus error - 
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/new.C b/gcc/testsuite/g++.old-deja/g++.jason/new.C
index 0ac2562..89ec808 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/new.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/new.C
@@ -19,7 +19,7 @@ main()
 
   float f = 3;
   int* b1 = new int[(int)f];
-  int* b2 = new int[f];
+  int* b2 = new int[f];		// ERROR - new requires integral size
 
   return s;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template18.C b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
index 622e8ac..b95303f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template18.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
@@ -2,8 +2,9 @@
 // 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 *-*-*
+// We mark this XFAIL because we can't test for expected linker errors.
+// If we get an XPASS for this testcase, that's a bug.
+// (OK) excess errors test - XFAIL *-*-*
 
 #pragma implementation "irrelevant_file"
 #line 1 "template18.h"
@@ -13,5 +14,5 @@ template <class T> inline T min (T a, T b) { return a<b?a:b; }
 
 main()
 {
-  min (1, 1); 		// ERROR - undefined
+  min (1, 1); 		// should produce an undefined symbol error.
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.other/dcast2.C b/gcc/testsuite/g++.old-deja/g++.other/dcast2.C
index e1bd1c1..bd343a7 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/dcast2.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/dcast2.C
@@ -11,7 +11,7 @@ struct D : public B {
 
 void foo() {
   B x;
-  dynamic_cast<D*>(&x); // gets bogus error - XFAIL *-*-*
+  dynamic_cast<D*>(&x); // WARNING - will never succeed
   B* p = &x;
   dynamic_cast<D*>(p);
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.other/init9.C b/gcc/testsuite/g++.old-deja/g++.other/init9.C
index c9ea3a5..5626174 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/init9.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/init9.C
@@ -24,17 +24,17 @@ struct X {
 };
 
 void b() {
-  goto bar; // ERROR - jump from here - XFAIL *-*-*
-  X x; // ERROR - jump crosses initialization - XFAIL *-*-*
- bar: // ERROR - jump to here - XFAIL *-*-*
+  goto bar; // ERROR - jump from here
+  X x; // ERROR - jump crosses initialization
+ bar: // ERROR - jump to here
   ;
 }
 
 #include <vector>
 
 void c() {
-  goto bar; // ERROR - jump from here - XFAIL *-*-*
-  vector<int> x; // ERROR - jump crosses initialization - XFAIL *-*-*
- bar: // ERROR - jump to here - XFAIL *-*-*
+  goto bar; // ERROR - jump from here
+  vector<int> x; // ERROR - jump crosses initialization
+ bar: // ERROR - jump to here
   ;
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.other/rttid4.C b/gcc/testsuite/g++.old-deja/g++.other/rttid4.C
index 72100b7..0b72bae 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/rttid4.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/rttid4.C
@@ -1,7 +1,7 @@
 // test of rtti of single inheritance and multiple inheritance with 
 // virtual inheritance
 // dynamic casting
-// Special g++ Options: -frtti -w
+// Special g++ Options: -w
 
 #include <typeinfo>
 
@@ -95,11 +95,12 @@ int main ()
   vp = dynamic_cast<D *> (dp);
   if (vp != (void *)dp) error(21);
 
-  vp = dynamic_cast<B *> (dp);
-  if (vp == (void *)dp) error(21);
+  // Ill-formed: dynamic_cast to private or ambiguous base
+  //   vp = dynamic_cast<B *> (dp);
+  //   if (vp == (void *)dp) error(21);
 
-  vp = dynamic_cast<B *> (fp);
-  if (vp == (void *)bbp) error(22);
+  //   vp = dynamic_cast<B *> (fp);
+  //   if (vp == (void *)bbp) error(22);
 
   vp = dynamic_cast<void *> (aap);
   if (vp != (void *)fp) error(23);
@@ -108,4 +109,3 @@ int main ()
   if (vp == (void *)bbp) error(24);
 
 }
-
-- 
2.7.4