Merge from mainlinebefore_gc_merge_990902egcs_gc_branch

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/egcs_gc_branch@26036 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 8 insertions, 15 deletions

diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template18.C b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
index bcee653c64e..5a660df5982 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template18.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
@@ -1,16 +1,9 @@
-// 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
+// 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 "wa.h"
-#pragma interface		// ERROR - , XFAIL *-*-*
-template <class T> inline T min (T a, T b) { return a<b?a:b; }
-#line 3 "wa.C" 
-
-main()
-{
-  min (1, 1); 
-}// UNKNOWN "min"
+#line 1 "template18.h"
+#pragma interface
+#line 13 "template18.C"
+  min (1, 1); 		// should produce an undefined symbol error.
+}