Fix PR gdb/66.

* gdb.base/structs.exp: Replace skip for a29k with skip for
gdb,cannot_call_functions.
* gdb.base/call-ar-st.exp: Remove references to a29k in comments.
* gdb.base/callfuncs.exp: Ditto.
* gdb.base/call-rt-st.exp: Ditto.
* gdb.base/call-strs.exp: Ditto.
* gdb.base/callfwmall.exp: Ditto.
* gdb.base/scope.exp: Obsolete xfail a29k.
* gdb.c++/misc.exp: Ditto.
* gdb.c++/cplusfuncs.exp: Ditto.
* gdb.base/ptype.exp: Ditto.
* gdb.base/printcmds.exp: Ditto.
* gdb.base/opaque.exp: Ditto.
* gdb.base/list.exp: Ditto.
* gdb.base/funcargs.exp: Ditto.
* gdb.base/default.exp: Ditto.

17 files changed, 158 insertions, 120 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 36a25f17e1..068a97a1f1 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,23 @@
+2002-01-06  Andrew Cagney  <ac131313@redhat.com>
+
+	Fix PR gdb/66.
+	* gdb.base/structs.exp: Replace skip for a29k with skip for
+	gdb,cannot_call_functions.
+	* gdb.base/call-ar-st.exp: Remove references to a29k in comments.
+	* gdb.base/callfuncs.exp: Ditto.
+	* gdb.base/call-rt-st.exp: Ditto.
+	* gdb.base/call-strs.exp: Ditto.
+	* gdb.base/callfwmall.exp: Ditto.
+	* gdb.base/scope.exp: Obsolete xfail a29k.
+	* gdb.c++/misc.exp: Ditto.
+	* gdb.c++/cplusfuncs.exp: Ditto.
+	* gdb.base/ptype.exp: Ditto.
+	* gdb.base/printcmds.exp: Ditto.
+	* gdb.base/opaque.exp: Ditto.
+	* gdb.base/list.exp: Ditto.
+	* gdb.base/funcargs.exp: Ditto.
+	* gdb.base/default.exp: Ditto.
+
 2002-01-04  Michael Snyder  <msnyder@redhat.com>
 
 	* gdb.base/info-proc.exp: New file, test for "info proc" cmd.
diff --git a/gdb/testsuite/gdb.base/call-ar-st.exp b/gdb/testsuite/gdb.base/call-ar-st.exp
index 52d5a6e055..d9bb350f8d 100644
--- a/gdb/testsuite/gdb.base/call-ar-st.exp
+++ b/gdb/testsuite/gdb.base/call-ar-st.exp
@@ -49,7 +49,8 @@ if [get_compiler_info ${binfile}] {
     return -1;
 }
 
-# The a29k can't call functions, so don't even bother with this test.
+# Some targets can't call functions, so don't even bother with this
+# test.
 if [target_info exists gdb,cannot_call_functions] {
     setup_xfail "*-*-*" 2416
     fail "This target can not call functions"
diff --git a/gdb/testsuite/gdb.base/call-rt-st.exp b/gdb/testsuite/gdb.base/call-rt-st.exp
index 688e698b45..033b5ef73d 100644
--- a/gdb/testsuite/gdb.base/call-rt-st.exp
+++ b/gdb/testsuite/gdb.base/call-rt-st.exp
@@ -54,7 +54,8 @@ if [get_compiler_info ${binfile}] {
     return -1;
 }
 
-# The a29k can't call functions, so don't even bother with this test.
+# Some targets can't do function calls, so don't even bother with this
+# test.
 if [target_info exists gdb,cannot_call_functions] {
     setup_xfail "*-*-*" 2416
     fail "This target can not call functions"
diff --git a/gdb/testsuite/gdb.base/call-strs.exp b/gdb/testsuite/gdb.base/call-strs.exp
index ee07f3be6c..63fc27427f 100644
--- a/gdb/testsuite/gdb.base/call-strs.exp
+++ b/gdb/testsuite/gdb.base/call-strs.exp
@@ -48,7 +48,8 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
 
 
 
-# The a29k can't call functions, so don't even bother with this test.
+# Some targets can't call functions, so don't even bother with this
+# test.
 if [target_info exists gdb,cannot_call_functions] {
     setup_xfail "*-*-*" 2416
     fail "This target can not call functions"
diff --git a/gdb/testsuite/gdb.base/callfuncs.exp b/gdb/testsuite/gdb.base/callfuncs.exp
index 2d301d4083..90f83434f4 100644
--- a/gdb/testsuite/gdb.base/callfuncs.exp
+++ b/gdb/testsuite/gdb.base/callfuncs.exp
@@ -49,7 +49,8 @@ if {$hp_aCC_compiler} {
     set prototypes 0
 }
 
-# The a29k can't call functions, so don't even bother with this test.
+# Some targets can't do function calls, so don't even bother with this
+# test.
 if [target_info exists gdb,cannot_call_functions] {
     setup_xfail "*-*-*" 2416
     fail "This target can not call functions"
diff --git a/gdb/testsuite/gdb.base/callfwmall.exp b/gdb/testsuite/gdb.base/callfwmall.exp
index 55bd4c6d74..7b8669366f 100644
--- a/gdb/testsuite/gdb.base/callfwmall.exp
+++ b/gdb/testsuite/gdb.base/callfwmall.exp
@@ -53,7 +53,8 @@ if {$hp_aCC_compiler} {
 }
 
 
-# The a29k can't call functions, so don't even bother with this test.
+# Some targets can't call functions, so don't even bother with this
+# test.
 if [target_info exists gdb,cannot_call_functions] {
     setup_xfail "*-*-*" 2416
     fail "This target can not call functions"
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index 031b3a9416..f5956ef2c1 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -53,11 +53,11 @@ gdb_expect {
     timeout { fail "(timeout) attach" }
 }
 
-# FIXME: attach kills the udi connection
-if { [istarget "a29k-*-udi"] } {
-    gdb_exit
-    gdb_start
-}
+# OBSOLETE # FIXME: attach kills the udi connection
+# OBSOLETE if { [istarget "a29k-*-udi"] } {
+# OBSOLETE     gdb_exit
+# OBSOLETE     gdb_start
+# OBSOLETE }
 
 if ![target_info exists use_gdb_stub] {
     gdb_test "break" "No default breakpoint address now." "break"
@@ -66,7 +66,8 @@ if ![target_info exists use_gdb_stub] {
     }
 
     
-    setup_xfail "mips-idt-*" "a29k-*-udi"
+    setup_xfail "mips-idt-*"
+    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_test "backtrace" "No stack."
 
     # ba and bac are no longer unique command prefixes. So these tests
@@ -74,7 +75,8 @@ if ![target_info exists use_gdb_stub] {
     # GDB needs to be fixed to map unique alias here for ba bac.
     #
     foreach i "bt ba bac" {
-	setup_xfail "mips-idt-*" "a29k-*-udi"
+	setup_xfail "mips-idt-*"
+	# OBSOLETE setup_xfail "a29k-*-udi"
 	gdb_test $i "No stack." "backtrace \"$i\" abbreviation"
     }
 } else {
@@ -83,17 +85,17 @@ if ![target_info exists use_gdb_stub] {
 
 # This works on the MIPS IDT board, but confuses future tests.
 if ![istarget "mips-idt-*"] then {
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_test "continue" "The program is not being run." "continue"
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_test "c" "The program is not being run." "continue \"c\" abbreviation"
 }
 
-# FIXME: continue kills the udi connection
-if [istarget "a29k-*-udi"] then {
-    gdb_exit
-    gdb_start
-}
+# OBSOLETE # FIXME: continue kills the udi connection
+# OBSOLETE if [istarget "a29k-*-udi"] then {
+# OBSOLETE     gdb_exit
+# OBSOLETE     gdb_start
+# OBSOLETE }
 
 #test call
 gdb_test "call" "The history is empty..*" "call"
@@ -142,11 +144,11 @@ gdb_expect {
 #test detach
 gdb_test "detach" "" "detach"
 
-# FIXME: continue kills the udi connection
-if [istarget "a29k-*-udi"] then {
-    gdb_exit
-    gdb_start
-}
+# OBSOLETE # FIXME: continue kills the udi connection
+# OBSOLETE if [istarget "a29k-*-udi"] then {
+# OBSOLETE     gdb_exit
+# OBSOLETE     gdb_start
+# OBSOLETE }
 if [istarget "h8300-*-hms"] then {
     gdb_exit
     gdb_start
@@ -224,13 +226,13 @@ gdb_expect {
 }
 
 #test frame "f" abbreviation
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "f" "No stack." "frame \"f\" abbreviation"
 #test frame
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "frame" "No stack." "frame"
 #test fg
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "fg" "The program is not being run." "fg"
 # FIXME: fg kills the udi connection
 #test file
@@ -251,7 +253,7 @@ gdb_expect {
 }
 
 #test finish
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "finish" "The program is not running." "finish"
 #test forward-search
 # The message here comes from the regexp library, not gdb, and so can
@@ -272,7 +274,7 @@ gdb_test "ignore" "Argument required .a breakpoint number.*" "ignore"
 #test info address
 gdb_test "info address" "Argument required." "info address"
 #test info all-registers
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "info all-registers" "The program has no registers now." "info all-registers"
 #test info args
 gdb_test "info args" "No frame selected." "info args"
@@ -315,16 +317,16 @@ gdb_test "info functions" "All defined functions:" "info functions"
 #test info locals
 gdb_test "info locals" "No frame selected." "info locals"
 #test info program
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "info program" "The program being debugged is not being run." "info program"
 #test info registers
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "info registers" "The program has no registers now." "info registers"
 #test info stack "s" abbreviation
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "info s" "No stack." "info stack \"s\" abbreviation"
 #test info stack
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "info stack" "No stack." "info stack"
 #test info set
 # FIXME -- needs to match the entire output
@@ -351,7 +353,7 @@ gdb_test "info watchpoints" "No breakpoints or watchpoints." "info watchpoints"
 #test inspect
 gdb_test "inspect" "The history is empty." "inspect"
 #test jump
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "jump" "The program is not being run." "jump"
 #test kill
 gdb_test "kill" "The program is not being run." "kill"
@@ -365,16 +367,16 @@ gdb_test "list" "No symbol table is loaded.  Use the \"file\" command.*" "list"
 # to deduce the filename from the exec file.
 gdb_test "load" "You can't do that when your target is `None'.*|The load command takes a file name.*|Must specify at least a file name with the load command.*|.*Use the .file. or .exec-file. command.*" "load"
 #test next "n" abbreviation
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "n" "The program is not being run." "next \"n\" abbreviation"
 #test next
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "next" "The program is not being run." "next"
 #test nexti "ni" abbreviation
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "ni" "The program is not being run." "nexti \"ni\" abbreviation"
 #test nexti
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "nexti" "The program is not being run." "nexti"
 #test output
 gdb_test "output" "Argument required .expression to compute.*" "output"
@@ -469,18 +471,18 @@ No program loaded.*$gdb_prompt $"\
 gdb_test "rbreak" "" "rbreak"
 
 #test return
-# The middle case accommodates the a29k, where doing the "ni" above causes
-# an initial stack to be created.
+# The middle case accomodated the OBSOLETE a29k, where doing the "ni"
+# above causes an initial stack to be created.
 gdb_test "return" "No selected frame..*" "return"  "Make .* return now.*y or n. $" "y"
 
 
 #test reverse-search
 gdb_test "reverse-search" "No previous regular expression.*|There is no previous regular expression.*" "reverse-search"
 #test step "s" abbreviation
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "s" "The program is not being run." "step \"s\" abbreviation #1"
 #test step
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "step" "The program is not being run." "step #1"
 #test search
 gdb_test "search" "No previous regular expression.*|There is no previous regular expression.*" "search"
@@ -665,21 +667,21 @@ gdb_test "show write" "Writing into executable and core files is o.*" "show writ
 #test show
 gdb_test "show" "confirm:  *Whether to confirm potentially dangerous operations is on..*\[\r\n\]+history filename:  *The filename in which to record the command history is .*\[\r\n\]+history save:  *Saving of the history record on exit is on..*\[\r\n\]+history size:  *The size of the command history is.*\[\r\n\]+listsize:  *Number of source lines gdb will list by default is 10.*\[\r\n\]+print elements:  *Limit on string chars or array elements to print is 200..*" "show"
 #test stepi "si" abbreviation
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test  "si" "The program is not being run." "stepi \"si\" abbreviation"
 #test stepi
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "stepi" "The program is not being run." "stepi"
 #test signal
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "signal" "The program is not being run." "signal"
 #test source
 gdb_test "source" "source command requires pathname of file to source..*|No such file or directory.*" "source"
 #test step "s" abbreviation
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "s" "The program is not being run." "step \"s\" abbreviation #2"
 #test step
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "step" "The program is not being run." "step #2"
 #test symbol-file
 gdb_test "symbol-file" "" "symbol-file"
@@ -750,10 +752,10 @@ gdb_test "tbreak" "No default breakpoint address now." "tbreak"
 #test tty
 gdb_test "tty" "Argument required .terminal name for running target process.*" "tty"
 #test until "u" abbreviation
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "u" "The program is not running." "until \"u\" abbreviation"
 #test until
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "until" "The program is not running." "until"
 #test undisplay
 # FIXME -- need to dump full output to detailed log
@@ -796,7 +798,7 @@ gdb_test "watch" "Argument required .expression to compute.*" "watch"
 #test whatis
 gdb_test "whatis" "The history is empty." "whatis"
 #test where
-setup_xfail "a29k-*-udi"
+# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "where" "No stack." "where"
 #test x
 #The case in which it prints a number is for vxgdb.
diff --git a/gdb/testsuite/gdb.base/funcargs.exp b/gdb/testsuite/gdb.base/funcargs.exp
index 152f0d4e09..3b837bc5cd 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -58,9 +58,9 @@ proc integral_args {} {
     gdb_breakpoint call0e
 
     # Run; should stop at call0a and print actual arguments.
-    # The a29k fails all of these tests, perhaps because the prologue
-    # code is broken.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE # The a29k fails all of these tests, perhaps because the prologue
+    # OBSOLETE # code is broken.
+    # OBSOLETE setup_xfail "a29k-*-udi"
     if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
     gdb_run_cmd
     gdb_expect {
@@ -118,9 +118,9 @@ proc unsigned_integral_args {} {
     gdb_breakpoint call1e;
 
     # Run; should stop at call1a and print actual arguments.
-    # The a29k fails all of these tests, perhaps because the prologue
-    # code is broken.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE # The a29k fails all of these tests, perhaps because the prologue
+    # OBSOLETE # code is broken.
+    # OBSOLETE setup_xfail "a29k-*-udi"
     if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" }
     gdb_run_cmd
     gdb_expect {
@@ -184,9 +184,9 @@ proc float_and_integral_args {} {
     # Run; should stop at call2a and print actual arguments.
 
     setup_xfail "i960-*-*" 1813
-    # The a29k fails all of these tests, perhaps because the prologue
-    # code is broken.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE # The a29k fails all of these tests, perhaps because the prologue
+    # OBSOLETE # code is broken.
+    # OBSOLETE setup_xfail "a29k-*-udi"
     if {!$gcc_compiled} then { setup_xfail "rs6000-*-*" "mips-sgi-irix5*" }
     # The debug info. for "f" is not correct. It's a known bug.
     if {$hp_cc_compiler} {setup_xfail hppa2.0w-*-*}
@@ -285,9 +285,9 @@ proc pointer_args {} {
     # Run; should stop at call3a and print actual arguments.
     # Try dereferencing the arguments.
 
-    # The a29k fails all of these tests, perhaps because the prologue
-    # code is broken.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE # The a29k fails all of these tests, perhaps because the prologue
+    # OBSOLETE # code is broken.
+    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_run_cmd
     gdb_expect {
 	 -re ".* call3a \\(cp=$hex \"a.*\", sp=$hex, ip=$hex, lp=$hex\\) .*$gdb_prompt $" { pass "run to call3a" }
@@ -344,9 +344,9 @@ proc structs_by_reference {} {
     # Run; should stop at call4a and print actual arguments.
     # Try dereferencing the arguments.
 
-    # The a29k fails all of these tests, perhaps because the prologue
-    # code is broken.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE # The a29k fails all of these tests, perhaps because the prologue
+    # OBSOLETE # code is broken.
+    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_run_cmd
     gdb_expect {
 	 -re ".* call4a \\(stp=$hex\\) .*$gdb_prompt $" {
@@ -403,9 +403,9 @@ proc structs_by_value {} {
     # Run; should stop at call5a and print actual arguments.
     # Try dereferencing the arguments.
 
-    # The a29k fails all of these tests, perhaps because the prologue
-    # code is broken.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE # The a29k fails all of these tests, perhaps because the prologue
+    # OBSOLETE # code is broken.
+    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_run_cmd
     gdb_expect {
 	 -re ".* call5a \\(st=\{s1 = 101, s2 = 102\}\\) .*$gdb_prompt $" {
@@ -480,9 +480,9 @@ proc discard_and_shuffle {} {
     # Run; should stop at call6a and print actual arguments.
     # Print backtrace.
 
-    # The a29k fails all of these tests, perhaps because the prologue
-    # code is broken.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE # The a29k fails all of these tests, perhaps because the prologue
+    # OBSOLETE # code is broken.
+    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_run_cmd
     gdb_expect {
 	 -re ".*Breakpoint $decimal, call6a .*$gdb_prompt $" { pass "run to call6a" }
@@ -754,9 +754,9 @@ proc shuffle_round_robin {} {
     # Run; should stop at call7a and print actual arguments.
     # Print backtrace.
 
-    # The a29k fails all of these tests, perhaps because the prologue
-    # code is broken.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE # The a29k fails all of these tests, perhaps because the prologue
+    # OBSOLETE # code is broken.
+    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_run_cmd
     gdb_expect {
 	 -re ".*Breakpoint $decimal, call7a .*$gdb_prompt $" {
@@ -983,9 +983,9 @@ proc recursive_structs_by_value {} {
     }
 
     if ![istarget sparclet-*-*] {
-    # The a29k fails all of these tests, perhaps because the prologue
-    # code is broken.
-	setup_xfail "a29k-*-udi"
+	# OBSOLETE # The a29k fails all of these tests, perhaps because the prologue
+	# OBSOLETE # code is broken.
+	# OBSOLETE setup_xfail "a29k-*-udi"
 	send_gdb "backtrace 100\n"
 	gdb_expect_list "recursive passing of structs by value" ".*$gdb_prompt $" {
 	    ".*\[\r\n\]#0 .* hitbottom \\(\\) "
diff --git a/gdb/testsuite/gdb.base/list.exp b/gdb/testsuite/gdb.base/list.exp
index 454ff248aa..8c114e8770 100644
--- a/gdb/testsuite/gdb.base/list.exp
+++ b/gdb/testsuite/gdb.base/list.exp
@@ -162,12 +162,12 @@ proc test_listsize {} {
 proc test_list_include_file {} {
     global gdb_prompt
 
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE setup_xfail "a29k-*-udi"
     setup_xfail_format "DWARF 1"
     setup_xfail_format "COFF"
     gdb_test "list list0.h:1" "1\[ \t\]+/\[*\]+ An include file .*10\[ \t\]+bar \\(x\\+\\+\\);" "list line 1 in include file"
 
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE setup_xfail "a29k-*-udi"
     setup_xfail_format "DWARF 1"
     setup_xfail_format "COFF"
     gdb_test "list list0.h:100" "Line number 95 out of range; .*list0.h has 3\[67\] lines." "list message for lines past EOF"
@@ -229,7 +229,7 @@ proc test_list_function {} {
     # gcc appears to generate incorrect debugging information for code
     # in include files, which breaks this test.
     # SunPRO cc is the second case below, it's also correct.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_test "list main" "(5\[ \t\]+int x;.*14\[ \t\]+foo \[(\]+.*\[)\]+;|1\[ \t\]+#include .*10\[ \t\]+x = 0;)" "list function in source file 1"
 
     # Ultrix gdb takes the second case below; it's also correct.
@@ -394,7 +394,7 @@ proc test_list_filename_and_function {} {
     # gcc appears to generate incorrect debugging information for code
     # in include files, which breaks this test.
     # SunPRO cc is the second case below, it's also correct.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE setup_xfail "a29k-*-udi"
     send_gdb "list list0.c:main\n"
     gdb_expect {
 	-re "1\[ \t\]+#include .*10\[ \t\]+x = 0;\r\n$gdb_prompt $" {
@@ -407,7 +407,8 @@ proc test_list_filename_and_function {} {
 	timeout { fail "list list0.c:main (timeout)" }
     }
 
-    # The i960 and a29k-amd-udi are the second case
+    # The i960 is a second case
+    # OBSOLETE # The a29k-amd-udi is a second case
 
     # Not sure what the point of having this function be unused is.
     # AIX is legitimately removing it.
@@ -431,7 +432,7 @@ proc test_list_filename_and_function {} {
     # SunPRO cc is the third case.
     setup_xfail "rs6000-*-*" 1804
     setup_xfail "powerpc-*-*" 1804
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE setup_xfail "a29k-*-udi"
     setup_xfail_format "DWARF 1"
     setup_xfail_format "COFF"
     send_gdb "list list0.h:foo\n"
@@ -453,7 +454,7 @@ proc test_list_filename_and_function {} {
     }
 
     # Ultrix gdb is the second case.
-    # a29k-amd-udi is the third case.
+    # OBSOLETE # a29k-amd-udi is the third case.
     send_gdb "list list1.c:bar\n"
     gdb_expect {
 	-re "4\[ \t\]+void.*13\[ \t\]+\}\r\n$gdb_prompt $" {
@@ -469,7 +470,8 @@ proc test_list_filename_and_function {} {
 	timeout { fail "list list1.c:bar (timeout)" }
     }
 
-    # The i960 and a29k-amd-udi are the second case
+    # The i960 is a second case
+    # OBSOLETE # The a29k-amd-udi is a second case
 
     # Not sure what the point of having this function be unused is.
     # AIX is legitimately removing it.
diff --git a/gdb/testsuite/gdb.base/opaque.exp b/gdb/testsuite/gdb.base/opaque.exp
index 2ee63ced93..668e1c3e99 100644
--- a/gdb/testsuite/gdb.base/opaque.exp
+++ b/gdb/testsuite/gdb.base/opaque.exp
@@ -84,7 +84,8 @@ gdb_load ${binfile}
 proc setup_xfail_on_opaque_pointer {} {
 	global gcc_compiled
 
-	setup_xfail "a29k-*-udi" "vax-*-*" "i*86-sequent-bsd*"
+	setup_xfail "vax-*-*" "i*86-sequent-bsd*"
+	# OBSOLETE setup_xfail "a29k-*-udi"
 	if {!$gcc_compiled} then {
 		setup_xfail "alpha-*-*" "mips-sgi-irix5*"
 	}
diff --git a/gdb/testsuite/gdb.base/printcmds.exp b/gdb/testsuite/gdb.base/printcmds.exp
index b36ac1ba82..279816abba 100644
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -619,25 +619,25 @@ proc test_print_string_constants {} {
     # (Test may involve inferior malloc() calls).
     set timeout 60;
 
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p \"a string\""		" = \"a string\""
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p \"embedded \\000 null\"" " = \"embedded \\\\0 null\""
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p \"abcd\"\[2\]"	" = 99 'c'"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p sizeof (\"abcdef\")"	" = 7"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "ptype \"foo\""		" = char \\\[4\\\]"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p *\"foo\""		" = 102 'f'"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "ptype *\"foo\""		" = char"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p &*\"foo\""		" = \"foo\""
     setup_xfail "*-*-*"
     gdb_test "ptype &*\"foo\""	"type = char \\*"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p (char *)\"foo\""	" = \"foo\""
 }
 
@@ -653,17 +653,17 @@ proc test_print_array_constants {} {
     # (Test may involve inferior malloc() calls).
     set timeout 60;
 
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "print {'a','b','c'}"	" = \"abc\""
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test_escape_braces "print {0,1,2}"    " = {0, 1, 2}"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test_escape_braces "print {(long)0,(long)1,(long)2}"  " = {0, 1, 2}"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test_escape_braces "print {{0,1,2},{3,4,5}}"  " = {{0, 1, 2}, {3, 4, 5}}"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "print {4,5,6}\[2\]"	" = 6"
-    setup_xfail "a29k-*-udi" 2416
+    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "print *&{4,5,6}\[1\]"	" = 5"
 }
 
diff --git a/gdb/testsuite/gdb.base/ptype.exp b/gdb/testsuite/gdb.base/ptype.exp
index fcd11e47f7..6e0bda5d37 100644
--- a/gdb/testsuite/gdb.base/ptype.exp
+++ b/gdb/testsuite/gdb.base/ptype.exp
@@ -173,7 +173,8 @@ gdb_test "ptype red" "type = enum \{red, green, blue\}.*" "ptype unnamed enumera
 # test both whatis and ptype for all the types, the tests should be
 # merged into whatis.exp, or else maintenance will be a royal pain -kingdon
 #setup_xfail "i960-*-*" 1821
-#setup_xfail "mips-idt-*" "mips-sgi-*" "a29k-*-*"
+#setup_xfail "mips-idt-*" "mips-sgi-*"
+# OBSOLETE #setup_xfail "a29k-*-*"
 #send "ptype v_char\n"
 #gdb_expect {
 #    -re "type = char.*$gdb_prompt $"	{ pass "ptype char" }
@@ -182,7 +183,8 @@ gdb_test "ptype red" "type = enum \{red, green, blue\}.*" "ptype unnamed enumera
 #}
 #
 #
-#setup_xfail "mips-*-*" "a29k-*-*"
+#setup_xfail "mips-*-*"
+# OBSOLETE #setup_xfail "a29k-*-*"
 #send "ptype v_signed_char\n"
 #gdb_expect {
 #    -re "type = signed char.*$gdb_prompt $"	{ pass "ptype signed char" }
@@ -278,7 +280,8 @@ gdb_test "ptype v_int" "type = int.*" "ptype int"
 # test ptype command with arrays
 #
 #setup_xfail "i960-*-*" 1821
-#setup_xfail "mips-idt-*" "mips-sgi-*" "a29k-*-*"
+#setup_xfail "mips-idt-*" "mips-sgi-*"
+# OBSOLETE #setup_xfail "a29k-*-*"
 #send "ptype v_char_array\n"
 #gdb_expect {
 #    -re "type = char .2..*$gdb_prompt $"	{ pass "ptype char array" }
@@ -287,7 +290,8 @@ gdb_test "ptype v_int" "type = int.*" "ptype int"
 #}
 #
 #
-#setup_xfail "mips-*-*" "a29k-*-*"
+#setup_xfail "mips-*-*"
+# OBSOLETE #setup_xfail "a29k-*-*"
 #send "ptype v_signed_char_array\n"
 #gdb_expect {
 #    -re "type = (|signed )char .2..*$gdb_prompt $"	{ pass "ptype signed char array" }
@@ -381,7 +385,8 @@ gdb_test "ptype t_char_array" "type = (|unsigned )char \\\[0?\\\]"
 ## test ptype command with pointers
 ##
 #setup_xfail "i960-*-*" 1821
-#setup_xfail "mips-idt-*" "mips-sgi-*" "a29k-*-*"
+#setup_xfail "mips-idt-*" "mips-sgi-*"
+# OBSOLETE #setup_xfail "a29k-*-*"
 #send "ptype v_char_pointer\n"
 #gdb_expect {
 #    -re "type = char \*.*$gdb_prompt $"	{ pass "ptype char pointer" }
@@ -390,7 +395,8 @@ gdb_test "ptype t_char_array" "type = (|unsigned )char \\\[0?\\\]"
 #}
 #
 #
-#setup_xfail "mips-*-*" "a29k-*-*"
+#setup_xfail "mips-*-*"
+# OBSOLETE #setup_xfail "a29k-*-*"
 #send "ptype v_signed_char_pointer\n"
 #gdb_expect {
 #    -re "type = (|signed )char \*.*$gdb_prompt $"
diff --git a/gdb/testsuite/gdb.base/scope.exp b/gdb/testsuite/gdb.base/scope.exp
index 413334af9a..69bd84b11b 100644
--- a/gdb/testsuite/gdb.base/scope.exp
+++ b/gdb/testsuite/gdb.base/scope.exp
@@ -515,7 +515,7 @@ proc test_at_localscopes {} {
 
     # This test will only fail if the file was compiled by gcc, but
     # there's no way to check that.
-    setup_xfail "a29k-*-udi" 2423
+    # OBSOLETE setup_xfail "a29k-*-udi" 2423
     if [gdb_test "cont" "Break.* marker4.*at .*:$decimal.*" \
 	"continue to marker4 in scope.exp"] then { gdb_suppress_tests }
     if [gdb_test "up" ".*localscopes.*" "up from marker4 in scope.exp"] {
diff --git a/gdb/testsuite/gdb.base/structs.exp b/gdb/testsuite/gdb.base/structs.exp
index 75d65dc0a5..0203daa4ab 100644
--- a/gdb/testsuite/gdb.base/structs.exp
+++ b/gdb/testsuite/gdb.base/structs.exp
@@ -47,10 +47,12 @@ if [get_compiler_info ${binfile}] {
     return -1;
 }
 
-# The a29k can't call functions, so don't even bother with this test.
-if [istarget "a29k-*-udi"] then {
-    setup_xfail "a29k-*-udi" 2416
-    fail "a29k-*-udi can not call functions"
+
+# Some targets can't call functions, so don't even bother with this
+# test.
+if [target_info exists gdb,cannot_call_functions] {
+    setup_xfail "*-*-*" 2416
+    fail "This target can not call functions"
     continue
 }
 
diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index 191bb36079..c2d7608e32 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -85,7 +85,7 @@ if $signed_keyword_not_used then {
 } else {
     set signed_char "signed char"
 }
-setup_xfail "a29k-*-*"
+# OBSOLETE setup_xfail "a29k-*-*"
 if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix*" }
 gdb_test "whatis v_signed_char" \
     "type = $signed_char" \
diff --git a/gdb/testsuite/gdb.c++/cplusfuncs.exp b/gdb/testsuite/gdb.c++/cplusfuncs.exp
index 80595e32c2..61d26ae570 100644
--- a/gdb/testsuite/gdb.c++/cplusfuncs.exp
+++ b/gdb/testsuite/gdb.c++/cplusfuncs.exp
@@ -320,12 +320,12 @@ proc test_lookup_operator_functions {} {
     global dm_type_void
     global dm_type_void_star
 
-    # These tests don't work for COFF targets; don't even try them
-    if [istarget "a29k-*-udi"] then {
-	setup_xfail "a29k-*-udi"
-	fail "skipping operator tests"
-	return
-    }
+    # OBSOLETE # # These tests don't work for COFF targets; don't even try them
+    # OBSOLETE # if [istarget "a29k-*-udi"] then {
+    # OBSOLETE #     setup_xfail "a29k-*-udi"
+    # OBSOLETE #     fail "skipping operator tests"
+    # OBSOLETE #     return
+    # OBSOLETE #  }
 
     # operator* requires quoting so that GDB does not treat it as a regexp.
     info_func "operator\\*("	"void foo::operator*($dm_type_foo_ref);"
diff --git a/gdb/testsuite/gdb.c++/misc.exp b/gdb/testsuite/gdb.c++/misc.exp
index acdf892914..1cdc61ccf2 100644
--- a/gdb/testsuite/gdb.c++/misc.exp
+++ b/gdb/testsuite/gdb.c++/misc.exp
@@ -41,7 +41,7 @@ proc deduce_language_of_main {} {
 
     # See what language gdb thinks main() is, prior to reading full symbols.
     # I think this fails for COFF targets.
-    setup_xfail "a29k-*-udi"
+    # OBSOLETE setup_xfail "a29k-*-udi"
     send_gdb "show language\n"
     gdb_expect {
 	-re ".* source language is \"auto; currently c\[+\]+\".*$gdb_prompt $" {