diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 1ef7e2c31b3..ae69e5d19cb 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-20  Michael Chastain  <mec@shout.net>
+
+	* gdb.c++/virtfunc.exp (test_virtual_calls): Remove obsolete calls
+	to setup_xfail.  Document some of the remaining calls.
+
 2002-02-18  Michael Chastain  <mec@shout.net>
 
 	* gdb.c++/userdef.exp: Update copyright year.
diff --git a/gdb/testsuite/gdb.c++/virtfunc.exp b/gdb/testsuite/gdb.c++/virtfunc.exp
index 0288301d511..e2befd35a98 100644
--- a/gdb/testsuite/gdb.c++/virtfunc.exp
+++ b/gdb/testsuite/gdb.c++/virtfunc.exp
@@ -743,12 +743,6 @@ proc test_virtual_calls {} {
 	return 0
     }
 
-    # FIXME: In fall 1998, GCC's virtual function type info was changed,
-    # which causes GDB to be unable to resolve these calls.  Until the
-    # problem is fixed, XFAIL these tests. -sts 1999-08-02
-
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pAe->f()\n"
     gdb_expect {
 	-re ".* = 20$nl$gdb_prompt $" { pass "print pAe->f()" }
@@ -770,8 +764,6 @@ proc test_virtual_calls {} {
 	eof { fail "print pAe->f() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pAa->f()\n"
     gdb_expect {
 	-re ".* = 1$nl$gdb_prompt $" { pass "print pAa->f()" }
@@ -784,8 +776,6 @@ proc test_virtual_calls {} {
 	eof { fail "print pAa->f() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pDe->vg()\n"
     gdb_expect {
 	-re ".* = 202$nl$gdb_prompt $" { pass "print pDe->vg()" }
@@ -798,8 +788,6 @@ proc test_virtual_calls {} {
 	eof { fail "print pDe->vg() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pADe->vg()\n"
     gdb_expect {
 	-re ".* = 202$nl$gdb_prompt $" { pass "print pADe->vg()" }
@@ -812,8 +800,6 @@ proc test_virtual_calls {} {
 	eof { fail "print pADe->vg() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pDd->vg()\n"
     gdb_expect {
 	-re ".* = 101$nl$gdb_prompt $" { pass "print pDd->vg()" }
@@ -826,8 +812,6 @@ proc test_virtual_calls {} {
 	eof { fail "print pDd->vg() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pEe->vvb()\n"
     gdb_expect {
 	-re ".* = 411$nl$gdb_prompt $" { pass "print pEe->vvb()" }
@@ -840,8 +824,6 @@ proc test_virtual_calls {} {
 	eof { fail "print pEe->vvb() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pVB->vvb()\n"
     gdb_expect {
 	-re ".* = 407$nl$gdb_prompt $" { pass "print pVB->vvb()" }
@@ -854,6 +836,10 @@ proc test_virtual_calls {} {
 	eof { fail "print pVB->vvb() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=2.95.3, goption=-gdwarf-2.
+    # -- chastain 2002-02-20
+
     if {$gcc_compiled} then { setup_xfail "*-*-*" }
 
     send_gdb "print pBe->vvb()\n"
@@ -868,8 +854,6 @@ proc test_virtual_calls {} {
 	eof { fail "print pBe->vvb() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pDe->vvb()\n"
     gdb_expect {
 	-re ".* = 411$nl$gdb_prompt $" { pass "print pDe->vvb()" }
@@ -882,8 +866,6 @@ proc test_virtual_calls {} {
 	eof { fail "print pDe->vvb() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pEe->vd()\n"
     gdb_expect {
 	-re ".* = 282$nl$gdb_prompt $" { pass "print pEe->vd()" }
@@ -896,8 +878,6 @@ proc test_virtual_calls {} {
 	eof { fail "print pEe->vd() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-
     send_gdb "print pEe->fvb()\n"
     gdb_expect {
 	-re ".* = 311$nl$gdb_prompt $" { pass "print pEe->fvb()" }
@@ -910,6 +890,38 @@ proc test_virtual_calls {} {
 	eof { fail "print pEe->fvb() ($GDB dumped core) (FIXME)" ; gdb_virtfunc_restart; return }
     }
 
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=2.95.3, goption=-gdwarf-2.
+    #
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=2.95.3, goption=-gstabs+.
+    #
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=3.0.3, goption=-gdwarf-2.
+    #
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=3.0.3, goption=-gstabs+.
+    #
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=3.0.4-20020215, goption=-gdwarf-2.
+    #
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=3.0.4-20020215, goption=-gstabs+.
+    #
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=gcc-3_0-branch%2002-02-16, goption=-gdwarf-2.
+    #
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=gcc-3_0-branch%2002-02-16, goption=-gstabs+.
+    #
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=HEAD%2002-02-16, goption=-gdwarf-2.
+    #
+    # fails on target=native, host=i686-pc-linux-gnu%rh-7.2,
+    # gdb=HEAD%2002-02-16, gcc=HEAD%2002-02-16, goption=-gstabs+.
+    #
+    # -- chastain 2002-02-20
+
     if {$gcc_compiled} then { setup_xfail "*-*-*" }
 
     send_gdb "print pEe->D::vg()\n"