diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ca6d0b2c1d1..00722ab0510 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-20  Jason Merrill  <jason@redhat.com>
+
+	* lib/prune.exp (prune_gcc_output): Ignore Cygwin warning about
+	ignoring -fpic.
+	* lib/old-dejagnu.exp (old-dejagnu): Also pass compiler output
+	through prune_gcc_output.
+
 2002-03-20  Jakub Jelinek  <jakub@redhat.com>
 
 	* gcc.c-torture/compile/20020320-1.c: New test.
diff --git a/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C b/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C
index 18d5a579c88..f3149d1caa7 100644
--- a/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C
+++ b/gcc/testsuite/g++.old-deja/g++.ext/instantiate3.C
@@ -10,7 +10,7 @@ template <class T> struct A {
 inline template struct A<int>;
 
 A<int> a;			// gets bogus error
-A<char> b;			// ERROR - not instantiated XFAIL mips*-*-* *-*-hpux*
+A<char> b;			// ERROR - not instantiated XFAIL mips*-*-* *-*-hpux* i?86-pc-cygwin
 				// Irix's default linker does not
 				// produce line numbers so XFAIL it.
 				// Similarly for HPUX.
diff --git a/gcc/testsuite/g++.old-deja/g++.jason/template18.C b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
index fa004d2c9ab..e57739baba9 100644
--- a/gcc/testsuite/g++.old-deja/g++.jason/template18.C
+++ b/gcc/testsuite/g++.old-deja/g++.jason/template18.C
@@ -4,6 +4,10 @@
 
 // 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.
+
+// Suppressed-instantiation tests like this are known to break on
+// Cygwin, because of the MULTIPLE_SYMBOL_SPACES stuff.  This is OK.
+
 // (OK) excess errors test - XFAIL *-*-*
 
 #pragma implementation "irrelevant_file"
diff --git a/gcc/testsuite/lib/old-dejagnu.exp b/gcc/testsuite/lib/old-dejagnu.exp
index 105c37d5605..2e2acff2bd4 100644
--- a/gcc/testsuite/lib/old-dejagnu.exp
+++ b/gcc/testsuite/lib/old-dejagnu.exp
@@ -443,7 +443,7 @@ proc old-dejagnu { compiler prog name cflagsx default_cflags libs } {
     }
 
     # Delete things like "ld.so: warning" messages.
-    set comp_output [prune_warnings $comp_output]
+    set comp_output [prune_gcc_output [prune_warnings $comp_output]]
 
     if [regexp "Internal (compiler )?error" $comp_output] then {
         if $expect_crash then {
diff --git a/gcc/testsuite/lib/prune.exp b/gcc/testsuite/lib/prune.exp
index 2752634bc33..38b24e0ca42 100644
--- a/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@ -24,6 +24,9 @@ proc prune_gcc_output { text } {
     regsub -all "(^|\n)collect2: ld returned \[^\n\]*" $text "" text
     regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text
 
+    # Ignore harmless -fpic warnings on cygwin.
+    regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target\[^\n\]*" $text "" text
+
     # It would be nice to avoid passing anything to gcc that would cause it to
     # issue these messages (since ignoring them seems like a hack on our part),
     # but that's too difficult in the general case.  For example, sometimes