update

From-SVN: r23336

4 files changed, 11 insertions, 10 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.jason/access7.C b/gcc/testsuite/g++.old-deja/g++.jason/access7.C
index 708fa0f..a1e908f 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/access7.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/access7.C
@@ -9,5 +9,5 @@ class A {
 class B: public A {};
 class C: public A {};
 class D: public C, public B {
-  void g () { A::f(); }		// gets bogus error - wrongly ambiguous static member call, XFAIL *-*-*
+  void g () { A::f(); }		// gets bogus error - wrongly ambiguous static member call
 };
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/pmf2.C b/gcc/testsuite/g++.old-deja/g++.jason/pmf2.C
index c3decc2..7ebb23b 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/pmf2.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/pmf2.C
@@ -9,5 +9,5 @@ struct A {
 void g (void (A::*)());
 
 void h () {
-  g (A::f);			// ERROR - failed conversion to method pointer XFAIL *-*-*
+  g (A::f);			// ERROR - failed conversion to method pointer
 }
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template18.C b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
index bcee653..caa5817 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template18.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
@@ -1,16 +1,14 @@
-// Build don't link: 
-// Special g++ Options: -g -fexternal-templates
 // GROUPS passed templates
 // Bug: g++ emits template instances when it shouldn't.
 // Special g++ Options: -g -fexternal-templates
 
 #pragma implementation "irrelevant_file"
-#line 1 "wa.h"
-#pragma interface		// ERROR - , XFAIL *-*-*
+#line 1 "template18.h"
+#pragma interface
 template <class T> inline T min (T a, T b) { return a<b?a:b; }
-#line 3 "wa.C" 
+#line 12 "template18.C" 
 
 main()
 {
-  min (1, 1); 
-}// UNKNOWN "min"
+  min (1, 1); 		// ERROR - undefined
+}
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/thunk3.C b/gcc/testsuite/g++.old-deja/g++.jason/thunk3.C
index 6b309dd..adc6805 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/thunk3.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/thunk3.C
@@ -1,4 +1,7 @@
-// Test that function calls using thunks work right.
+// Test that variadic function calls using thunks work right.
+// Note that this will break on any target that uses the generic thunk
+//  support, because it doesn't support variadic functions.
+
 // Special g++ Options: -fvtable-thunks
 // excess errors test - XFAIL mips*-*-* alpha*-*-* rs6000-*-* powerpc-*-eabi m68k-*-coff m68k-motorola-sysv m88k-motorola-sysv3