* gdb.base/default.exp: Remove obsolete code.

* gdb.c++/misc.exp: Ditto.  Update copyright.
* gdb.c++/cplusfuncs.exp: Ditto.  Update copyright.
* gdb.base/whatis.exp: Ditto.  Update copyright.
* gdb.base/scope.exp: Ditto.  Update copyright.
* gdb.base/ptype.exp: Ditto.  Update copyright.
* gdb.base/printcmds.exp: Ditto.  Update copyright.
* gdb.base/opaque.exp: Ditto.  Update copyright.
* gdb.base/list.exp: Ditto.
* gdb.base/funcargs.exp: Ditto.  Update copyright.
* gdb.hp/gdb.threads-hp/usrthbasic.c: Delete.
* gdb.hp/gdb.threads-hp/usrthbasic.exp: Delete.
* gdb.hp/gdb.threads-hp/usrthcore.c: Delete.
* gdb.hp/gdb.threads-hp/usrthcore.exp: Delete.
* gdb.hp/gdb.threads-hp/usrthfork.c: Delete.
* gdb.hp/gdb.threads-hp/usrthfork.exp: Delete.

17 files changed, 34 insertions, 767 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5f3ced4d1eb..cafe9c324f0 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2002-05-04  Andrew Cagney  <ac131313@redhat.com>
+
+	* gdb.base/default.exp: Remove obsolete code.
+	* gdb.c++/misc.exp: Ditto.  Update copyright.
+	* gdb.c++/cplusfuncs.exp: Ditto.  Update copyright.
+	* gdb.base/whatis.exp: Ditto.  Update copyright.
+	* gdb.base/scope.exp: Ditto.  Update copyright.
+	* gdb.base/ptype.exp: Ditto.  Update copyright.
+	* gdb.base/printcmds.exp: Ditto.  Update copyright.
+	* gdb.base/opaque.exp: Ditto.  Update copyright.
+	* gdb.base/list.exp: Ditto.
+	* gdb.base/funcargs.exp: Ditto.  Update copyright.
+	* gdb.hp/gdb.threads-hp/usrthbasic.c: Delete.
+	* gdb.hp/gdb.threads-hp/usrthbasic.exp: Delete.
+	* gdb.hp/gdb.threads-hp/usrthcore.c: Delete.
+	* gdb.hp/gdb.threads-hp/usrthcore.exp: Delete.
+	* gdb.hp/gdb.threads-hp/usrthfork.c: Delete.
+	* gdb.hp/gdb.threads-hp/usrthfork.exp: Delete.
+
 2002-05-02  Michael Snyder  <msnyder@redhat.com>
 
 	* gdb.base/watchpoint.exp: Add xscale target.
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index c79be2e1076..09b65a91484 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -61,12 +61,6 @@ gdb_expect {
     timeout { fail "(timeout) attach" }
 }
 
-# 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"
     foreach i "b br bre brea" {
@@ -75,7 +69,6 @@ if ![target_info exists use_gdb_stub] {
 
     
     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
@@ -84,7 +77,6 @@ if ![target_info exists use_gdb_stub] {
     #
     foreach i "bt ba bac" {
 	setup_xfail "mips-idt-*"
-	# OBSOLETE setup_xfail "a29k-*-udi"
 	gdb_test $i "No stack." "backtrace \"$i\" abbreviation"
     }
 } else {
@@ -93,18 +85,10 @@ if ![target_info exists use_gdb_stub] {
 
 # This works on the MIPS IDT board, but confuses future tests.
 if ![istarget "mips-idt-*"] then {
-    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_test "continue" "The program is not being run." "continue"
-    # OBSOLETE setup_xfail "a29k-*-udi"
     gdb_test "c" "The program is not being run." "continue \"c\" abbreviation"
 }
 
-# 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"
 
@@ -152,11 +136,6 @@ gdb_expect {
 #test detach
 gdb_test "detach" "" "detach"
 
-# 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
@@ -250,13 +229,10 @@ gdb_expect {
 }
 
 #test frame "f" abbreviation
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "f" "No stack." "frame \"f\" abbreviation"
 #test frame
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "frame" "No stack." "frame"
 #test fg
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "fg" "The program is not being run." "fg"
 # FIXME: fg kills the udi connection
 #test file
@@ -277,7 +253,6 @@ gdb_expect {
 }
 
 #test finish
-# 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
@@ -319,7 +294,6 @@ gdb_test "ignore" "Argument required .a breakpoint number.*" "ignore"
 #test info address
 gdb_test "info address" "Argument required." "info address"
 #test info all-registers
-# 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"
@@ -364,16 +338,12 @@ gdb_test "info functions" "All defined functions:" "info functions"
 #test info locals
 gdb_test "info locals" "No frame selected." "info locals"
 #test info program
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "info program" "The program being debugged is not being run." "info program"
 #test info registers
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "info registers" "The program has no registers now." "info registers"
 #test info stack "s" abbreviation
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "info s" "No stack." "info stack \"s\" abbreviation"
 #test info stack
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "info stack" "No stack." "info stack"
 #test info set
 # FIXME -- needs to match the entire output
@@ -400,7 +370,6 @@ gdb_test "info watchpoints" "No breakpoints or watchpoints." "info watchpoints"
 #test inspect
 gdb_test "inspect" "The history is empty." "inspect"
 #test jump
-# 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"
@@ -414,16 +383,12 @@ 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
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "n" "The program is not being run." "next \"n\" abbreviation"
 #test next
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "next" "The program is not being run." "next"
 #test nexti "ni" abbreviation
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "ni" "The program is not being run." "nexti \"ni\" abbreviation"
 #test nexti
-# 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"
@@ -521,7 +486,7 @@ gdb_test "rbreak" "" "rbreak"
 gdb_test "restore" "You can't do that without a process to debug\."
 
 #test return
-# The middle case accomodated the OBSOLETE a29k, where doing the "ni"
+# 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"
 
@@ -529,10 +494,8 @@ gdb_test "return" "No selected frame..*" "return"  "Make .* return now.*y or n.
 #test reverse-search
 gdb_test "reverse-search" "No previous regular expression.*|There is no previous regular expression.*" "reverse-search"
 #test step "s" abbreviation
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "s" "The program is not being run." "step \"s\" abbreviation #1"
 #test step
-# 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"
@@ -717,21 +680,16 @@ 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\]*\[\r\n\])+history filename:  *The filename in which to record the command history is (\[^\r\n\]*\[\r\n\])+history save:  *Saving of the history record on exit is on.(\[^\r\n\]*\[\r\n\])+history size:  *The size of the command history is(\[^\r\n\]*\[\r\n\])+listsize:  *Number of source lines gdb will list by default is 10(\[^\r\n]*\[\r\n\])+print elements:  *Limit on string chars or array elements to print is 200..*" "show"
 #test stepi "si" abbreviation
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test  "si" "The program is not being run." "stepi \"si\" abbreviation"
 #test stepi
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "stepi" "The program is not being run." "stepi"
 #test signal
-# 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
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "s" "The program is not being run." "step \"s\" abbreviation #2"
 #test step
-# 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"
@@ -802,10 +760,8 @@ 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
-# OBSOLETE setup_xfail "a29k-*-udi"
 gdb_test "u" "The program is not running." "until \"u\" abbreviation"
 #test until
-# 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
@@ -848,7 +804,6 @@ gdb_test "watch" "Argument required .expression to compute.*" "watch"
 #test whatis
 gdb_test "whatis" "The history is empty." "whatis"
 #test where
-# 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 3b837bc5cdd..2ed154a007b 100644
--- a/gdb/testsuite/gdb.base/funcargs.exp
+++ b/gdb/testsuite/gdb.base/funcargs.exp
@@ -1,4 +1,4 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000
+# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -58,9 +58,6 @@ proc integral_args {} {
     gdb_breakpoint call0e
 
     # Run; should stop at call0a and print actual arguments.
-    # 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 +115,6 @@ proc unsigned_integral_args {} {
     gdb_breakpoint call1e;
 
     # Run; should stop at call1a and print actual arguments.
-    # 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 +178,6 @@ proc float_and_integral_args {} {
     # Run; should stop at call2a and print actual arguments.
 
     setup_xfail "i960-*-*" 1813
-    # 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 +276,6 @@ proc pointer_args {} {
     # Run; should stop at call3a and print actual arguments.
     # Try dereferencing the arguments.
 
-    # 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 +332,6 @@ proc structs_by_reference {} {
     # Run; should stop at call4a and print actual arguments.
     # Try dereferencing the arguments.
 
-    # 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 +388,6 @@ proc structs_by_value {} {
     # Run; should stop at call5a and print actual arguments.
     # Try dereferencing the arguments.
 
-    # 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 +462,6 @@ proc discard_and_shuffle {} {
     # Run; should stop at call6a and print actual arguments.
     # Print backtrace.
 
-    # 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 +733,6 @@ proc shuffle_round_robin {} {
     # Run; should stop at call7a and print actual arguments.
     # Print backtrace.
 
-    # 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 +959,6 @@ proc recursive_structs_by_value {} {
     }
 
     if ![istarget sparclet-*-*] {
-	# 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 9a4169c2979..881e0e6bff9 100644
--- a/gdb/testsuite/gdb.base/list.exp
+++ b/gdb/testsuite/gdb.base/list.exp
@@ -164,12 +164,10 @@ proc test_listsize {} {
 proc test_list_include_file {} {
     global gdb_prompt
 
-    # 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"
 
-    # 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"
@@ -231,7 +229,6 @@ 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.
-    # 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.
@@ -396,7 +393,6 @@ 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.
-    # 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 $" {
@@ -410,7 +406,6 @@ proc test_list_filename_and_function {} {
     }
 
     # 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.
@@ -434,7 +429,6 @@ proc test_list_filename_and_function {} {
     # SunPRO cc is the third case.
     setup_xfail "rs6000-*-*" 1804
     setup_xfail "powerpc-*-*" 1804
-    # OBSOLETE setup_xfail "a29k-*-udi"
     setup_xfail_format "DWARF 1"
     setup_xfail_format "COFF"
     send_gdb "list list0.h:foo\n"
@@ -456,7 +450,6 @@ proc test_list_filename_and_function {} {
     }
 
     # Ultrix gdb is the second 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 $" {
@@ -473,7 +466,6 @@ proc test_list_filename_and_function {} {
     }
 
     # 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 668e1c3e993..4030b4f528a 100644
--- a/gdb/testsuite/gdb.base/opaque.exp
+++ b/gdb/testsuite/gdb.base/opaque.exp
@@ -1,4 +1,5 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2002 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -85,7 +86,6 @@ proc setup_xfail_on_opaque_pointer {} {
 	global gcc_compiled
 
 	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 279816abba3..6c4213e3d20 100644
--- a/gdb/testsuite/gdb.base/printcmds.exp
+++ b/gdb/testsuite/gdb.base/printcmds.exp
@@ -1,5 +1,5 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000
-# Free Software Foundation, Inc.
+# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2000, 2002 Free
+# Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -619,25 +619,16 @@ proc test_print_string_constants {} {
     # (Test may involve inferior malloc() calls).
     set timeout 60;
 
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p \"a string\""		" = \"a string\""
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p \"embedded \\000 null\"" " = \"embedded \\\\0 null\""
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p \"abcd\"\[2\]"	" = 99 'c'"
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p sizeof (\"abcdef\")"	" = 7"
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "ptype \"foo\""		" = char \\\[4\\\]"
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p *\"foo\""		" = 102 'f'"
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "ptype *\"foo\""		" = char"
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p &*\"foo\""		" = \"foo\""
     setup_xfail "*-*-*"
     gdb_test "ptype &*\"foo\""	"type = char \\*"
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "p (char *)\"foo\""	" = \"foo\""
 }
 
@@ -653,17 +644,11 @@ proc test_print_array_constants {} {
     # (Test may involve inferior malloc() calls).
     set timeout 60;
 
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "print {'a','b','c'}"	" = \"abc\""
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test_escape_braces "print {0,1,2}"    " = {0, 1, 2}"
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test_escape_braces "print {(long)0,(long)1,(long)2}"  " = {0, 1, 2}"
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test_escape_braces "print {{0,1,2},{3,4,5}}"  " = {{0, 1, 2}, {3, 4, 5}}"
-    # OBSOLETE setup_xfail "a29k-*-udi" 2416
     gdb_test "print {4,5,6}\[2\]"	" = 6"
-    # 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 2851e8937fb..8ef738e28ab 100644
--- a/gdb/testsuite/gdb.base/ptype.exp
+++ b/gdb/testsuite/gdb.base/ptype.exp
@@ -1,5 +1,5 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1999, 2000
-#   Free Software Foundation, Inc.
+# Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1999,
+# 2000, 2002 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -174,7 +174,6 @@ gdb_test "ptype red" "type = enum \{red, green, blue\}.*" "ptype unnamed enumera
 # merged into whatis.exp, or else maintenance will be a royal pain -kingdon
 #setup_xfail "i960-*-*" 1821
 #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" }
@@ -184,7 +183,6 @@ gdb_test "ptype red" "type = enum \{red, green, blue\}.*" "ptype unnamed enumera
 #
 #
 #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" }
@@ -281,7 +279,6 @@ gdb_test "ptype v_int" "type = int.*" "ptype int"
 #
 #setup_xfail "i960-*-*" 1821
 #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" }
@@ -291,7 +288,6 @@ gdb_test "ptype v_int" "type = int.*" "ptype int"
 #
 #
 #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" }
@@ -386,7 +382,6 @@ gdb_test "ptype t_char_array" "type = (|unsigned )char \\\[0?\\\]"
 ##
 #setup_xfail "i960-*-*" 1821
 #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" }
@@ -396,7 +391,6 @@ gdb_test "ptype t_char_array" "type = (|unsigned )char \\\[0?\\\]"
 #
 #
 #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 1765a446499..db2c7ea9f91 100644
--- a/gdb/testsuite/gdb.base/scope.exp
+++ b/gdb/testsuite/gdb.base/scope.exp
@@ -1,5 +1,5 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000
-# Free Software Foundation, Inc.
+# Copyright 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002 Free
+# Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -515,7 +515,6 @@ proc test_at_localscopes {} {
 
     # This test will only fail if the file was compiled by gcc, but
     # there's no way to check that.
-    # 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/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index c2d7608e322..79c48e4da70 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -1,5 +1,5 @@
-#   Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1999
-#   Free Software Foundation, Inc.
+# Copyright 1988, 1990, 1991, 1992, 1994, 1995, 1996, 1997, 1999, 2002
+# Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -85,7 +85,6 @@ if $signed_keyword_not_used then {
 } else {
     set signed_char "signed char"
 }
-# 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 61d26ae5702..9057cc290fc 100644
--- a/gdb/testsuite/gdb.c++/cplusfuncs.exp
+++ b/gdb/testsuite/gdb.c++/cplusfuncs.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1992, 1997, 1999, 2001 Free Software Foundation, Inc.
+# Copyright 1992, 1997, 1999, 2001, 2002 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -320,13 +320,6 @@ proc test_lookup_operator_functions {} {
     global dm_type_void
     global dm_type_void_star
 
-    # 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);"
     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 1cdc61ccf25..a2d122fc69e 100644
--- a/gdb/testsuite/gdb.c++/misc.exp
+++ b/gdb/testsuite/gdb.c++/misc.exp
@@ -1,4 +1,5 @@
-# Copyright 1992, 1994, 1995, 1996, 1997, 1999 Free Software Foundation, Inc.
+# Copyright 1992, 1994, 1995, 1996, 1997, 1999, 2002 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -41,7 +42,6 @@ proc deduce_language_of_main {} {
 
     # See what language gdb thinks main() is, prior to reading full symbols.
     # I think this fails for COFF targets.
-    # OBSOLETE setup_xfail "a29k-*-udi"
     send_gdb "show language\n"
     gdb_expect {
 	-re ".* source language is \"auto; currently c\[+\]+\".*$gdb_prompt $" {
diff --git a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.c b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.c
deleted file mode 100644
index 043b2a64c86..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.c
+++ /dev/null
@@ -1,171 +0,0 @@
-/* OBSOLETE #include <stdio.h> */
-/* OBSOLETE  */
-/* OBSOLETE /* #include "config.h" */ */
-/* OBSOLETE #define HAVE_PTHREAD_H */
-/* OBSOLETE #define __hpux__ */
-/* OBSOLETE #define __osf__ */
-/* OBSOLETE  */
-/* OBSOLETE #ifndef HAVE_PTHREAD_H */
-/* OBSOLETE  */
-/* OBSOLETE /* Don't even try to compile.  In fact, cause a syntax error that we can */
-/* OBSOLETE    look for as a compiler error message and know that we have no pthread */
-/* OBSOLETE    support.  In that case we can just suppress the test completely. */ */
-/* OBSOLETE  */
-/* OBSOLETE #error "no posix threads support" */
-/* OBSOLETE  */
-/* OBSOLETE #else */
-/* OBSOLETE  */
-/* OBSOLETE /* OK.  We have the right header.  If we try to compile this and fail, then */
-/* OBSOLETE    there is something wrong and the user should know about it so the testsuite */
-/* OBSOLETE    should issue an ERROR result.. */ */
-/* OBSOLETE  */
-/* OBSOLETE #ifdef __linux__ */
-/* OBSOLETE #define  _MIT_POSIX_THREADS 1	/* Linux (or at least RedHat 4.0) needs this */ */
-/* OBSOLETE #endif */
-/* OBSOLETE  */
-/* OBSOLETE #include <pthread.h> */
-/* OBSOLETE  */
-/* OBSOLETE /* Under OSF 2.0 & 3.0 and HPUX 10, the second arg of pthread_create */
-/* OBSOLETE    is prototyped to be just a "pthread_attr_t", while under Solaris it */
-/* OBSOLETE    is a "pthread_attr_t *".  Arg! */ */
-/* OBSOLETE  */
-/* OBSOLETE #if defined (__osf__) || defined (__hpux__) */
-/* OBSOLETE #define PTHREAD_CREATE_ARG2(arg) arg */
-/* OBSOLETE #define PTHREAD_CREATE_NULL_ARG2 null_attr */
-/* OBSOLETE static pthread_attr_t null_attr; */
-/* OBSOLETE #else */
-/* OBSOLETE #define PTHREAD_CREATE_ARG2(arg) &arg */
-/* OBSOLETE #define PTHREAD_CREATE_NULL_ARG2 NULL */
-/* OBSOLETE #endif */
-/* OBSOLETE  */
-/* OBSOLETE static int verbose = 0; */
-/* OBSOLETE  */
-/* OBSOLETE static void */
-/* OBSOLETE common_routine (arg) */
-/* OBSOLETE      int arg; */
-/* OBSOLETE { */
-/* OBSOLETE   static int from_thread1; */
-/* OBSOLETE   static int from_thread2; */
-/* OBSOLETE   static int from_main; */
-/* OBSOLETE   static int hits; */
-/* OBSOLETE   static int full_coverage; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf("common_routine (%d)\n", arg); */
-/* OBSOLETE   hits++; */
-/* OBSOLETE   switch (arg) */
-/* OBSOLETE     { */
-/* OBSOLETE     case 0: */
-/* OBSOLETE       from_main++; */
-/* OBSOLETE       break; */
-/* OBSOLETE     case 1: */
-/* OBSOLETE       from_thread1++; */
-/* OBSOLETE       break; */
-/* OBSOLETE     case 2: */
-/* OBSOLETE       from_thread2++; */
-/* OBSOLETE       break; */
-/* OBSOLETE     } */
-/* OBSOLETE   if (from_main && from_thread1 && from_thread2) */
-/* OBSOLETE     full_coverage = 1; */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE static void * */
-/* OBSOLETE thread1 (void *arg) */
-/* OBSOLETE { */
-/* OBSOLETE   int i; */
-/* OBSOLETE   int z = 0; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf ("thread1 (%0x) ; pid = %d\n", arg, getpid ()); */
-/* OBSOLETE   for (i=1; i <= 10000000; i++) */
-/* OBSOLETE     { */
-/* OBSOLETE       if (verbose) printf("thread1 %d\n", pthread_self ()); */
-/* OBSOLETE       z += i; */
-/* OBSOLETE       common_routine (1); */
-/* OBSOLETE       sleep(1); */
-/* OBSOLETE     } */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE static void * */
-/* OBSOLETE thread2 (void * arg) */
-/* OBSOLETE { */
-/* OBSOLETE   int i; */
-/* OBSOLETE   int k = 0; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf ("thread2 (%0x) ; pid = %d\n", arg, getpid ()); */
-/* OBSOLETE   for (i=1; i <= 10000000; i++) */
-/* OBSOLETE     { */
-/* OBSOLETE       if (verbose) printf("thread2 %d\n", pthread_self ()); */
-/* OBSOLETE       k += i; */
-/* OBSOLETE       common_routine (2); */
-/* OBSOLETE       sleep(1); */
-/* OBSOLETE     } */
-/* OBSOLETE   sleep(100); */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE int */
-/* OBSOLETE foo (a, b, c) */
-/* OBSOLETE      int a, b, c; */
-/* OBSOLETE { */
-/* OBSOLETE   int d, e, f; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf("a=%d\n", a); */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE main(argc, argv) */
-/* OBSOLETE      int argc; */
-/* OBSOLETE      char **argv; */
-/* OBSOLETE { */
-/* OBSOLETE   pthread_t tid1, tid2; */
-/* OBSOLETE   int j; */
-/* OBSOLETE   int t = 0; */
-/* OBSOLETE   void (*xxx) (); */
-/* OBSOLETE   pthread_attr_t attr; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf ("pid = %d\n", getpid()); */
-/* OBSOLETE  */
-/* OBSOLETE   foo (1, 2, 3); */
-/* OBSOLETE  */
-/* OBSOLETE #ifndef __osf__ */
-/* OBSOLETE   if (pthread_attr_init (&attr)) */
-/* OBSOLETE     { */
-/* OBSOLETE       perror ("pthread_attr_init 1"); */
-/* OBSOLETE       exit (1); */
-/* OBSOLETE     } */
-/* OBSOLETE #endif */
-/* OBSOLETE  */
-/* OBSOLETE #ifdef PTHREAD_SCOPE_SYSTEM */
-/* OBSOLETE   if (pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM)) */
-/* OBSOLETE     { */
-/* OBSOLETE       perror ("pthread_attr_setscope 1"); */
-/* OBSOLETE       exit (1); */
-/* OBSOLETE     } */
-/* OBSOLETE #endif */
-/* OBSOLETE  */
-/* OBSOLETE   if (pthread_create (&tid1, pthread_attr_default, thread1, (void *) 0xfeedface)) */
-/* OBSOLETE     { */
-/* OBSOLETE       perror ("pthread_create 1"); */
-/* OBSOLETE       exit (1); */
-/* OBSOLETE     } */
-/* OBSOLETE   if (verbose) printf ("Made thread %d\n", tid1); */
-/* OBSOLETE   sleep (1); */
-/* OBSOLETE  */
-/* OBSOLETE   if (pthread_create (&tid2, null_attr, thread2, (void *) 0xdeadbeef)) */
-/* OBSOLETE     { */
-/* OBSOLETE       perror ("pthread_create 2"); */
-/* OBSOLETE       exit (1); */
-/* OBSOLETE     } */
-/* OBSOLETE   if (verbose) printf("Made thread %d\n", tid2); */
-/* OBSOLETE  */
-/* OBSOLETE   sleep (1); */
-/* OBSOLETE  */
-/* OBSOLETE   for (j = 1; j <= 10000000; j++) */
-/* OBSOLETE     { */
-/* OBSOLETE       if (verbose) printf("top %d\n", pthread_self ()); */
-/* OBSOLETE       common_routine (0); */
-/* OBSOLETE       sleep(1); */
-/* OBSOLETE       t += j; */
-/* OBSOLETE     } */
-/* OBSOLETE    */
-/* OBSOLETE   exit(0); */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE #endif	/* ifndef HAVE_PTHREAD_H */ */
diff --git a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.exp b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.exp
deleted file mode 100644
index 60f3605caa4..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthbasic.exp
+++ /dev/null
@@ -1,110 +0,0 @@
-# OBSOLETE # usrthbasic.exp -- Expect script to test gdb with user threads
-# OBSOLETE # Copyright (C) 1992 Free Software Foundation, Inc.
-# OBSOLETE 
-# OBSOLETE # This program is free software; you can redistribute it and/or modify
-# OBSOLETE # it under the terms of the GNU General Public License as published by
-# OBSOLETE # the Free Software Foundation; either version 2 of the License, or
-# OBSOLETE # (at your option) any later version.
-# OBSOLETE # 
-# OBSOLETE # This program is distributed in the hope that it will be useful,
-# OBSOLETE # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# OBSOLETE # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# OBSOLETE # GNU General Public License for more details.
-# OBSOLETE # 
-# OBSOLETE # You should have received a copy of the GNU General Public License
-# OBSOLETE # along with this program; if not, write to the Free Software
-# OBSOLETE # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-# OBSOLETE 
-# OBSOLETE # Please email any bugs, comments, and/or additions to this file to:
-# OBSOLETE # bug-gdb@prep.ai.mit.edu
-# OBSOLETE 
-# OBSOLETE # use this to debug:
-# OBSOLETE #
-# OBSOLETE #log_user 1
-# OBSOLETE 
-verbose "HP's thread tests are broken beyond repair right now." 
-return 0
-# OBSOLETE 
-# OBSOLETE if $tracelevel {
-# OBSOLETE     strace $tracelevel
-# OBSOLETE }
-# OBSOLETE 
-# OBSOLETE if { [skip_hp_tests] } { continue }
-# OBSOLETE 
-# OBSOLETE if { ![istarget "hppa*-*-hpux*"] || [istarget "hppa64-*-*"] } {
-# OBSOLETE     verbose "HPUX thread test ignored for non-hppa or PA64 targets."
-# OBSOLETE     return 0
-# OBSOLETE }
-# OBSOLETE 
-# OBSOLETE set testfile usrthbasic
-# OBSOLETE set srcfile ${srcdir}/${subdir}/${testfile}.c
-# OBSOLETE set binfile ${srcdir}/${subdir}/${testfile}
-# OBSOLETE 
-# OBSOLETE # To build the executable we need to link against the thread library.
-# OBSOLETE #
-# OBSOLETE #	/opt/ansic/bin/cc -Ae +DAportable -g -o usrthbasic -lcma usrthbasic.c
-# OBSOLETE #
-# OBSOLETE ## we have trouble building it on 11.0, so we use the prebuilt
-# OBSOLETE ## executable instead.
-# OBSOLETE ##
-# OBSOLETE ##if { [gdb_compile "${srcdir}/${subdir}/${testfile}.c" "${binfile}" executable {debug additional_flags=-Ae ldflags=-lcma}] != "" } {
-# OBSOLETE ##    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-# OBSOLETE ##}
-# OBSOLETE 
-# OBSOLETE # We don't really seem to need longer waits.
-# OBSOLETE #
-# OBSOLETE ##set oldtimeout $timeout
-# OBSOLETE ##set timeout [expr "$timeout + 0"]
-# OBSOLETE ##set oldverbose $verbose
-# OBSOLETE ##set verbose 40
-# OBSOLETE 
-# OBSOLETE #=========================
-# OBSOLETE #
-# OBSOLETE # Test looking at threads.
-# OBSOLETE #
-# OBSOLETE gdb_exit
-# OBSOLETE gdb_start
-# OBSOLETE gdb_reinitialize_dir $srcdir/$subdir
-# OBSOLETE gdb_load ${binfile}
-# OBSOLETE 
-# OBSOLETE gdb_test "b main" ".*Breakpoint 1.*" "b main"
-# OBSOLETE gdb_test "run" "Breakpoint 1, main.*:119.*" "run to main"
-# OBSOLETE gdb_test "b thread1" ".*Breakpoint 2.*" "b thread1"
-# OBSOLETE gdb_test "info threads" "\\* 1 system thread.*:119\[^(\]*" \
-# OBSOLETE 	 "info threads at main"
-# OBSOLETE gdb_test "c" "Breakpoint 2, thread1.*" "continue to thread1"
-# OBSOLETE gdb_test "info threads" \
-# OBSOLETE     "\\* 3 system thread.*thread1.*libcma.1.*libcma.1\[^(\]*" \
-# OBSOLETE     "info threads at main"
-# OBSOLETE gdb_test "b 165" "Breakpoint 3.*165.*" "break at main counter"
-# OBSOLETE gdb_test "c" "Breakpoint 3, main.*" "continue to main counter"
-# OBSOLETE gdb_test "info threads" "  4 system thread.*\\* 1 system thread.*main.*" \
-# OBSOLETE     "info threads at main counter"
-# OBSOLETE gdb_test "b 97" "Breakpoint 4.*97.*" "break at thread2 counter"
-# OBSOLETE gdb_test "b 81" "Breakpoint 5.*81.*" "break at thread1 counter"
-# OBSOLETE gdb_test "bt" "#0  main.* at \[^(\]*" "backtrace at main counter"
-# OBSOLETE 
-# OBSOLETE # After switching to thread 4, the cma scheduler should schedule it next
-# OBSOLETE # and we should hit its breakpoint in thread2.
-# OBSOLETE gdb_test "thread 4" ".Switching to thread 4.*cma__dispatch.*" \
-# OBSOLETE 	 "switch to thread 4"
-# OBSOLETE gdb_test "bt" "#0  .*thread2.*" "backtrace at thread 4"
-# OBSOLETE sleep 1
-# OBSOLETE gdb_test "c" ".*Breakpoint 4, thread2.*" "continue and get to thread 4"
-# OBSOLETE 
-# OBSOLETE # After switching to thread 1, the cma scheduler should schedule it next
-# OBSOLETE # and we should hit its breakpoint (in main).
-# OBSOLETE gdb_test "thread 1" ".*Switching to thread 1.*cma__dispatch.*" \
-# OBSOLETE     "switch to thread 1"
-# OBSOLETE sleep 1
-# OBSOLETE gdb_test "c" ".*Breakpoint 3, main.*usrthbasic.c:165.*" \
-# OBSOLETE     "continue and get to thread 1"
-# OBSOLETE 
-# OBSOLETE # Done!
-# OBSOLETE #
-# OBSOLETE gdb_exit
-# OBSOLETE 
-# OBSOLETE ##set timeout $oldtimeout
-# OBSOLETE ##set verbose $oldverbose
-# OBSOLETE 
-# OBSOLETE return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.c b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.c
deleted file mode 100644
index c3bc18d64ad..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* OBSOLETE #include <stdio.h> */
-/* OBSOLETE  */
-/* OBSOLETE /* #include "config.h" */ */
-/* OBSOLETE #define HAVE_PTHREAD_H */
-/* OBSOLETE #define __hpux__ */
-/* OBSOLETE #define __osf__ */
-/* OBSOLETE  */
-/* OBSOLETE #ifndef HAVE_PTHREAD_H */
-/* OBSOLETE  */
-/* OBSOLETE /* Don't even try to compile.  In fact, cause a syntax error that we can */
-/* OBSOLETE    look for as a compiler error message and know that we have no pthread */
-/* OBSOLETE    support.  In that case we can just suppress the test completely. */ */
-/* OBSOLETE  */
-/* OBSOLETE #error "no posix threads support" */
-/* OBSOLETE  */
-/* OBSOLETE #else */
-/* OBSOLETE  */
-/* OBSOLETE /* OK.  We have the right header.  If we try to compile this and fail, then */
-/* OBSOLETE    there is something wrong and the user should know about it so the testsuite */
-/* OBSOLETE    should issue an ERROR result.. */ */
-/* OBSOLETE  */
-/* OBSOLETE #ifdef __linux__ */
-/* OBSOLETE #define  _MIT_POSIX_THREADS 1	/* Linux (or at least RedHat 4.0) needs this */ */
-/* OBSOLETE #endif */
-/* OBSOLETE  */
-/* OBSOLETE #include <pthread.h> */
-/* OBSOLETE  */
-/* OBSOLETE /* Under OSF 2.0 & 3.0 and HPUX 10, the second arg of pthread_create */
-/* OBSOLETE    is prototyped to be just a "pthread_attr_t", while under Solaris it */
-/* OBSOLETE    is a "pthread_attr_t *".  Arg! */ */
-/* OBSOLETE  */
-/* OBSOLETE #if defined (__osf__) || defined (__hpux__) */
-/* OBSOLETE #define PTHREAD_CREATE_ARG2(arg) arg */
-/* OBSOLETE #define PTHREAD_CREATE_NULL_ARG2 null_attr */
-/* OBSOLETE static pthread_attr_t null_attr; */
-/* OBSOLETE #else */
-/* OBSOLETE #define PTHREAD_CREATE_ARG2(arg) &arg */
-/* OBSOLETE #define PTHREAD_CREATE_NULL_ARG2 NULL */
-/* OBSOLETE #endif */
-/* OBSOLETE  */
-/* OBSOLETE static int verbose = 0; */
-/* OBSOLETE  */
-/* OBSOLETE static void */
-/* OBSOLETE common_routine (arg) */
-/* OBSOLETE      int arg; */
-/* OBSOLETE { */
-/* OBSOLETE   static int from_thread1; */
-/* OBSOLETE   static int from_thread2; */
-/* OBSOLETE   static int from_main; */
-/* OBSOLETE   static int hits; */
-/* OBSOLETE   static int full_coverage; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf("common_routine (%d)\n", arg); */
-/* OBSOLETE   hits++; */
-/* OBSOLETE   switch (arg) */
-/* OBSOLETE     { */
-/* OBSOLETE     case 0: */
-/* OBSOLETE       from_main++; */
-/* OBSOLETE       break; */
-/* OBSOLETE     case 1: */
-/* OBSOLETE       from_thread1++; */
-/* OBSOLETE       break; */
-/* OBSOLETE     case 2: */
-/* OBSOLETE       from_thread2++; */
-/* OBSOLETE       break; */
-/* OBSOLETE     } */
-/* OBSOLETE   if (from_main && from_thread1 && from_thread2) */
-/* OBSOLETE     full_coverage = 1; */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE static void * */
-/* OBSOLETE thread1 (void *arg) */
-/* OBSOLETE { */
-/* OBSOLETE   int i; */
-/* OBSOLETE   int z = 0; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf ("thread1 (%0x) ; pid = %d\n", arg, getpid ()); */
-/* OBSOLETE   for (i=1; i <= 10000000; i++) */
-/* OBSOLETE     { */
-/* OBSOLETE       if (verbose) printf("thread1 %d\n", pthread_self ()); */
-/* OBSOLETE       z += i; */
-/* OBSOLETE       common_routine (1); */
-/* OBSOLETE       sleep(1); */
-/* OBSOLETE     } */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE static void * */
-/* OBSOLETE thread2 (void * arg) */
-/* OBSOLETE { */
-/* OBSOLETE   int i; */
-/* OBSOLETE   int k = 0; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf ("thread2 (%0x) ; pid = %d\n", arg, getpid ()); */
-/* OBSOLETE   for (i=1; i <= 10000000; i++) */
-/* OBSOLETE     { */
-/* OBSOLETE       if (verbose) printf("thread2 %d\n", pthread_self ()); */
-/* OBSOLETE       k += i; */
-/* OBSOLETE       common_routine (2); */
-/* OBSOLETE       sleep(1); */
-/* OBSOLETE     } */
-/* OBSOLETE   sleep(100); */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE int */
-/* OBSOLETE foo (a, b, c) */
-/* OBSOLETE      int a, b, c; */
-/* OBSOLETE { */
-/* OBSOLETE   int d, e, f; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf("a=%d\n", a); */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE main(argc, argv) */
-/* OBSOLETE      int argc; */
-/* OBSOLETE      char **argv; */
-/* OBSOLETE { */
-/* OBSOLETE   pthread_t tid1, tid2; */
-/* OBSOLETE   int j; */
-/* OBSOLETE   int t = 0; */
-/* OBSOLETE   void (*xxx) (); */
-/* OBSOLETE   pthread_attr_t attr; */
-/* OBSOLETE  */
-/* OBSOLETE   if (verbose) printf ("pid = %d\n", getpid()); */
-/* OBSOLETE  */
-/* OBSOLETE   foo (1, 2, 3); */
-/* OBSOLETE  */
-/* OBSOLETE #ifndef __osf__ */
-/* OBSOLETE   if (pthread_attr_init (&attr)) */
-/* OBSOLETE     { */
-/* OBSOLETE       perror ("pthread_attr_init 1"); */
-/* OBSOLETE       exit (1); */
-/* OBSOLETE     } */
-/* OBSOLETE #endif */
-/* OBSOLETE  */
-/* OBSOLETE #ifdef PTHREAD_SCOPE_SYSTEM */
-/* OBSOLETE   if (pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM)) */
-/* OBSOLETE     { */
-/* OBSOLETE       perror ("pthread_attr_setscope 1"); */
-/* OBSOLETE       exit (1); */
-/* OBSOLETE     } */
-/* OBSOLETE #endif */
-/* OBSOLETE  */
-/* OBSOLETE   if (pthread_create (&tid1, pthread_attr_default, thread1, (void *) 0xfeedface)) */
-/* OBSOLETE     { */
-/* OBSOLETE       perror ("pthread_create 1"); */
-/* OBSOLETE       exit (1); */
-/* OBSOLETE     } */
-/* OBSOLETE   if (verbose) printf ("Made thread %d\n", tid1); */
-/* OBSOLETE   sleep (1); */
-/* OBSOLETE  */
-/* OBSOLETE   if (pthread_create (&tid2, null_attr, thread2, (void *) 0xdeadbeef)) */
-/* OBSOLETE     { */
-/* OBSOLETE       perror ("pthread_create 2"); */
-/* OBSOLETE       exit (1); */
-/* OBSOLETE     } */
-/* OBSOLETE   if (verbose) printf("Made thread %d\n", tid2); */
-/* OBSOLETE  */
-/* OBSOLETE   sleep (1); */
-/* OBSOLETE  */
-/* OBSOLETE   for (j = 1; j <= 10000000; j++) */
-/* OBSOLETE     { */
-/* OBSOLETE       if (verbose) printf("top %d\n", pthread_self ()); */
-/* OBSOLETE       common_routine (0); */
-/* OBSOLETE       sleep(1); */
-/* OBSOLETE       t += j; */
-/* OBSOLETE       if (j > 3)  */
-/* OBSOLETE       { */
-/* OBSOLETE 	 int*	int_p; */
-/* OBSOLETE 	 int_p = 0; */
-/* OBSOLETE 	 *int_p = 1; */
-/* OBSOLETE       } */
-/* OBSOLETE     } */
-/* OBSOLETE    */
-/* OBSOLETE   exit(0); */
-/* OBSOLETE } */
-/* OBSOLETE  */
-/* OBSOLETE #endif	/* ifndef HAVE_PTHREAD_H */ */
diff --git a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.exp b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.exp
deleted file mode 100644
index b373c3a0da0..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthcore.exp
+++ /dev/null
@@ -1,92 +0,0 @@
-# OBSOLETE # usrthcore.exp -- Expect script to test gdb with user threads
-# OBSOLETE # Copyright (C) 1992 Free Software Foundation, Inc.
-# OBSOLETE 
-# OBSOLETE # This program is free software; you can redistribute it and/or modify
-# OBSOLETE # it under the terms of the GNU General Public License as published by
-# OBSOLETE # the Free Software Foundation; either version 2 of the License, or
-# OBSOLETE # (at your option) any later version.
-# OBSOLETE # 
-# OBSOLETE # This program is distributed in the hope that it will be useful,
-# OBSOLETE # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# OBSOLETE # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# OBSOLETE # GNU General Public License for more details.
-# OBSOLETE # 
-# OBSOLETE # You should have received a copy of the GNU General Public License
-# OBSOLETE # along with this program; if not, write to the Free Software
-# OBSOLETE # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-# OBSOLETE 
-# OBSOLETE # Please email any bugs, comments, and/or additions to this file to:
-# OBSOLETE # bug-gdb@prep.ai.mit.edu
-# OBSOLETE 
-# OBSOLETE # use this to debug:
-# OBSOLETE #
-# OBSOLETE #log_user 1
-# OBSOLETE 
-verbose "HP's thread tests are broken beyond repair right now." 
-return 0
-# OBSOLETE 
-# OBSOLETE if $tracelevel {
-# OBSOLETE     strace $tracelevel
-# OBSOLETE }
-# OBSOLETE 
-# OBSOLETE if { [skip_hp_tests] } { continue }
-# OBSOLETE 
-# OBSOLETE if { ![istarget "hppa*-*-hpux*"] || [istarget "hppa64-*-*"] } {
-# OBSOLETE     verbose "HPUX thread test ignored for non-hppa or PA64 targets."
-# OBSOLETE     return 0
-# OBSOLETE }
-# OBSOLETE 
-# OBSOLETE set testfile usrthcore
-# OBSOLETE set srcfile ${srcdir}/${subdir}/${testfile}.c
-# OBSOLETE set binfile ${srcdir}/${subdir}/${testfile}
-# OBSOLETE 
-# OBSOLETE # To build the executable we need to link against the thread library.
-# OBSOLETE #
-# OBSOLETE #	/opt/ansic/bin/cc -Ae +DAportable -g -o usrthcore -lcma usrthcore.c
-# OBSOLETE #
-# OBSOLETE ## we have trouble building it on 11.0, so we use the prebuilt
-# OBSOLETE ## executable instead.
-# OBSOLETE ##
-# OBSOLETE ##if { [gdb_compile "${srcdir}/${subdir}/${testfile}.c -lcma" "${binfile}" executable {debug additional_flags=-Ae ldflags=-lcma}] != "" } {
-# OBSOLETE ##    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-# OBSOLETE ##}
-# OBSOLETE 
-# OBSOLETE #=========================
-# OBSOLETE #
-# OBSOLETE # Test looking at threads in a core file
-# OBSOLETE #
-# OBSOLETE 
-# OBSOLETE remote_exec build "rm -f core"
-# OBSOLETE remote_exec build "${binfile}"
-# OBSOLETE 
-# OBSOLETE gdb_exit
-# OBSOLETE gdb_start
-# OBSOLETE gdb_reinitialize_dir $srcdir/$subdir
-# OBSOLETE gdb_load ${binfile}
-# OBSOLETE gdb_test "core-file core" \
-# OBSOLETE     ".*Core was generated by `usrthcore'.*in main.*usrthcore.c:170.*" \
-# OBSOLETE     "load corefile"
-# OBSOLETE 
-# OBSOLETE gdb_test "info thread" \
-# OBSOLETE     "  4 .*cma__dispatch.*\\* 1 .*in main.*usrthcore.c:170.*" \
-# OBSOLETE     "info thread on core file"
-# OBSOLETE gdb_test "bt" "#0.*in main.*usrthcore.c:170" "backtrace on active thread"
-# OBSOLETE gdb_test "thread 4" ".*Switching to thread 4.*cma__dispatch.*" \
-# OBSOLETE     "switch to thread 4 (thread2 procedure)"
-# OBSOLETE gdb_test "bt" "#0.*cma__dispatch.*thread2.*usrthcore.c:99.*" \
-# OBSOLETE     "Backtrace on inactive thread (thread2 procedure)"
-# OBSOLETE gdb_test "b thread1"  "Breakpoint 1.*usrthcore.c, line 75.*" \
-# OBSOLETE     "break on thread1"
-# OBSOLETE gdb_test "run" "Starting program.*Breakpoint 1, thread1.*usrthcore.c:75.*" \
-# OBSOLETE     "run program, get to thread1 procedure"
-# OBSOLETE gdb_test "info threads" "\\* \[23\] .*thread1.* 1 .*cma__dispatch.*" \
-# OBSOLETE     "info threads after running core"
-# OBSOLETE 
-# OBSOLETE 
-# OBSOLETE # Done!
-# OBSOLETE #
-# OBSOLETE gdb_exit
-# OBSOLETE 
-# OBSOLETE remote_exec build "rm -f core"
-# OBSOLETE 
-# OBSOLETE return 0
diff --git a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.c b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.c
deleted file mode 100644
index f5614de513b..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* OBSOLETE #include <stdio.h> */
-/* OBSOLETE #include <pthread.h> */
-/* OBSOLETE #include <sys/types.h> */
-/* OBSOLETE  */
-/* OBSOLETE int main(void){ */
-/* OBSOLETE pid_t pid; */
-/* OBSOLETE  */
-/* OBSOLETE switch (pid = fork()){ */
-/* OBSOLETE   case 0: */
-/* OBSOLETE     printf("child\n"); */
-/* OBSOLETE     break; */
-/* OBSOLETE   default: */
-/* OBSOLETE     printf("parent\n"); */
-/* OBSOLETE     break; */
-/* OBSOLETE   } */
-/* OBSOLETE   return 0; */
-/* OBSOLETE } */
diff --git a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.exp b/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.exp
deleted file mode 100644
index 994a6e27f14..00000000000
--- a/gdb/testsuite/gdb.hp/gdb.threads-hp/usrthfork.exp
+++ /dev/null
@@ -1,75 +0,0 @@
-# OBSOLETE # user_th_basic.exp -- Expect script to test gdb with user threads
-# OBSOLETE # Copyright (C) 1992 Free Software Foundation, Inc.
-# OBSOLETE 
-# OBSOLETE # This program is free software; you can redistribute it and/or modify
-# OBSOLETE # it under the terms of the GNU General Public License as published by
-# OBSOLETE # the Free Software Foundation; either version 2 of the License, or
-# OBSOLETE # (at your option) any later version.
-# OBSOLETE # 
-# OBSOLETE # This program is distributed in the hope that it will be useful,
-# OBSOLETE # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# OBSOLETE # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# OBSOLETE # GNU General Public License for more details.
-# OBSOLETE # 
-# OBSOLETE # You should have received a copy of the GNU General Public License
-# OBSOLETE # along with this program; if not, write to the Free Software
-# OBSOLETE # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-# OBSOLETE 
-# OBSOLETE # Please email any bugs, comments, and/or additions to this file to:
-# OBSOLETE # bug-gdb@prep.ai.mit.edu
-# OBSOLETE 
-verbose "HP's thread tests are broken beyond repair right now." 
-return 0
-# OBSOLETE 
-# OBSOLETE if $tracelevel {
-# OBSOLETE     strace $tracelevel
-# OBSOLETE }
-# OBSOLETE 
-# OBSOLETE if { ![istarget "hppa*-*-hpux*"] || [istarget "hppa64-*-*"] } {
-# OBSOLETE     verbose "HPUX thread test ignored for non-hppa or PA64 targets."
-# OBSOLETE     return 0
-# OBSOLETE }
-# OBSOLETE 
-# OBSOLETE set testfile usrthfork
-# OBSOLETE set srcfile ${srcdir}/${subdir}/${testfile}.c
-# OBSOLETE set binfile ${srcdir}/${subdir}/${testfile}
-# OBSOLETE 
-# OBSOLETE # To build the executable we need to link against the thread library.
-# OBSOLETE #
-# OBSOLETE #	/opt/ansic/bin/cc -Ae -g -o usrthfork -lcma usrthfork.c
-# OBSOLETE #
-# OBSOLETE ## we have trouble building it on 11.0, so we use the prebuilt
-# OBSOLETE ## executable instead.
-# OBSOLETE ##
-# OBSOLETE ##if { [gdb_compile "${srcdir}/${subdir}/${testfile}.c" "${binfile}" executable {debug additional_flags=-Ae ldflags=-lcma}] != "" } {
-# OBSOLETE ##    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-# OBSOLETE ##}
-# OBSOLETE 
-# OBSOLETE #=========================
-# OBSOLETE #
-# OBSOLETE # Test looking at threads.
-# OBSOLETE #
-# OBSOLETE gdb_exit
-# OBSOLETE gdb_start
-# OBSOLETE gdb_reinitialize_dir $srcdir/$subdir
-# OBSOLETE gdb_load ${binfile}
-# OBSOLETE 
-# OBSOLETE gdb_test "set follow-fork-mode parent" ".*" "set follow-fork-mode parent"
-# OBSOLETE gdb_test "b main" "Breakpoint 1.*" "b main"
-# OBSOLETE gdb_test "run" "Breakpoint 1, main.*:8.*" "run to main"
-# OBSOLETE ##gdb_test "next" \
-# OBSOLETE ##    ".*New process.*Detaching after fork from process.*13.*parent.*" \
-# OBSOLETE ##    "next on CMA fork"
-# OBSOLETE send_gdb "next\n"
-# OBSOLETE gdb_expect {
-# OBSOLETE     -re ".*Detaching after fork from.*$gdb_prompt $" {
-# OBSOLETE 	pass "next on CMA fork"
-# OBSOLETE     }
-# OBSOLETE     -re ".*$gdb_prompt $" { fail "next on CMA fork" }
-# OBSOLETE     timeout { fail "(timeout) next on CMA fork" }
-# OBSOLETE }
-# OBSOLETE exec sleep 1
-# OBSOLETE 
-# OBSOLETE gdb_exit
-# OBSOLETE 
-# OBSOLETE return 0