diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index dafeb903c679d012af1aee3fd20d5e4176f58433..7fc56854f2040476d88b9fa675378382c54f85c1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,6 +1,17 @@
+2002-01-23  Zack Weinberg  <zack@codesourcery.com>
+
+	* g++.old-deja/g++.brendan/crash8.C: Don't expect an error on
+	line 12.
+	* g++.old-deja/g++.brendan/parse3.C,
+	g++.old-deja/g++.other/crash26.C,
+	g++.old-deja/g++.other/crash28.C,
+	g++.old-deja/g++.other/crash29.C,
+	g++.old-deja/g++.other/crash30.C,
+	g++.old-deja/g++.other/crash35.C: Remove XFAILs where appropriate.
+
 2002-01-23  Aldy Hernandez  <aldyh@redhat.com>
 
-        * gcc.dg/20020115-1.c: New.
+	* gcc.dg/20020115-1.c: New.
 
 2002-01-23  Bob Wilson  <bob.wilson@acm.org>
 
@@ -84,7 +95,7 @@
 
 2002-01-18  Aldy Hernandez  <aldyh@redhat.com>
 
-        * gcc.dg/20020118-1.c: New.
+	* gcc.dg/20020118-1.c: New.
 
 2002-01-18  Kazu Hirata  <kazu@hxi.com>
 
@@ -92,11 +103,10 @@
 
 2001-01-18  David Billinghurst <David.Billinghurst@riotinto.com>
 
-	* g++.dg/other/deprecated.C: Fix FAIL from 
+	* g++.dg/other/deprecated.C: Fix FAIL from
 	"At global scope" message
-	* g++.dg/ext/align1.C: Fix fail on cygwin from maximum 
-	alignment warnings
-
+	* g++.dg/ext/align1.C: Fix fail on cygwin from maximum
+	alignment warnings.
 
 2001-01-18  David Billinghurst <David.Billinghurst@riotinto.com>
 
@@ -142,8 +152,8 @@
 
 2001-01-14  David Billinghurst <David.Billinghurst@riotinto.com>
 
-        * g77.f-torture/execute/intrinsic-unix-bessel.f:
-        Uncomment additional cases that now pass.
+	* g77.f-torture/execute/intrinsic-unix-bessel.f:
+	Uncomment additional cases that now pass.
 
 2002-01-11  Richard Henderson  <rth@redhat.com>
 
@@ -156,8 +166,8 @@ Fri Jan 11 12:13:30 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 2002-01-10  Aldy Hernandez  <aldyh@redhat.com>
 
-        * gcc.dg/altivec-4.c: Add tests for lvebx, lvehx, lvewx, lvxl,
-        lvx, stvx, stvebx, stvehx, stvewx, stvxl.
+	* gcc.dg/altivec-4.c: Add tests for lvebx, lvehx, lvewx, lvxl,
+	lvx, stvx, stvebx, stvehx, stvewx, stvxl.
 
 2002-01-10  Dale Johannesen  <dalej@apple.com>
 
@@ -165,7 +175,7 @@ Fri Jan 11 12:13:30 2002  Nicola Pero  <n.pero@mi.flashnet.it>
 
 2002-01-08  Aldy Hernandez  <aldyh@redhat.com>
 
-        * gcc.dg/altivec-4.c: Add test for mtvscr, dssall, mfvscr,
+	* gcc.dg/altivec-4.c: Add test for mtvscr, dssall, mfvscr,
 	dss, lvsl, lvsr, dstt, dstst, dststt, dst.
 
 2002-01-09  Richard Henderson  <rth@redhat.com>
@@ -230,7 +240,7 @@ Wed Jan  9 14:03:20 2002  Jeffrey A Law  (law@redhat.com)
 
 002-01-07  Aldy Hernandez  <aldyh@redhat.com>
 
-        * gcc.dg/altivec-4.c: Test altivec predicates.
+	* gcc.dg/altivec-4.c: Test altivec predicates.
 
 2002-01-07  Jakub Jelinek  <jakub@redhat.com>
 
@@ -247,10 +257,10 @@ Wed Jan  9 14:03:20 2002  Jeffrey A Law  (law@redhat.com)
 
 2002-01-04  Loren J. Rittle  <ljrittle@acm.org>
 
-        * g++.old-deja/g++.abi/aggregates.C: Corrected last patch: removed
+	* g++.old-deja/g++.abi/aggregates.C: Corrected last patch: removed
 	extra triple that slipped in.
-        * g++.old-deja/g++.abi/align.C: Likewise.
-        * g++.old-deja/g++.abi/bitfields.C: Likewise.
+	* g++.old-deja/g++.abi/align.C: Likewise.
+	* g++.old-deja/g++.abi/bitfields.C: Likewise.
 
 2002-01-04  Loren J. Rittle  <ljrittle@acm.org>
 
@@ -425,9 +435,9 @@ Wed Jan  9 14:03:20 2002  Jeffrey A Law  (law@redhat.com)
 2001-12-20  Nick Clifton  <nickc@cambridge.redhat.com>
 
 	* gcc.misc-test/arm-isr.exp: New file.  Control running of the
-        arm-isr.c test.
-        * gcc.misc-tests/arm-isr.c: New file.  Test prologue and
-        epilogue generation for ARM ISR routines.
+	arm-isr.c test.
+	* gcc.misc-tests/arm-isr.c: New file.  Test prologue and
+	epilogue generation for ARM ISR routines.
 
 2001-12-20  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash8.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash8.C
index 46cc16fa18c0ac5495bb6a55a3ea7cfbe3dc78b4..2c4a91d74981598c470660c9558be6fb879d996b 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/crash8.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash8.C
@@ -8,5 +8,5 @@ class Elvis
 template<int a>
 class Elvis<0>
 { // ERROR - incorrect number of parameters
-   int geta() { return a ; }
+  int geta() { return a ; } // ERROR - not in a class
 } ;
diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/parse3.C b/gcc/testsuite/g++.old-deja/g++.brendan/parse3.C
index 9b5991d394dd1a62e0bcf7a6001b957a74dcaf17..8941356e061fea8686cf813b9183e9a41ae3676d 100644
--- a/gcc/testsuite/g++.old-deja/g++.brendan/parse3.C
+++ b/gcc/testsuite/g++.old-deja/g++.brendan/parse3.C
@@ -1,5 +1,5 @@
 // Build don't link: 
-// crash test - XFAIL *-*-*
+// crash test
 
 // these are marked as expected errors because they evidence an
 // ambiguity in the grammar between expressions and declarations.
@@ -20,4 +20,4 @@ A A::operator+(const A in)
       return A();    // this works
     else
       return (A());  // this works not // gets bogus error - XFAIL *-*-* 
-} // gets bogus error - XFAIL *-*-* 
+}
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash26.C b/gcc/testsuite/g++.old-deja/g++.other/crash26.C
index e7389fb40bb053144116718215703e00f0197476..c3e290f3b220e14abafca645a5072e2ac7be66cc 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash26.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash26.C
@@ -1,8 +1,6 @@
 // Build don't link:
 // Origin: Jakub Jelinek <jakub@redhat.com>
 
-// excess errors test - XFAIL *-*-*
-
 class foo {
 public:
   foo(int);
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash28.C b/gcc/testsuite/g++.old-deja/g++.other/crash28.C
index 79a6706cd583f08088c8a8ad0147edf4feffd9f1..94c977ab6a03fd08f4c5a709dd6b4704afbb0cba 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash28.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash28.C
@@ -1,8 +1,6 @@
 // Build don't link:
 // Origin: Jakub Jelinek <jakub@redhat.com>
 
-// excess errors test - XFAIL *-*-*
-
 namespace N
 {
   class X;
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash29.C b/gcc/testsuite/g++.old-deja/g++.other/crash29.C
index a6fc743015a5b3ae8262e51a0a8b97f1f01ed95d..859cd490f2ab19e0765e4607aca8dad597689c60 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash29.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash29.C
@@ -1,8 +1,6 @@
 // Build don't link:
 // Origin: Jakub Jelinek <jakub@redhat.com>
 
-// crash test - XFAIL *-*-*
-
 class bar
 {
 public:
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash30.C b/gcc/testsuite/g++.old-deja/g++.other/crash30.C
index 7d924d5129191427c5fd4aa8cb5b194be1b7d70d..acd45bb1f2e65fecaa8637bfb01f8df272847152 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash30.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash30.C
@@ -1,8 +1,6 @@
 // Build don't link:
 // Origin: Jakub Jelinek <jakub@redhat.com>
 
-// excess errors test - XFAIL *-*-*
-
 struct foo
 {
   foo();
diff --git a/gcc/testsuite/g++.old-deja/g++.other/crash35.C b/gcc/testsuite/g++.old-deja/g++.other/crash35.C
index 8e9f23ea2b6e9357bff477657bae24b7d891f1f2..1582daee281536a6a9bf1bfa8d4caabdeb4c1b56 100644
--- a/gcc/testsuite/g++.old-deja/g++.other/crash35.C
+++ b/gcc/testsuite/g++.old-deja/g++.other/crash35.C
@@ -1,8 +1,6 @@
 // Build don't link:
 // Origin: Jakub Jelinek <jakub@redhat.com>
 
-// excess errors test - XFAIL *-*-*
-
 void foo()
 {
   if [		// ERROR - parse error