* Makefile.am (config_DATA): Update.

	(baseboard_DATA): Likewise.
	* Makefile.in: Regenerate.
	* NEWS: Update.

	Remove the following old config files:

	* arc.exp, arm-ice.exp, base-config.exp, base68k.exp, bug.exp,
	cfdbug.exp, cygmon.exp, d10v.exp, ddb-ether.exp, ddb.exp, dos.exp,
	dve.exp, h8300.exp, i386-bozo.exp, i960.exp, m32r-stub.exp,
	m32r.exp, m68hc11.exp, m68k-emc.exp, mips-idt.exp,
	mn10200-eval.exp, mn10300-eval.exp, netware.exp, powerpc-bug.exp,
	proelf.exp, rom68k.exp, sh.exp, slite.exp, sparclet.exp,
	tic80.exp, vr4100.exp, vr4300.exp, vr5000.exp: Remove.

	Remove the following old baseboard files:

	* arc-sim.exp, arm-ice.exp, arm-sim.exp, cf.exp, cygmon.exp,
	d10v-sim.exp, d10v.exp, danlite-elf.exp, dos.exp, fr30-cygmon.exp,
	fr30-elf.exp, frv-elf.exp, frv-tiger.exp, frv-tomcat.exp,
	h8300-sim.exp, h8300.exp, i386-bozo.exp, i960-cyclone.exp,
	i960-sim.exp, m32r-elf.exp, m32r-linux-sim.exp, m32r-sid.exp,
	m32r-sim.exp, m68hc11-sim.exp, m68k-emc.exp, mips-idt.exp,
	mips64-sim.exp, mips64vr4100-sim.exp, mn10200-cygmon.exp,
	mn10300-cygmon.exp, msparc-cygmon.exp, op50n.exp, powerpc-bug.exp,
	powerpc-bug1.exp, rom68k-idp.exp, sh-hms.exp, sparclet-aout.exp,
	sparclite-coff.exp, sparclite-cygmon.exp, strongarm-cygmon.exp,
	tic80-sim.exp, tx39-dve.exp, usparc-cygmon.exp, vr4100-ddb.exp,
	vr4300-ddb.exp, vr4300.exp, vr5000-ddb.exp, x86-cygmon.exp,
	xscale-cygmon.exp: Remove.

86 files changed, 43 insertions, 5251 deletions

diff --git a/ChangeLog b/ChangeLog
index cf638b3..0cd4939 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,36 @@
+2016-03-23  Ben Elliston  <bje@gnu.org>
+
+	* Makefile.am (config_DATA): Update.
+	(baseboard_DATA): Likewise.
+	* Makefile.in: Regenerate.
+	* NEWS: Update.
+
+	Remove the following old config files:
+
+	* arc.exp, arm-ice.exp, base-config.exp, base68k.exp, bug.exp,
+	cfdbug.exp, cygmon.exp, d10v.exp, ddb-ether.exp, ddb.exp, dos.exp,
+	dve.exp, h8300.exp, i386-bozo.exp, i960.exp, m32r-stub.exp,
+	m32r.exp, m68hc11.exp, m68k-emc.exp, mips-idt.exp,
+	mn10200-eval.exp, mn10300-eval.exp, netware.exp, powerpc-bug.exp,
+	proelf.exp, rom68k.exp, sh.exp, slite.exp, sparclet.exp,
+	tic80.exp, vr4100.exp, vr4300.exp, vr5000.exp: Remove.
+
+	Remove the following old baseboard files:
+
+	* arc-sim.exp, arm-ice.exp, arm-sim.exp, cf.exp, cygmon.exp,
+	d10v-sim.exp, d10v.exp, danlite-elf.exp, dos.exp, fr30-cygmon.exp,
+	fr30-elf.exp, frv-elf.exp, frv-tiger.exp, frv-tomcat.exp,
+	h8300-sim.exp, h8300.exp, i386-bozo.exp, i960-cyclone.exp,
+	i960-sim.exp, m32r-elf.exp, m32r-linux-sim.exp, m32r-sid.exp,
+	m32r-sim.exp, m68hc11-sim.exp, m68k-emc.exp, mips-idt.exp,
+	mips64-sim.exp, mips64vr4100-sim.exp, mn10200-cygmon.exp,
+	mn10300-cygmon.exp, msparc-cygmon.exp, op50n.exp, powerpc-bug.exp,
+	powerpc-bug1.exp, rom68k-idp.exp, sh-hms.exp, sparclet-aout.exp,
+	sparclite-coff.exp, sparclite-cygmon.exp, strongarm-cygmon.exp,
+	tic80-sim.exp, tx39-dve.exp, usparc-cygmon.exp, vr4100-ddb.exp,
+	vr4300-ddb.exp, vr4300.exp, vr5000-ddb.exp, x86-cygmon.exp,
+	xscale-cygmon.exp: Remove.
+
 2016-03-22  Ben Elliston  <bje@gnu.org>
 
 	* lib/target.exp (only--Ls): Change '???' comment to a note. This
diff --git a/Makefile.am b/Makefile.am
index c423915..0edc809 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,45 +60,12 @@ config_DATA = \
 	config/README \
 	config/adb.exp \
 	config/aarch64-fv8.exp \
-	config/arc.exp \
-	config/arm-ice.exp \
-	config/base-config.exp \
-	config/base68k.exp \
-	config/bug.exp \
-	config/cfdbug.exp \
-	config/cygmon.exp \
-	config/d10v.exp \
-	config/ddb-ether.exp \
-	config/ddb.exp \
 	config/default.exp \
-	config/dos.exp \
-	config/dve.exp \
 	config/gdb-comm.exp \
 	config/gdb_stub.exp \
-	config/h8300.exp \
-	config/i386-bozo.exp \
-	config/i960.exp \
-	config/m32r-stub.exp \
-	config/m32r.exp \
-	config/m68hc11.exp \
-	config/m68k-emc.exp \
-	config/mips-idt.exp \
-	config/mn10200-eval.exp \
-	config/mn10300-eval.exp \
-	config/netware.exp \
-	config/powerpc-bug.exp \
-	config/proelf.exp \
-	config/rom68k.exp \
-	config/sh.exp \
 	config/sid.exp \
 	config/sim.exp \
-	config/slite.exp \
-	config/sparclet.exp \
-	config/tic80.exp \
 	config/unix.exp \
-	config/vr4100.exp \
-	config/vr4300.exp \
-	config/vr5000.exp \
 	config/vxworks.exp
 
 baseboarddir = $(pkgdatadir)/baseboards
@@ -106,51 +73,25 @@ baseboard_DATA = \
 	baseboards/README \
 	baseboards/androideabi.exp \
 	baseboards/am33_2.0-libremote.exp \
-	baseboards/arc-sim.exp \
-	baseboards/arm-ice.exp \
 	baseboards/arm-sid.exp \
-	baseboards/arm-sim.exp \
 	baseboards/basic-sid.exp \
 	baseboards/basic-sim.exp \
-	baseboards/cf.exp \
 	baseboards/cris-sim.exp \
-	baseboards/cygmon.exp \
 	baseboards/cygwin.exp \
-	baseboards/d10v-sim.exp \
-	baseboards/d10v.exp \
 	baseboards/d30v-sim.exp \
-	baseboards/danlite-elf.exp \
-	baseboards/dos.exp \
-	baseboards/fr30-cygmon.exp \
-	baseboards/fr30-elf.exp \
 	baseboards/fr30-sim.exp \
-	baseboards/frv-elf.exp \
 	baseboards/frv-sim.exp \
-	baseboards/frv-tiger.exp \
-	baseboards/frv-tomcat.exp \
 	baseboards/gdbserver-sample.exp \
-	baseboards/h8300-sim.exp \
-	baseboards/h8300.exp \
-	baseboards/i386-bozo.exp \
 	baseboards/i386-sid.exp \
-	baseboards/i960-cyclone.exp \
-	baseboards/i960-sim.exp \
 	baseboards/iq2000-sim.exp \
 	baseboards/jmr3904-sim.exp \
 	baseboards/linux-gdbserver.exp \
 	baseboards/linux-libremote.exp \
-	baseboards/m32r-elf.exp \
-	baseboards/m32r-linux-sim.exp \
-	baseboards/m32r-sid.exp \
-	baseboards/m32r-sim.exp \
-	baseboards/m68hc11-sim.exp \
-	baseboards/m68k-emc.exp \
 	baseboards/m68k-sid.exp \
 	baseboards/mcore-elf.exp \
 	baseboards/mcore-moto-sim.exp \
 	baseboards/mcore-pe.exp \
 	baseboards/mcore-sim.exp \
-	baseboards/mips-idt.exp \
 	baseboards/mips-lnews-sim.exp \
 	baseboards/mips-lsi-sim.exp \
 	baseboards/mips-sim-idt32.exp \
@@ -162,54 +103,31 @@ baseboard_DATA = \
 	baseboards/mips-sim-mti64_64.exp \
 	baseboards/mips-sim-sde32.exp \
 	baseboards/mips-sim-sde64.exp \
-	baseboards/mips64-sim.exp \
-	baseboards/mips64vr4100-sim.exp \
 	baseboards/mmixware-sim.exp \
-	baseboards/mn10200-cygmon.exp \
 	baseboards/mn10200-sim.exp \
-	baseboards/mn10300-cygmon.exp \
 	baseboards/mn10300-sim.exp \
-	baseboards/msparc-cygmon.exp \
 	baseboards/mt-sid.exp \
 	baseboards/multi-sim.exp \
-	baseboards/op50n.exp \
-	baseboards/powerpc-bug.exp \
-	baseboards/powerpc-bug1.exp \
 	baseboards/powerpc-sim.exp \
 	baseboards/powerpcle-sim.exp \
-	baseboards/rom68k-idp.exp \
 	baseboards/rx-sim.exp \
-	baseboards/sh-hms.exp \
 	baseboards/sh-sid.exp \
 	baseboards/sh-sim.exp \
 	baseboards/sparc-sim.exp \
 	baseboards/sparc64-sim.exp \
-	baseboards/sparclet-aout.exp \
-	baseboards/sparclite-coff.exp \
-	baseboards/sparclite-cygmon.exp \
 	baseboards/sparclite-sim-le.exp \
 	baseboards/sparclite-sim.exp \
-	baseboards/strongarm-cygmon.exp \
-	baseboards/tic80-sim.exp \
-	baseboards/tx39-dve.exp \
 	baseboards/tx39-sim.exp \
 	baseboards/unix.exp \
-	baseboards/usparc-cygmon.exp \
 	baseboards/v850-sim.exp \
 	baseboards/visium-sim.exp \
-	baseboards/vr4100-ddb.exp \
 	baseboards/vr4100-sim.exp \
 	baseboards/vr4111-sim.exp \
-	baseboards/vr4300-ddb.exp \
 	baseboards/vr4300-sim.exp \
-	baseboards/vr4300.exp \
-	baseboards/vr5000-ddb.exp \
 	baseboards/vx4300.exp \
 	baseboards/vx68k.exp \
 	baseboards/vx960.exp \
 	baseboards/vxsparc.exp \
-	baseboards/x86-cygmon.exp \
-	baseboards/xscale-cygmon.exp \
 	baseboards/xtensa-sim.exp
 
 djlibexecdir = $(pkgdatadir)/libexec
diff --git a/Makefile.in b/Makefile.in
index 2adebb3..b537624 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -401,45 +401,12 @@ config_DATA = \
 	config/README \
 	config/adb.exp \
 	config/aarch64-fv8.exp \
-	config/arc.exp \
-	config/arm-ice.exp \
-	config/base-config.exp \
-	config/base68k.exp \
-	config/bug.exp \
-	config/cfdbug.exp \
-	config/cygmon.exp \
-	config/d10v.exp \
-	config/ddb-ether.exp \
-	config/ddb.exp \
 	config/default.exp \
-	config/dos.exp \
-	config/dve.exp \
 	config/gdb-comm.exp \
 	config/gdb_stub.exp \
-	config/h8300.exp \
-	config/i386-bozo.exp \
-	config/i960.exp \
-	config/m32r-stub.exp \
-	config/m32r.exp \
-	config/m68hc11.exp \
-	config/m68k-emc.exp \
-	config/mips-idt.exp \
-	config/mn10200-eval.exp \
-	config/mn10300-eval.exp \
-	config/netware.exp \
-	config/powerpc-bug.exp \
-	config/proelf.exp \
-	config/rom68k.exp \
-	config/sh.exp \
 	config/sid.exp \
 	config/sim.exp \
-	config/slite.exp \
-	config/sparclet.exp \
-	config/tic80.exp \
 	config/unix.exp \
-	config/vr4100.exp \
-	config/vr4300.exp \
-	config/vr5000.exp \
 	config/vxworks.exp
 
 baseboarddir = $(pkgdatadir)/baseboards
@@ -447,51 +414,25 @@ baseboard_DATA = \
 	baseboards/README \
 	baseboards/androideabi.exp \
 	baseboards/am33_2.0-libremote.exp \
-	baseboards/arc-sim.exp \
-	baseboards/arm-ice.exp \
 	baseboards/arm-sid.exp \
-	baseboards/arm-sim.exp \
 	baseboards/basic-sid.exp \
 	baseboards/basic-sim.exp \
-	baseboards/cf.exp \
 	baseboards/cris-sim.exp \
-	baseboards/cygmon.exp \
 	baseboards/cygwin.exp \
-	baseboards/d10v-sim.exp \
-	baseboards/d10v.exp \
 	baseboards/d30v-sim.exp \
-	baseboards/danlite-elf.exp \
-	baseboards/dos.exp \
-	baseboards/fr30-cygmon.exp \
-	baseboards/fr30-elf.exp \
 	baseboards/fr30-sim.exp \
-	baseboards/frv-elf.exp \
 	baseboards/frv-sim.exp \
-	baseboards/frv-tiger.exp \
-	baseboards/frv-tomcat.exp \
 	baseboards/gdbserver-sample.exp \
-	baseboards/h8300-sim.exp \
-	baseboards/h8300.exp \
-	baseboards/i386-bozo.exp \
 	baseboards/i386-sid.exp \
-	baseboards/i960-cyclone.exp \
-	baseboards/i960-sim.exp \
 	baseboards/iq2000-sim.exp \
 	baseboards/jmr3904-sim.exp \
 	baseboards/linux-gdbserver.exp \
 	baseboards/linux-libremote.exp \
-	baseboards/m32r-elf.exp \
-	baseboards/m32r-linux-sim.exp \
-	baseboards/m32r-sid.exp \
-	baseboards/m32r-sim.exp \
-	baseboards/m68hc11-sim.exp \
-	baseboards/m68k-emc.exp \
 	baseboards/m68k-sid.exp \
 	baseboards/mcore-elf.exp \
 	baseboards/mcore-moto-sim.exp \
 	baseboards/mcore-pe.exp \
 	baseboards/mcore-sim.exp \
-	baseboards/mips-idt.exp \
 	baseboards/mips-lnews-sim.exp \
 	baseboards/mips-lsi-sim.exp \
 	baseboards/mips-sim-idt32.exp \
@@ -503,54 +444,31 @@ baseboard_DATA = \
 	baseboards/mips-sim-mti64_64.exp \
 	baseboards/mips-sim-sde32.exp \
 	baseboards/mips-sim-sde64.exp \
-	baseboards/mips64-sim.exp \
-	baseboards/mips64vr4100-sim.exp \
 	baseboards/mmixware-sim.exp \
-	baseboards/mn10200-cygmon.exp \
 	baseboards/mn10200-sim.exp \
-	baseboards/mn10300-cygmon.exp \
 	baseboards/mn10300-sim.exp \
-	baseboards/msparc-cygmon.exp \
 	baseboards/mt-sid.exp \
 	baseboards/multi-sim.exp \
-	baseboards/op50n.exp \
-	baseboards/powerpc-bug.exp \
-	baseboards/powerpc-bug1.exp \
 	baseboards/powerpc-sim.exp \
 	baseboards/powerpcle-sim.exp \
-	baseboards/rom68k-idp.exp \
 	baseboards/rx-sim.exp \
-	baseboards/sh-hms.exp \
 	baseboards/sh-sid.exp \
 	baseboards/sh-sim.exp \
 	baseboards/sparc-sim.exp \
 	baseboards/sparc64-sim.exp \
-	baseboards/sparclet-aout.exp \
-	baseboards/sparclite-coff.exp \
-	baseboards/sparclite-cygmon.exp \
 	baseboards/sparclite-sim-le.exp \
 	baseboards/sparclite-sim.exp \
-	baseboards/strongarm-cygmon.exp \
-	baseboards/tic80-sim.exp \
-	baseboards/tx39-dve.exp \
 	baseboards/tx39-sim.exp \
 	baseboards/unix.exp \
-	baseboards/usparc-cygmon.exp \
 	baseboards/v850-sim.exp \
 	baseboards/visium-sim.exp \
-	baseboards/vr4100-ddb.exp \
 	baseboards/vr4100-sim.exp \
 	baseboards/vr4111-sim.exp \
-	baseboards/vr4300-ddb.exp \
 	baseboards/vr4300-sim.exp \
-	baseboards/vr4300.exp \
-	baseboards/vr5000-ddb.exp \
 	baseboards/vx4300.exp \
 	baseboards/vx68k.exp \
 	baseboards/vx960.exp \
 	baseboards/vxsparc.exp \
-	baseboards/x86-cygmon.exp \
-	baseboards/xscale-cygmon.exp \
 	baseboards/xtensa-sim.exp
 
 djlibexecdir = $(pkgdatadir)/libexec
diff --git a/NEWS b/NEWS
index af4da0f..3d91284 100644
--- a/NEWS
+++ b/NEWS
@@ -2,20 +2,24 @@
 
 Changes since 1.5.3:
 
-1. The --status command line option is now the default. This means
+1. A large number of very old config and baseboard files have been
+   removed.  If you need to resurrect these, you can get them from
+   version 1.5.3.  If you can show that a board is still in use, it
+   can be put back in the distribution.
+2. The --status command line option is now the default. This means
    that any error in the testsuite Tcl scripts will cause runtest to
    abort with exit status code 2.
-2. runtest now exits with exit code 0 if the testsuite "passed", 1 if
+3. runtest now exits with exit code 0 if the testsuite "passed", 1 if
    something unexpected happened (eg, FAIL, XPASS or UNRESOLVED), and
    2 if an exception is raised by the Tcl interpreter.
-3. runtest now exits with the standard exit codes of programs that are
+4. runtest now exits with the standard exit codes of programs that are
    terminated by the SIGINT, SIGTERM and SIGQUIT signals.
-4. The user-visible utility procedures `absolute', `psource' and
+5. The user-visible utility procedures `absolute', `psource' and
    `slay' have been removed.  If a testsuite uses any of these
    procedures, a copy of the procedure should be made and placed in
    the lib directory of the testsuite.
-5. Support was added for testing the D compiler.
-6. ~/.dejagnurc is now loaded last, not first. This allows the user to
+6. Support was added for testing the D compiler.
+7. ~/.dejagnurc is now loaded last, not first. This allows the user to
    have the ability to override anything in their environment (even
    the site.exp file specified by $DEJAGNU).
 
diff --git a/baseboards/arc-sim.exp b/baseboards/arc-sim.exp
deleted file mode 100644
index 46056df..0000000
--- a/baseboards/arc-sim.exp
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# There is currently no ARC simulator.  This exists so gcc compile.exp testing
-# works.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {arc-elf}
-
-# Load the generic configuration for this board. This will define a basic set
-# of routines needed by the tool to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# "arc" is the name of the sim subdir.
-setup_sim arc
-
-# No multilib options needed by default.
-process_multilib_options ""
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags    "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags   "[libgloss_link_flags] [newlib_link_flags]"
-# No linker script needed.
-set_board_info ldscript ""
-
-# The simulator doesn't return exit statuses and we need to indicate this;
-# the standard GCC wrapper will work with this target.
-set_board_info needs_status_wrapper  1
-# Doesn't pass arguments or signals, can't return results, and doesn't
-# do inferiorio.
-set_board_info noargs 1
-set_board_info gdb,nosignals 1
-set_board_info gdb,noresults 1
-set_board_info gdb,noinferiorio 1
diff --git a/baseboards/arm-ice.exp b/baseboards/arm-ice.exp
deleted file mode 100644
index 4803b2d..0000000
--- a/baseboards/arm-ice.exp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines used to communicate with the board.
-load_generic_config "arm-ice"
-
-# No multilib flags needed by default.
-process_multilib_options ""
-
-if { [board_info $board obj_format] == "pe" } {
-    set additional_options "-Wl,-oformat,pe-arm-little,--image-base,0"
-} else {
-    set additional_options ""
-}
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler 	"[find_gcc]"
-# The basic set of flags needed to build "hello world" for this
-# board. This board uses libgloss and newlib.
-set_board_info cflags 	"[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags 	"[libgloss_link_flags] [newlib_link_flags] $additional_options"
-# This board doesn't use a linker script.
-set_board_info ldscript ""
-
-# Used by a few gcc.c-torture testcases to delimit how large the stack can
-# be.
-set_board_info gcc,stack_size  16384
-
-# We use "target rdi" to talk to the board.
-set_board_info gdb_protocol "rdi"
-
-# No support for signals.
-set_board_info gdb,nosignals 1
-
-# Make this variable go away, we don't need it.
-unset additional_options
-
-# Can't call functions from GDB.
-set_board_info gdb,cannot_call_functions 1
-
-# Or do I/O.
-set_board_info gdb,noinferiorio 1
-
-# Or have signals.
-set_board_info gdb,nosignals 1
-
-# Exit statuses are invalid.
-set_board_info exit_statuses_bad 1
diff --git a/baseboards/arm-sim.exp b/baseboards/arm-sim.exp
deleted file mode 100644
index f6f31ff..0000000
--- a/baseboards/arm-sim.exp
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines used to communicate with the board.
-load_generic_config "sim"
-
-# No multilib flags needed by default.
-process_multilib_options ""
-
-if { [board_info $board obj_format] == "pe" } {
-    set additional_options "-Wl,-oformat,pe-arm-little,--image-base,0"
-    #    set_board_info uses_underscores 1
-} else {
-
-    #    if [istarget "*-*-coff"] {
-    #        set_board_info uses_underscores 1
-    #    }
-
-    set additional_options ""
-}
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# The name of the directory in the build tree where the simulator lives.
-setup_sim arm
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler 	"[find_gcc]"
-
-# The basic set of flags needed to build "hello world" for this
-# board. This board uses libgloss and newlib.
-set_board_info cflags 	"[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags 	"[libgloss_link_flags] [newlib_link_flags] $additional_options"
-
-# This board doesn't use a linker script.
-set_board_info ldscript ""
-
-# The simulator doesn't return exit statuses and we need to indicate this.
-set_board_info needs_status_wrapper  1
-
-# Used by a few gcc.c-torture testcases to delimit how large the stack can
-# be.
-set_board_info gcc,stack_size  16384
-
-# No support for signals.
-set_board_info gdb,nosignals 1
-
-# More time is needed to compile PlumHall tests
-set_board_info gcc,timeout 800
-
-# Make this variable go away, we don't need it.
-unset additional_options
diff --git a/baseboards/cf.exp b/baseboards/cf.exp
deleted file mode 100644
index 9ee3684..0000000
--- a/baseboards/cf.exp
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {m68k-elf}
-
-# Load the generic configuration for this board. This will define any
-# routines needed by the tool to communicate with the board.
-load_generic_config "cfdbug"
-
-# Need -m5200 by default.
-process_multilib_options "-m5200"
-
-# The compiler used to build for this board. Note that this has nothing to do
-# with what compiler is tested when testing gcc.
-set_board_info compiler "[find_gcc]"
-
-set_board_info cflags "[newlib_include_flags] [libgloss_include_flags]"
-
-# Nasty hack.
-if { [board_info $board obj_format] == "a.out" } {
-    # Need to pass the start address to objcopy.
-    set_board_info use_vma_offset 1
-    # Wrapping has to be specially done for m68k-aout, for whatever reason.
-    set_board_info wrap_m68k_aout 1
-
-    set extra_m68k_ld_flags "-N"
-
-    # We need to tell GDB to load at the correct offset.
-    set_board_info gdb_load_offset [board_info $board hex_startaddr]
-} else {
-    set extra_m68k_ld_flags ""
-}
-
-set_board_info ldflags "$extra_m68k_ld_flags [libgloss_link_flags] [newlib_link_flags]"
-unset extra_m68k_ld_flags
-
-
-# If no output format is specified, use objcopy.
-if {![board_info $board exists output_format]} {
-    set tempfil [lookfor_file $tool_root_dir binutils/objcopy]
-    if { $tempfil != "" } {
-	set_board_info objcopy $tempfil
-    } else {
-	set_board_info objcopy [transform objcopy]
-    }
-    unset tempfil
-}
-
-# SBC5204 linker script.
-set_board_info ldscript "-Tsbc5204.ld"
-# The idt interface can't return exit statuses, so gcc (ctorture et
-# al) needs to do what it can to get them.
-set_board_info needs_status_wrapper 1
-
-# Used by a few gcc.c-torture testcases to delimit how large the stack can be.
-# The board has 192K of RAM.  We will set stack size to one third of that.
-set_board_info gcc,stack_size 65536
-
-# GDB needs to use "target dbug" to talk to the board.
-set_board_info gdb_protocol  "dbug"
-
-# Can't pass arguments to the program under test.
-set_board_info noargs 1
-
-# Nor can it do I/O in GDB.
-set_board_info gdb,noinferiorio 1
-
-# It has no signals.
-set_board_info gdb,nosignals 1
-
-# It can't return results when debugging with GDB.
-set_board_info gdb,noresults 1
-
-# Pseudo-random guess.
-set_board_info sys_speed_value 200
diff --git a/baseboards/cygmon.exp b/baseboards/cygmon.exp
deleted file mode 100644
index a81bc5f..0000000
--- a/baseboards/cygmon.exp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {sparc-elf sparc64-elf}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "cygmon"
-
-# It needs no multilib flags by default.
-process_multilib_options ""
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "-nostdlib [libgloss_link_flags] [newlib_link_flags] [board_info $board addl_link_flags]"
-
-# CygMON linker script.
-set_board_info ldscript "-Tcygmon.ld"
-
-# Standard remote protocol.
-set_board_info gdb_protocol "remote"
-# We can't do input in GDB (yet! HA!). It *will* do output, hurrah.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
-
-set_board_info shell_prompt "cygmon>"
-
-
-set_board_info use_gdb_stub 1
diff --git a/baseboards/d10v-sim.exp b/baseboards/d10v-sim.exp
deleted file mode 100644
index 652224d..0000000
--- a/baseboards/d10v-sim.exp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install  {d10v-elf}
-
-# Load the generic configuration for this board. This will define any
-# routines needed to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# The name of the simulator directory is "d10v".
-setup_sim d10v
-
-# No multilib options needed by default.
-process_multilib_options ""
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler  "[find_gcc]"
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info cflags  "[newlib_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags]"
-# No linker script needed.
-set_board_info ldscript ""
-
-# Can't pass arguments to programs on this target..
-set_board_info noargs  1
-# And there's no support for signals.
-set_board_info gdb,nosignals  1
-
-# Used by a few gcc.c-torture testcases to delimit how large the stack can
-# be.
-set_board_info gcc,stack_size  5000
-
-# Used by a few gcc.c-torture testcases when trampolines are used.
-set_board_info gcc,no_trampolines  1
-
-# Used by a few gcc.c-torture testcases when labels as values are used.
-set_board_info gcc,no_label_values  1
-
-# Torture test gcc.c-torture/execute/920501-6.c takes > 5 minutes on a
-# 90 Mhz Pentium, so up the time limit.
-set board_info($board,sim_time_limit) 600
-
-# sizeof int != sizeof long.
-set_board_info gdb,short_int 1
diff --git a/baseboards/d10v.exp b/baseboards/d10v.exp
deleted file mode 100644
index 87bbfc8..0000000
--- a/baseboards/d10v.exp
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {d10v-elf}
-
-# Load the generic configuration for this board. This will define a base set
-# of routines needed by the tool to communicate with the board.
-load_generic_config "d10v"
-
-# No multilib options are needed by default for this board.
-process_multilib_options ""
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info compiler "[find_gcc]"
-set_board_info cflags "[newlib_include_flags]"
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]"
-# No linker script needed.
-set_board_info ldscript ""
-
-# The board can't really return exit statuses and we need to indicate this;
-# however, the standard GCC wrapper won't work with this target because
-# it can't do I/O.
-#set_board_info needs_status_wrapper  1
-
-# It uses the remote stub protocol to talk to the board.
-set_board_info gdb_protocol  "remote"
-set_board_info use_gdb_stub  1
-
-# Both the EVA and TS3 boards currently deal badly with X packets.
-set_board_info disable_x_packet 1
-
-# Both the EVA and TS3 boards currently deal badly with Z packets.
-set_board_info disable_z_packet 1
-
-# Used by gdb-comm.
-set_board_info gdb_run_command  "jump *_start"
-set_board_info gdb,start_symbol  "_start"
-
-# Can't pass arguments to programs on this target.
-set_board_info noargs  1
-# And there's no support for signals.
-set_board_info gdb,nosignals  1
-# And it can't do I/O.
-set_board_info gdb,noinferiorio  1
-
-# Used by a few gcc.c-torture testcases to delimit how large the stack can
-# be.
-set_board_info gcc,stack_size  5000
-
-# Used by a few gcc.c-torture testcases when trampolines are used.
-set_board_info gcc,no_trampolines  1
-
-# Used by a few gcc.c-torture testcases when labels as values are used.
-set_board_info gcc,no_label_values  1
-
-# sizeof int != sizeof long.
-set_board_info gdb,short_int 1
-
-# Some d10v:ts3 boards are in ts2-board compatibility mode after a reset.
-# Force it into d10v:ts3 internal mode
-set_board_info gdb_init_command "set \$dmap2 = 0x2000"
diff --git a/baseboards/danlite-elf.exp b/baseboards/danlite-elf.exp
deleted file mode 100644
index 13eb439..0000000
--- a/baseboards/danlite-elf.exp
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {sparc86x-elf}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "slite"
-
-# It needs no multilib flags by default.
-process_multilib_options ""
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-
-set_board_info ldflags  "-nostartfiles [libgloss_link_flags] [newlib_link_flags]"
-
-# DANlite (sparc86x) linker script.
-set_board_info ldscript "-Tsparc86x.ld"
-
-# The address at which the stub needs to be linked.
-# set_board_info gdb_stub_offset "0x40000000"
-
-# The board doesn't return exit statuses and we need to indicate this.
-# However, the standard GCC wrapper won't work with this target because
-# it doesn't return stuff from printf ().
-set_board_info needs_status_wrapper 1
-
-# We use a GDB stub to talk to the board.
-set_board_info use_gdb_stub 1
-# For GDB, we need to use a real stub (not the separate loader scheme
-# we use for Sparclet).
-set_board_info gdb_stub  ""
-# And the protocol is "sparclite".
-set_board_info gdb_protocol "sparclite"
-# No mathlib.
-set_board_info mathlib  ""
-# We can't do I/O in GDB.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
diff --git a/baseboards/dos.exp b/baseboards/dos.exp
deleted file mode 100644
index 835db29..0000000
--- a/baseboards/dos.exp
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of the installed tools for this board. Of course,
-# we apparently don't create a compiler for this board, but...
-set_board_info target_install {i386-cygwin32}
-
-# Load the generic configuration for the board. This will define any routines
-# needed by the tool to communicate with the board.
-
-load_generic_config "dos"
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler "[find_gcc]"
-# The basic set of flags needed to build "hello world" for this
-# board. This target uses libgloss, libio and winsup.
-set_board_info cflags "[newlib_include_flags] [libio_include_flags] [winsup_include_flags]"
-set_board_info ldflags "[newlib_link_flags] [libio_link_flags] [winsup_link_flags]"
-# We don't need a link script.
-set_board_info ldscript ""
-
-set_board_info needs_status_wrapper 1
-
-set_board_info gdb_opts "--command gdbinit"
-set_board_info gdb,nointerrupts 1
diff --git a/baseboards/fr30-cygmon.exp b/baseboards/fr30-cygmon.exp
deleted file mode 100644
index fd7df90..0000000
--- a/baseboards/fr30-cygmon.exp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {fr30-elf}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "cygmon"
-
-# It needs no multilib flags by default.
-process_multilib_options ""
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags] [board_info $board addl_link_flags]"
-
-# CygMON linker script.
-set_board_info ldscript "-specs=eval1.specs"
-
-# Standard remote protocol.
-set_board_info gdb_protocol "remote"
-# We can't do input in GDB (yet! HA!). It *will* do output, hurrah.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info gdb,noargs  1
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
-
-set_board_info shell_prompt "cygmon>"
-
-set_board_info use_gdb_stub 1
diff --git a/baseboards/fr30-elf.exp b/baseboards/fr30-elf.exp
deleted file mode 100644
index 31f3a39..0000000
--- a/baseboards/fr30-elf.exp
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {fr30-elf}
-
-# No multilib flags needed by default.
-process_multilib_options ""
-
-# Load the generic configuration for this board. This will define a basic set
-# of routines needed by the tool to communicate with the board.
-if { $is_gdb_remote } {
-    load_generic_config "fr30-stub"
-} else {
-    load_generic_config "fr30"
-}
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags    "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags   "[libgloss_link_flags] [newlib_link_flags]"
-set_board_info ldscript  "-Teva.ld"
-set_board_info gdb,start_symbol "_start"
-
-set_board_info needs_status_wrapper 1
-
-# The GDB protocol used for this target.
-if { ! $is_gdb_remote } {
-    set_board_info gdb_protocol  "fr30"
-} else {
-    set_board_info gdb_protocol  "fr30"
-    set_board_info use_gdb_stub 1
-    set_board_info gdb_stub_ldscript "-Teva-stub.ld"
-}
-
-# Doesn't pass arguments or signals, can't return results, and doesn't
-# do inferiorio.
-set_board_info noargs 1
-set_board_info gdb,nosignals 1
-set_board_info gdb,noresults 1
-set_board_info gdb,noinferiorio 1
diff --git a/baseboards/frv-elf.exp b/baseboards/frv-elf.exp
deleted file mode 100644
index 44da336..0000000
--- a/baseboards/frv-elf.exp
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {frv-elf}
-
-# No multilib flags needed by default.
-process_multilib_options ""
-
-# Load the generic configuration for this board. This will define a basic set
-# of routines needed by the tool to communicate with the board.
-if { $is_gdb_remote } {
-    load_generic_config "frv-stub"
-} else {
-    load_generic_config "frv"
-}
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags    "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags   "[libgloss_link_flags] [newlib_link_flags]"
-set_board_info ldscript  "-Teva.ld"
-set_board_info gdb,start_symbol "_start"
-
-set_board_info needs_status_wrapper 1
-
-# The GDB protocol used for this target.
-if { ! $is_gdb_remote } {
-    set_board_info gdb_protocol  "frv"
-} else {
-    set_board_info gdb_protocol  "frv"
-    set_board_info use_gdb_stub 1
-    set_board_info gdb_stub_ldscript "-Teva-stub.ld"
-}
-
-# Doesn't pass arguments or signals, can't return results, and doesn't
-# do inferiorio.
-set_board_info noargs 1
-set_board_info gdb,nosignals 1
-set_board_info gdb,noresults 1
-set_board_info gdb,noinferiorio 1
diff --git a/baseboards/frv-tiger.exp b/baseboards/frv-tiger.exp
deleted file mode 100644
index 6c369f7..0000000
--- a/baseboards/frv-tiger.exp
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {frv-elf}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "cygmon"
-
-# -mcpu=tomcat is needed for the board.
-process_multilib_options ""
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags] [board_info $board addl_link_flags]"
-
-# CygMON linker script.
-set_board_info ldscript "-specs=tiger.specs"
-
-# Standard remote protocol.
-set_board_info gdb_protocol "remote"
-# We can't do input in GDB (yet! HA!). It *will* do output, hurrah.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info gdb,noargs  1
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
-
-set_board_info shell_prompt "cygmon>"
-
-set_board_info use_gdb_stub 1
-set_board_info gdb,do_reload_on_run 1
diff --git a/baseboards/frv-tomcat.exp b/baseboards/frv-tomcat.exp
deleted file mode 100644
index 69e2ea8..0000000
--- a/baseboards/frv-tomcat.exp
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {frv-elf}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "cygmon"
-
-# -mcpu=tomcat is needed for the board.
-process_multilib_options "-mcpu=tomcat"
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags] [board_info $board addl_link_flags]"
-
-# CygMON linker script.
-set_board_info ldscript "-specs=tomcat.specs"
-
-# Standard remote protocol.
-set_board_info gdb_protocol "remote"
-# We can't do input in GDB (yet! HA!). It *will* do output, hurrah.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info gdb,noargs  1
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
-
-set_board_info shell_prompt "cygmon>"
-
-set_board_info use_gdb_stub 1
-set_board_info gdb,do_reload_on_run 1
diff --git a/baseboards/h8300-sim.exp b/baseboards/h8300-sim.exp
deleted file mode 100644
index 2743ad7..0000000
--- a/baseboards/h8300-sim.exp
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install  {h8300-hms}
-
-# Load the tool-specific configuration for this board, as well as the
-# generic configuration. This will define any routines needed by the
-# tool to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# The name of the simulator is "h8300" (as in h8300-hms-run).
-setup_sim h8300
-
-# No multilib options are used by default.
-process_multilib_options ""
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler  "[find_gcc]"
-
-# We only support newlib on this target.
-set_board_info cflags  "[newlib_include_flags]"
-set_board_info ldflags  "[newlib_link_flags]"
-set_board_info uses_underscores 1
-
-# There's no support for argument-passing.
-set_board_info noargs 1
-# Nor does it have real signals.
-set_board_info gdb,nosignals 1
-# And it can't do I/O.
-set_board_info gdb,noinferiorio 1
-# Nor can it return results.
-set_board_info gdb,noresults 1
-
-# Limit the stack size to something real tiny.
-set_board_info gcc,stack_size 4096
-set_board_info gcc,text_size 60000
-
-# There's no long long support on this target
-set_board_info no_long_long  1
-
-# sizeof int != sizeof long.
-set_board_info gdb,short_int 1
diff --git a/baseboards/h8300.exp b/baseboards/h8300.exp
deleted file mode 100644
index 2e505de..0000000
--- a/baseboards/h8300.exp
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Load the tool-specific configuration for this board, as well as the
-# generic configuration. This will define any routines needed by the
-# tool to communicate with the board.
-load_generic_config "h8300"
-
-# Don't use anything by default.
-process_multilib_options ""
-
-# The default compiler for this target.
-set_board_info compiler "[find_gcc]"
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info cflags "[newlib_include_flags]"
-set_board_info ldflags "[newlib_link_flags]"
-
-# The GDB protocol used with this board.
-set_board_info gdb_protocol "remote"
-# It's running a GDB stub in ROM.
-set_board_info use_gdb_stub 1
-
-# There's no support for argument-passing.
-set_board_info noargs 1
-# Nor does it have real signals.
-set_board_info gdb,nosignals 1
-# And it can't do I/O.
-set_board_info gdb,noinferiorio 1
-# Nor can it return results.
-set_board_info gdb,noresults 1
-
-# Limit the stack size to something real tiny.
-set_board_info gcc,stack_size 4096
-
-# The board can get wedged in amusing and interesting ways.
-set_board_info unreliable 1
-
-# There's no long long support on this target
-set_board_info no_long_long  1
-
-# sizeof int != sizeof long.
-set_board_info gdb,short_int 1
-
-# Pick the right linker script if -mh/-ms is specified.
-
-set linker_script "h8300.ld"
-
-foreach x $board_variant_list {
-    regsub -all "^\[ \t\]*" "$x" "" x
-    regsub -all "\[ \t\]*$" "$x" "" x
-
-    switch -- $x {
-	"h" -
-	"-mh" { set linker_script "h8300h.ld" }
-
-	"s" -
-	"-ms" { set linker_script "h8300s.ld" }
-    }
-}
-
-# Whee, magic linker scripts hidden away.
-#
-# This one's dependent on the multilib options in use, sadly. And we
-# *need* a linker script. Really. Otherwise the code gets linked at
-# the wrong address and it won't run on the board.
-set_board_info ldscript "-T${prefix_dir}/h8300-hms/${linker_script}"
-
-unset linker_script
diff --git a/baseboards/i386-bozo.exp b/baseboards/i386-bozo.exp
deleted file mode 100644
index 535311f..0000000
--- a/baseboards/i386-bozo.exp
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Load the tool-specific configuration for this board, as well as the
-# generic configuration. This will define any routines needed by the
-# tool to communicate with the board.
-load_generic_config "i386-bozo"
-
-# Use no multilib options by default.
-process_multilib_options ""
-
-# Default to COFF.
-set add_flags ""
-if { [board_info $board obj_format] == "a.out" } {
-    set_board_info support_libs "${prefix_dir}/i386-aout/"
-    set_board_info gdb_load_offset "0x41000000"
-    set_board_info gdb_sect_offset "0x41000000"
-    set add_flags "-N "
-} elseif { [board_info $board obj_format] == "elf" } {
-    set_board_info support_libs "${prefix_dir}/i386-elf/"
-} else {
-    set_board_info support_libs "${prefix_dir}/i386-coff/"
-}
-
-# The default compiler for this target.
-set_board_info compiler "[find_gcc]"
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info cflags "[newlib_include_flags]"
-set_board_info ldflags "${add_flags}[newlib_link_flags] -B[board_info $board support_libs]"
-# Whee, magic linker scripts hidden away.
-set_board_info ldscript "-Tbozo.ld"
-
-# The GDB protocol used with this board.
-set_board_info gdb_protocol "remote"
-# It's running a GDB stub in ROM.
-set_board_info use_gdb_stub 1
-
-# There's no support for argument-passing.
-set_board_info noargs 1
-# Can't do input.
-set_board_info gdb,noinferiorio 1
-# Nor does it have real signals.
-set_board_info gdb,nosignals 1
-
-# Limit the stack size.
-set_board_info gcc,stack_size 16384
-
-# Status wrapper will work, although exit statuses are reliable.
-set_board_info needs_status_wrapper 1
-
-# This is the start symbol in crt0.o.
-set_board_info gdb,start_symbol "_start"
diff --git a/baseboards/i960-cyclone.exp b/baseboards/i960-cyclone.exp
deleted file mode 100644
index b4cfb09..0000000
--- a/baseboards/i960-cyclone.exp
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Danger, Will Robinson!  Settings in this file do not override
-# previous settings for the board being defined.
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "i960"
-
-# No multilib options needed by default.
-process_multilib_options ""
-
-# We want to strip executables before downloading them via xmodem.
-if {![board_info $board exists strip]} {
-    set tempfil [lookfor_file $tool_root_dir binutils/strip]
-    if { $tempfil != "" } {
-	set_board_info strip $tempfil
-    } else {
-	set_board_info strip [transform strip]
-    }
-    unset tempfil
-}
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info compiler "[find_gcc]"
-set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info start_addr 0xa0008000
-set_board_info ldflags "-Wl,-Ttext,[board_info $board start_addr] [libgloss_link_flags] [newlib_link_flags] -B${prefix_dir}/i960-coff/"
-# IDT linker script.
-set_board_info ldscript "-T${prefix_dir}/i960-coff/i960.ld"
-
-# GDB doesn't return exit statuses and we need to indicate this;
-# the standard GCC wrapper will work with this target.
-set_board_info needs_status_wrapper 1
-
-# The GDB protocol used with this board.
-set_board_info gdb_protocol "mon960"
-
-# Can't pass arguments to the program.
-set_board_info noargs 1
-
-# No support for signals.
-set_board_info gdb,nosignals 1
-
-set_board_info gdb_prompt "\\(gdb960\\)"
-
-# The board tends to be unreliable.
-set_board_info unreliable 1
diff --git a/baseboards/i960-sim.exp b/baseboards/i960-sim.exp
deleted file mode 100644
index 6352ddf..0000000
--- a/baseboards/i960-sim.exp
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# This tells it which directory to look in for the simulator.
-setup_sim i960
-
-# No multilib flags are set by default.
-# Set -msoft-float, because the simulator doesn't have FP support yet.
-process_multilib_options "-msoft-float"
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler "[find_gcc]"
-
-set_board_info cflags "-mka [libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]"
-
-# Use mon960.
-set_board_info ldscript "-Tmon960.ld"
-
-# And, it can't do arguments, and doesn't have real signals.
-set_board_info noargs 1
-set_board_info gdb,nosignals 1
diff --git a/baseboards/m32r-elf.exp b/baseboards/m32r-elf.exp
deleted file mode 100644
index bfa83f2..0000000
--- a/baseboards/m32r-elf.exp
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {m32r-elf}
-
-# No multilib flags needed by default.
-process_multilib_options ""
-
-# Load the generic configuration for this board. This will define a basic set
-# of routines needed by the tool to communicate with the board.
-if { $is_gdb_remote } {
-    load_generic_config "m32r-stub"
-} else {
-    load_generic_config "m32r"
-}
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags    "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags   "[libgloss_link_flags] [newlib_link_flags]"
-set_board_info ldscript  "-Teva.ld"
-set_board_info gdb,start_symbol "_start"
-
-set_board_info needs_status_wrapper 1
-
-# The GDB protocol used for this target.
-if { ! $is_gdb_remote } {
-    set_board_info gdb_protocol  "m32r"
-} else {
-    set_board_info gdb_protocol  "m32r"
-    set_board_info use_gdb_stub 1
-    set_board_info gdb_stub_ldscript "-Teva-stub.ld"
-}
-
-# Doesn't pass arguments or signals, can't return results, and doesn't
-# do inferiorio.
-set_board_info noargs 1
-set_board_info gdb,nosignals 1
-set_board_info gdb,noresults 1
-set_board_info gdb,noinferiorio 1
diff --git a/baseboards/m32r-linux-sim.exp b/baseboards/m32r-linux-sim.exp
deleted file mode 100644
index 5097df4..0000000
--- a/baseboards/m32r-linux-sim.exp
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {m32r-linux}
-
-# Load the generic configuration for this board. This will define a basic set
-# of routines needed by the tool to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# "m32r" is the name of the sim subdir.
-setup_sim m32r
-
-# No multilib options needed by default.
-process_multilib_options ""
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags    ""
-set_board_info ldflags   "-static"
-# No linker script needed.
-set_board_info ldscript ""
-
-# The simulator doesn't return exit statuses and we need to indicate this
-# the standard GCC wrapper will work with this target.
-set_board_info needs_status_wrapper  1
-# Doesn't pass arguments or signals, can't return results, and doesn't
-# do inferiorio.
-set_board_info noargs 1
-set_board_info gdb,nosignals 1
-set_board_info gdb,noresults 1
-set_board_info gdb,noinferiorio 1
diff --git a/baseboards/m32r-sid.exp b/baseboards/m32r-sid.exp
deleted file mode 100644
index 9417a3f..0000000
--- a/baseboards/m32r-sid.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {m32r-elf}
-set_board_info sim "m32r-elf-sid"
-
-# Load the generic configuration for this board. This will define a basic set
-# of routines needed by the tool to communicate with the board.
-load_generic_config "sid"
diff --git a/baseboards/m32r-sim.exp b/baseboards/m32r-sim.exp
deleted file mode 100644
index e8068c5..0000000
--- a/baseboards/m32r-sim.exp
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {m32r-elf}
-
-# Load the generic configuration for this board. This will define a basic set
-# of routines needed by the tool to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# "m32r" is the name of the sim subdir.
-setup_sim m32r
-
-# No multilib options needed by default.
-process_multilib_options ""
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags    "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags   "[libgloss_link_flags] [newlib_link_flags]"
-# No linker script needed.
-set_board_info ldscript ""
-
-# The simulator doesn't return exit statuses and we need to indicate this;
-# the standard GCC wrapper will work with this target.
-set_board_info needs_status_wrapper  1
-# Doesn't pass arguments or signals, can't return results, and doesn't
-# do inferiorio.
-set_board_info noargs 1
-set_board_info gdb,nosignals 1
-set_board_info gdb,noresults 1
-set_board_info gdb,noinferiorio 1
diff --git a/baseboards/m68hc11-sim.exp b/baseboards/m68hc11-sim.exp
deleted file mode 100644
index 0275d83..0000000
--- a/baseboards/m68hc11-sim.exp
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install  {m6811-elf}
-
-# Load the generic configuration for this board. This will define any
-# routines needed to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# The name of the simulator directory is "m68hc11".
-setup_sim m68hc11
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler  "[find_gcc]"
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]"
-
-# The GCC testsuite programs create quite large executables for the 68HC11.
-# We have to give enough room for the text section and we must make sure
-# that the data section does not overlay the 68HC11 IO registers. We could
-# relocate the IO registers but this would add some complexity to the crt0.
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags] -Wl,-Ttext,0x2000 -Wl,-Tdata,0x1100"
-# No linker script needed.
-set_board_info ldscript "-Wl,--script,sim-valid.x"
-
-# Can't pass arguments to programs on this target..
-set_board_info noargs  1
-# And there's no support for signals.
-set_board_info gdb,nosignals  1
-set_board_info gdb,skip_float_tests 1
-set_board_info gdb,nomalloc 1
-set_board_info gdb,nointerrupts 1
-# Don't do inferiorio
-#set_board_info gdb,noinferiorio 1
-
-# Data section is not installed by loading the program.  The data
-# section is installed at run time by the crt0 (copied from text/ROM
-# to RAM).
-set_board_info gdb,noloaddata 1
-
-# printf does not support %f, don't execute gdb tests that rely on this.
-set_board_info gdb,skip_float_tests 1
-
-# Disable the 68HC11 EEPROM to avoid problems with GCC testsuite
-# programs and map them in 0x8000..0xffff.
-set_board_info sim,options "--cpu-config=0xe"
-
-# Used by a few gcc.c-torture testcases to delimit how large the stack can
-# be.
-set_board_info gcc,stack_size  1024
-
-# Used by a few gcc.c-torture testcases when varargs are used (stdarg is ok).
-set_board_info gcc,no_varargs  1
-
-# Torture test gcc.c-torture/execute/920501-6.c takes about 300 seconds on a
-# 700 Mhz Pentium, so up the time limit.
-set board_info($board,sim_time_limit) 400
-
-set_board_info mathlib ""
-
-# The first -lbcc is here to get the small implementation of printf.
-# The second -lbcc provides the system calls (write, read) used in -lc.
-# The last -lc defines the __errno used in -lbcc.
-set_board_info libs "-lbcc -lc -lgcc -lc -lbcc"
-
-# sizeof int != sizeof long.
-set_board_info gdb,short_int 1
diff --git a/baseboards/m68k-emc.exp b/baseboards/m68k-emc.exp
deleted file mode 100644
index b81d1db..0000000
--- a/baseboards/m68k-emc.exp
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Load the generic configuration for this board. This will define any
-# routines needed by the tool to communicate with the board.
-load_generic_config "m68k-emc"
-
-# No multilib options by default.
-process_multilib_options ""
-
-# The compiler used to build for this board. Note that this has nothing to do
-# with what compiler is tested when testing gcc.
-set_board_info compiler "[find_gcc]"
-
-set_board_info cflags "[newlib_include_flags] [libgloss_include_flags]"
-
-set_board_info ldflags "-nostdlib [libgloss_link_flags] [newlib_link_flags]"
-
-# No linker script.
-set_board_info ldscript ""
-# The idt interface can't return exit statuses, so gcc (ctorture et
-# al) needs to do what it can to get them.
-set_board_info needs_status_wrapper 1
-
-# GDB needs to use "target remote" to talk to the board.
-set_board_info gdb_protocol  "remote"
-
-# Can't pass arguments to the program under test.
-set_board_info noargs 1
-
-# Nor can it do I/O in GDB.
-set_board_info gdb,noinferiorio 1
-
-# It has no signals.
-set_board_info gdb,nosignals 1
-
-# It can't return results when debugging with GDB.
-set_board_info gdb,noresults 1
diff --git a/baseboards/mips-idt.exp b/baseboards/mips-idt.exp
deleted file mode 100644
index 18b5b0d..0000000
--- a/baseboards/mips-idt.exp
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Load the generic configuration for this board. This will define any
-# routines needed by the tool to communicate with the board.
-load_generic_config "mips-idt"
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler "[find_gcc]"
-
-# We don't use any multilib options by default.
-process_multilib_options ""
-
-set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]"
-
-# Use idt.
-if { [board_info $board obj_format] == "ecoff" } {
-    set_board_info ldscript "-Tidtecoff.ld"
-} else {
-    set_board_info ldscript "-Tidt.ld"
-}
-
-# The idt interface can't return exit statuses, so gcc (ctorture et
-# al) needs to do what it can to get them.
-set_board_info needs_status_wrapper 1
-
-# GDB needs to use "target mips" to talk to the board.
-set_board_info gdb_protocol "mips"
-
-# And, it can't do arguments, and doesn't have real signals.
-set_board_info noargs 1
-set_board_info gdb,nosignals 1
diff --git a/baseboards/mips64-sim.exp b/baseboards/mips64-sim.exp
deleted file mode 100644
index 486fc5b..0000000
--- a/baseboards/mips64-sim.exp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {mips64vr4300-elf
-    mips64-elf}
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# This tells it which directory to look in for the simulator.
-setup_sim mips
-
-# No multilib flags are set by default.
-process_multilib_options ""
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler  "[find_gcc]"
-
-set_board_info cflags  "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags]"
-# PMON linker script.
-set_board_info ldscript  "-Tpmon.ld"
-
-# And, it can't do arguments or signals in GDB.
-set_board_info noargs  1
-set_board_info gdb,nosignals  1
diff --git a/baseboards/mips64vr4100-sim.exp b/baseboards/mips64vr4100-sim.exp
deleted file mode 100644
index f0f4268..0000000
--- a/baseboards/mips64vr4100-sim.exp
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is the name of the installed tools for this target.
-set target_install "mips64vr4100-elf"
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "sim"
-
-load_lib "libgloss.exp"
-
-# We need this for find_gcc and *_include_flags/*_link_flags.
-load_board_description "basic-sim"
-
-if {![info exists board_info($board,multilib_flags)]} {
-    set board_info($board,multilib_flags) "-mips16"
-}
-
-# This tells it which directory to look in for the simulator.
-setup_sim mips
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set board_info($board,compiler) "[find_gcc]"
-set board_info($board,cflags) "[libgloss_include_flags] [newlib_include_flags] [libio_include_flags]"
-set board_info($board,ldflags) "[libgloss_link_flags] [newlib_link_flags] [libio_link_flags]"
-# IDT linker script.
-set board_info($board,ldscript) "-Tidt.ld"
-
-# The simulator doesn't return exit statuses and we need to indicate this;
-# the standard GCC wrapper will work with this target.
-set board_info($board,needs_status_wrapper) 1
-set board_info($board,gdb,noargs) 1
-set_board_info gdb,nosignals 1
-set_board_info noargs 1
diff --git a/baseboards/mn10200-cygmon.exp b/baseboards/mn10200-cygmon.exp
deleted file mode 100644
index 18ac52f..0000000
--- a/baseboards/mn10200-cygmon.exp
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {mn10200-elf}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "mn10200-eval"
-
-# It needs no multilib flags by default.
-process_multilib_options ""
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags] [board_info $board addl_link_flags]"
-
-# CygMON linker script.
-set_board_info ldscript "-Teval.ld"
-
-# Standard remote protocol.
-set_board_info gdb_protocol "remote"
-# We can't do input in GDB (yet! HA!). It *will* do output, hurrah.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info gdb,noargs  1
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
-
-set_board_info shell_prompt "cygmon>"
-
-
-set_board_info use_gdb_stub 1
diff --git a/baseboards/mn10300-cygmon.exp b/baseboards/mn10300-cygmon.exp
deleted file mode 100644
index 59f51d2..0000000
--- a/baseboards/mn10300-cygmon.exp
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {mn10300-elf}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "mn10300-eval"
-
-# It needs no multilib flags by default.
-process_multilib_options ""
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags] [board_info $board addl_link_flags]"
-
-# CygMON linker script.
-set_board_info ldscript "-Teval.ld"
-
-if {[string compare [board_info $board boardtype] "asb2303"] == 0} {
-    set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags] [board_info $board addl_link_flags] -mno-crt0 -mam33-2"
-    set_board_info ldscript "-mam33-2 -Tasb2303.ld"
-}
-
-
-# Standard remote protocol.
-set_board_info gdb_protocol "remote"
-# We can't do input in GDB (yet! HA!). It *will* do output, hurrah.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info gdb,noargs  1
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
-
-set_board_info shell_prompt "cygmon>"
-
-
-set_board_info use_gdb_stub 1
diff --git a/baseboards/msparc-cygmon.exp b/baseboards/msparc-cygmon.exp
deleted file mode 100644
index 044e542..0000000
--- a/baseboards/msparc-cygmon.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_base_board_description "cygmon"
diff --git a/baseboards/op50n.exp b/baseboards/op50n.exp
deleted file mode 100644
index cea28a1..0000000
--- a/baseboards/op50n.exp
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Load the tool-specific configuration for this board, as well as the
-# generic configuration. This will define any routines needed by the
-# tool to communicate with the board.
-load_generic_config "proelf"
-
-# GDB needs to use "target op50n" to talk to the board.
-set_board_info gdb_protocol  "op50n"
-
-if {![board_info $board exists output_format]} {
-    set tempfil [lookfor_file $tool_root_dir binutils/objcopy]
-    if { $tempfil != "" } {
-	set_board_info objcopy $tempfil
-    } else {
-	set_board_info objcopy [transform objcopy]
-    }
-    unset tempfil
-}
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags]"
-# It's an op50n board.
-set_board_info ldscript  "-Top50n.ld"
-# The proelf interface has no way to return status information, so we
-# need to indicate this.
-set_board_info needs_status_wrapper  1
-
-# No support for signals.
-set_board_info gdb,nosignals 1
-# Nor can we do I/O.
-set_board_info gdb,noinferiorio 1
-
-# The monitor interface is really slow.
-set_board_info gdb,timeout 540
diff --git a/baseboards/powerpc-bug.exp b/baseboards/powerpc-bug.exp
deleted file mode 100644
index f37b565..0000000
--- a/baseboards/powerpc-bug.exp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "powerpc-bug"
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {powerpc-eabi}
-
-# We need mvme by default.
-process_multilib_options "mvme"
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler "[find_gcc]"
-
-set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]"
-
-# No linker script needed for this board.
-set_board_info ldscript ""
-
-# Can't pass arguments to programs on this target..
-set_board_info noargs 1
-# And there's no support for signals.
-set_board_info gdb,nosignals 1
-
-# GDB doesn't return exit statuses and we need to indicate this;
-# the standard GCC wrapper will work with this target.
-set_board_info needs_status_wrapper 1
-
-# The GDB protocol for this board is...
-set_board_info gdb_protocol "ppcbug"
diff --git a/baseboards/powerpc-bug1.exp b/baseboards/powerpc-bug1.exp
deleted file mode 100644
index 14c9675..0000000
--- a/baseboards/powerpc-bug1.exp
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This config uses ppcbug1 protocol in GDB.
-set_board_info gdb_protocol "ppcbug1"
-
-# But otherwise we're the same as powerpc-bug.
-load_base_board_description "powerpc-bug"
diff --git a/baseboards/rom68k-idp.exp b/baseboards/rom68k-idp.exp
deleted file mode 100644
index d05a74d..0000000
--- a/baseboards/rom68k-idp.exp
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {m68k-coff m68k-elf}
-
-# Load the generic configuration for this board. This will define any
-# routines needed by the tool to communicate with the board.
-load_generic_config "rom68k"
-
-# Need soft-float by default.
-process_multilib_options "-msoft-float"
-
-# The compiler used to build for this board. Note that this has nothing to do
-# with what compiler is tested when testing gcc.
-set_board_info compiler "[find_gcc]"
-
-set_board_info cflags "[newlib_include_flags] [libgloss_include_flags]"
-
-# Nasty hack.
-if { [board_info $board obj_format] == "a.out" } {
-    # Need to pass the start address to objcopy.
-    set_board_info use_vma_offset 1
-    # Wrapping has to be specially done for m68k-aout, for whatever reason.
-    set_board_info wrap_m68k_aout 1
-
-    set extra_m68k_ld_flags "-N -nostdlib "
-
-    # We need to tell GDB to load at the correct offset.
-    set_board_info gdb_load_offset [board_info $board hex_startaddr]
-} else {
-    set extra_m68k_ld_flags ""
-}
-
-set_board_info ldflags "$extra_m68k_ld_flags [libgloss_link_flags] [newlib_link_flags]"
-unset extra_m68k_ld_flags
-
-
-# If no output format is specified, use objcopy.
-if {![board_info $board exists output_format]} {
-    set tempfil [lookfor_file $tool_root_dir binutils/objcopy]
-    if { $tempfil != "" } {
-	set_board_info objcopy $tempfil
-    } else {
-	set_board_info objcopy [transform objcopy]
-    }
-    unset tempfil
-}
-
-# IDP linker script, with special console output routine for GDB.
-set_board_info ldscript "-Tidpgdb.ld"
-
-# The idt interface can't return exit statuses, so gcc (ctorture et
-# al) needs to do what it can to get them.
-set_board_info needs_status_wrapper 1
-
-# GDB needs to use "target rom68k" to talk to the board.
-set_board_info gdb_protocol  "rom68k"
-
-# Can't pass arguments to the program under test.
-set_board_info noargs 1
-
-# It has no signals.
-set_board_info gdb,nosignals 1
-
-# It can't return results when debugging with GDB.
-set_board_info gdb,noresults 1
-
-# Pseudo-random guess.
-set_board_info sys_speed_value 200
diff --git a/baseboards/sh-hms.exp b/baseboards/sh-hms.exp
deleted file mode 100644
index 1cd9c6e..0000000
--- a/baseboards/sh-hms.exp
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install  {sh-hms}
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "sh"
-
-# Default to SH2.
-process_multilib_options "-m2"
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler "[find_gcc]"
-
-# We only support newlib on this target.
-# However, we include libgloss so we can find the linker scripts.
-set_board_info cflags "[newlib_include_flags]"
-set_board_info ldflags "[newlib_link_flags] [libgloss_link_flags]"
-
-# Linker script for the SH2 board.
-set_board_info ldscript "-Tsh2lcevb.ld"
-
-# Can't pass arguments to this target.
-set_board_info noargs  1
-# And it can't call functions.
-set_board_info gdb,cannot_call_functions  1
-
-# We use the remote GDB protocol.
-set_board_info gdb_protocol "remote"
-# Jumping to start is how we get the program started in GDB.
-set_board_info gdb_run_command  "jump start"
-# The remote target uses a GDB stub.
-set_board_info use_gdb_stub 1
-# We can't do I/O.
-set_board_info gdb,noinferiorio  1
-# Or signals.
-set_board_info gdb,nosignals  1
-
-# Used by a few gcc.c-torture testcases to delimit how large the stack can
-# be.
-set_board_info gcc,stack_size  16384
-
-# Exit statuses returned from GDB are sometimes faulty.
-set_board_info exit_statuses_bad 1
-
-# Need to pass -mieee in order to for the compiler to be IEEE-fp compliant.
-set_board_info ieee_multilib_flags "-mieee"
diff --git a/baseboards/sparclet-aout.exp b/baseboards/sparclet-aout.exp
deleted file mode 100644
index b003449..0000000
--- a/baseboards/sparclet-aout.exp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {sparclet-aout}
-
-# Load the generic configuration for this board. This will define any
-# routines needed by the tool to communicate with the board,.
-load_generic_config "sparclet"
-
-# It needs broken-saverestore by default.
-process_multilib_options "-mbroken-saverestore"
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info compiler "[find_gcc]"
-set_board_info cflags "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags "-nostdlib [libgloss_link_flags] [newlib_link_flags] -Wl,-Ttext,0x12020000 -N"
-
-# tsc701 linker script.
-set_board_info ldscript "-Ttsc701.ld"
-
-# The board doesn't return exit statuses and we need to indicate this.
-# However, the standard GCC wrapper won't work with this target because
-# it doesn't return stuff from printf ().
-#set_board_info needs_status_wrapper 1
-
-# The monitor uses a GDB stub.
-set_board_info use_gdb_stub 1
-# The GDB protocol used to communicate with this board.
-set_board_info gdb_protocol "sparclet"
-# The offset in memory that we load programs.
-set_board_info gdb_load_offset "0x12020000"
-# And the place in memory where we load the stub.
-set_board_info gdb_stub_offset "0x12010000"
-# No mathlib.
-set_board_info mathlib ""
-# We can't do I/O in GDB.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info noargs 1
-
-set_board_info gcc,no_varargs 1
-set_board_info gcc,no_label_values 1
-
-# This is the old GDB prompt for the toolchain.
-# Uncomment for old tests
-set_board_info gdb_prompt "\\(gdb\\)"
-
-# We always have to set a breakpoint at exit(), instead of just _exit().
-set_board_info always_break_exit 1
diff --git a/baseboards/sparclite-coff.exp b/baseboards/sparclite-coff.exp
deleted file mode 100644
index dd28e9b..0000000
--- a/baseboards/sparclite-coff.exp
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {sparclite-coff}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "slite"
-
-# It needs no multilib flags by default.
-process_multilib_options ""
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "-nostdlib [libgloss_link_flags] [newlib_link_flags] -Wl,-Ttext,0x40005000 -N"
-
-# ex930 linker script.
-set_board_info ldscript "-Tex930.ld"
-
-# The address at which the stub needs to be linked.
-set_board_info gdb_stub_offset "0x40000000"
-
-# The board doesn't return exit statuses and we need to indicate this.
-# However, the standard GCC wrapper won't work with this target because
-# it doesn't return stuff from printf ().
-set_board_info needs_status_wrapper 1
-
-# We use a GDB stub to talk to the board.
-set_board_info use_gdb_stub 1
-# For GDB, we need to use a real stub (not the separate loader scheme
-# we use for Sparclet).
-set_board_info gdb_stub  ""
-# And the protocol is "sparclite serial".
-set_board_info gdb_protocol "sparclite serial"
-# No mathlib.
-set_board_info mathlib  ""
-# We can't do I/O in GDB.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
diff --git a/baseboards/sparclite-cygmon.exp b/baseboards/sparclite-cygmon.exp
deleted file mode 100644
index e6a0988..0000000
--- a/baseboards/sparclite-cygmon.exp
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-if { [board_info $board obj_format] == "a.out" }  {
-    set_board_info addl_link_flags "-N"
-    set_board_info gdb_load_offset "0x40050000"
-}
-
-load_base_board_description "cygmon"
diff --git a/baseboards/strongarm-cygmon.exp b/baseboards/strongarm-cygmon.exp
deleted file mode 100644
index 7d882b4..0000000
--- a/baseboards/strongarm-cygmon.exp
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {strongarm-elf}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "cygmon"
-
-# It needs no multilib flags by default.
-process_multilib_options ""
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags] [board_info $board addl_link_flags]"
-
-# CygMON linker script.
-
-if {[string compare [board_info $board boardtype] "sa1100dp"] == 0} {
-    set_board_info ldscript "-specs=sa1100dp.specs"
-} elseif {[string compare [board_info $board boardtype] "sa1100mm"] == 0} {
-    set_board_info ldscript "-specs=sa1100mm.specs"
-} elseif {[string compare [board_info $board boardtype] "sa-iop"] == 0} {
-    set_board_info ldscript "-specs=sa-iop.specs"
-} elseif {[string compare [board_info $board boardtype] "ebsa-285"] == 0} {
-    set_board_info ldscript "-specs=ebsa-285.specs"
-}
-
-# Standard remote protocol.
-set_board_info gdb_protocol "remote"
-# We can't do input in GDB (yet! HA!). It *will* do output, hurrah.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info gdb,noargs  1
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
-
-set_board_info shell_prompt "cygmon>"
-
-set_board_info use_gdb_stub 1
-set_board_info use_cygmon 1
diff --git a/baseboards/tic80-sim.exp b/baseboards/tic80-sim.exp
deleted file mode 100644
index f8320fc..0000000
--- a/baseboards/tic80-sim.exp
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "sim"
-
-# basic-sim.exp is a basic description for the standard Cygnus simulator.
-load_base_board_description "basic-sim"
-
-# This tells it which directory to look in for the simulator.
-setup_sim tic80
-
-# No multilib flags are set by default.
-process_multilib_options ""
-
-# The compiler used to build for this board. This has *nothing* to do
-# with what compiler is tested if we're testing gcc.
-set_board_info compiler "[find_gcc]"
-
-set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]"
-# No linker script is needed.
-# set_board_info ldscript ""
-
-# And, it can't do arguments, and doesn't have real signals.
-set_board_info noargs 1
-set_board_info gdb,nosignals 1
-
-# Used by a few gcc.c-torture testcases when trampolines are used.
-set_board_info gcc,no_varargs  1
diff --git a/baseboards/tx39-dve.exp b/baseboards/tx39-dve.exp
deleted file mode 100644
index d47378d..0000000
--- a/baseboards/tx39-dve.exp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {mips-tx39-elf mips-elf}
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-if { [board_info $board cygmon] == "yes" } {
-    load_generic_config "cygmon"
-} else {
-    load_generic_config "dve"
-}
-
-# It's a big-endian board.
-process_multilib_options "big-endian"
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info compiler "[find_gcc]"
-set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]"
-# DDB linker script.
-set_board_info ldscript "-Tdve.ld"
-
-# GDB doesn't return exit statuses and we need to indicate this;
-# the standard GCC wrapper will work with this target.
-set_board_info needs_status_wrapper 1
-
-# The GDB protocol used with this board.
-if { [board_info $board cygmon] == "yes" } {
-    set_board_info gdb_protocol "remote"
-} else {
-    set_board_info gdb_protocol "r3900"
-}
-
-# This is needed for compiling nullstone.
-set_board_info nullstone,lib "mips-clock.c"
-set_board_info nullstone,ticks_per_sec 3782018
-
-# Sometimes the board gets into a state where it always generates SIGFPE.
-#set_board_info unreliable 1
-
-# Can't pass arguments to the program.
-set_board_info noargs 1
-
-# No support for signals.
-set_board_info gdb,nosignals 1
-
-# We need to clear the floating-point status register before running.
-#set_board_info gdb_init_command "print/x \$fsr = 0x0"
diff --git a/baseboards/usparc-cygmon.exp b/baseboards/usparc-cygmon.exp
deleted file mode 100644
index ca747f3..0000000
--- a/baseboards/usparc-cygmon.exp
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_base_board_description "cygmon"
-
-set_board_info testcase_timeout 30
-
-proc ${board}_init { dest } {
-    global usparc_init_count
-    set shell_prompt [board_info $dest shell_prompt]
-
-    if {![info exists usparc_init_count]} {
-	set usparc_init_count 0
-    } else {
-	incr usparc_init_count
-	if { $usparc_init_count == 3 } {
-	    return -1
-	}
-
-    }
-    remote_close $dest
-    set shell_id [remote_open $dest]
-    if { $shell_id == "" || $shell_id < 0 } {
-	return [remote_reboot $dest]
-    } else {
-	remote_binary $dest
-	remote_send $dest "\n"
-	set got_one 0
-	remote_expect $dest 5 {
-	    -re "$shell_prompt" { set got_one 1; exp_continue }
-	    default {
-		if { ! $got_one } {
-		    remote_close $dest
-		    return [remote_reboot $dest]
-		}
-	    }
-	}
-    	remote_send $dest "m \[15\]1fff1001f00 32\n"
-	remote_expect $dest 5 {
-	    -re "$shell_prompt" {
-		unset usparc_init_count
-		remote_close $dest
-		return 0
-	    }
-	    default {
-		remote_close $dest
-		return [remote_reboot $dest]
-	    }
-	}
-    }
-}
diff --git a/baseboards/vr4100-ddb.exp b/baseboards/vr4100-ddb.exp
deleted file mode 100644
index 560a56a..0000000
--- a/baseboards/vr4100-ddb.exp
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {mips64vr4100-elf mips64-elf}
-
-# It's a little-endian board.
-process_multilib_options "-EL -msoft-float"
-
-set_board_info startaddr "a0020000"
-set_board_info hex_startaddr "0xa0020000"
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "vr4100"
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info compiler "[find_gcc]"
-set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]"
-# DDB linker script.
-set_board_info ldscript "-Tpmon.ld"
-
-# GDB doesn't return exit statuses and we need to indicate this;
-# the standard GCC wrapper will work with this target.
-set_board_info needs_status_wrapper 1
-
-# The GDB protocol used with this board.
-set_board_info gdb_protocol "ddb"
-
-set_board_info reboot_delay 10
-
-# This board is unreliable. If a test times out, the board should be
-# rebooted and the test re-run.
-set_board_info unreliable 1
diff --git a/baseboards/vr4300-ddb.exp b/baseboards/vr4300-ddb.exp
deleted file mode 100644
index 4b55581..0000000
--- a/baseboards/vr4300-ddb.exp
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Danger, Will Robinson!  Settings in this file do not override
-# previous settings for the board being defined.
-
-# DDB linker script.
-if { [board_info $board obj_format] == "ecoff" } {
-    set_board_info ldscript "-Tddbecoff.ld"
-} else {
-    set_board_info ldscript "-Tddb.ld"
-}
-
-# This is needed for compiling nullstone.
-set_board_info nullstone,lib "mips-clock.c"
-set_board_info nullstone,ticks_per_sec 3782018
-
-# The GDB protocol used with this board.
-set_board_info gdb_protocol "ddb"
-
-# Otherwise, we're the same as a generic vr4300 board.
-load_base_board_description "vr4300"
diff --git a/baseboards/vr4300.exp b/baseboards/vr4300.exp
deleted file mode 100644
index 5559a73..0000000
--- a/baseboards/vr4300.exp
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# Danger, Will Robinson!  Settings in this file do not override
-# previous settings for the board being defined.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {mips64vr4300-elf mips64-elf}
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "vr4300"
-
-# It's a little-endian board.
-process_multilib_options "little-endian"
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info compiler "[find_gcc]"
-set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]"
-# IDT linker script.
-set_board_info ldscript "-Tidt.ld"
-
-# GDB doesn't return exit statuses and we need to indicate this;
-# the standard GCC wrapper will work with this target.
-set_board_info needs_status_wrapper 1
-
-# The GDB protocol used with this board.
-set_board_info gdb_protocol "mips"
-
-# This board is unreliable. If a test times out, the board should be
-# rebooted and the test re-run.
-set_board_info unreliable 1
-
-# Can't pass arguments to the program.
-set_board_info noargs 1
-
-# No support for signals.
-set_board_info gdb,nosignals 1
-
-# We need to clear the floating-point status register before running.
-# This command will be sent after connecting to the board.
-set_board_info gdb_init_command "print/x \$fsr = 0x0"
diff --git a/baseboards/vr5000-ddb.exp b/baseboards/vr5000-ddb.exp
deleted file mode 100644
index 98b8d54..0000000
--- a/baseboards/vr5000-ddb.exp
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-# 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {mips64vr5000-elf mips64-elf}
-
-# Load the generic configuration for this board. This will define a basic
-# set of routines needed by the tool to communicate with the board.
-load_generic_config "vr5000"
-
-# It's a big-endian board.
-process_multilib_options "big-endian"
-
-# We only support newlib on this target. We assume that all multilib
-# options have been specified before we get here.
-set_board_info compiler "[find_gcc]"
-set_board_info cflags "[libgloss_include_flags] [newlib_include_flags]"
-set_board_info ldflags "[libgloss_link_flags] [newlib_link_flags]"
-# DDB linker script.
-set_board_info ldscript "-Tddb.ld"
-
-# GDB doesn't return exit statuses and we need to indicate this;
-# the standard GCC wrapper will work with this target.
-set_board_info needs_status_wrapper 1
-
-# The GDB protocol used with this board.
-set_board_info gdb_protocol "ddb"
-
-# This is needed for compiling nullstone.
-set_board_info nullstone,lib "mips-clock.c"
-set_board_info nullstone,ticks_per_sec 3782018
-
-# Sometimes the board gets into a state where it always generates SIGFPE.
-set_board_info unreliable 1
-
-# Can't pass arguments to the program.
-set_board_info noargs 1
-
-# No support for signals.
-set_board_info gdb,nosignals 1
-
-# We need to clear the floating-point status register before running.
-set_board_info gdb_init_command "print/x \$fsr = 0x0"
diff --git a/baseboards/x86-cygmon.exp b/baseboards/x86-cygmon.exp
deleted file mode 100644
index 461dc08..0000000
--- a/baseboards/x86-cygmon.exp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# 2004, 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_base_board_description "cygmon"
-
-# Default to ELF.
-if { [board_info $board obj_format] == "a.out" } {
-    set_board_info gdb,start_symbol "_start"
-} elseif { [board_info $board obj_format] == "coff" } {
-    set_board_info gdb,start_symbol "__start"
-} else {
-    set_board_info gdb,start_symbol "__start"
-}
diff --git a/baseboards/xscale-cygmon.exp b/baseboards/xscale-cygmon.exp
deleted file mode 100644
index 4f258ef..0000000
--- a/baseboards/xscale-cygmon.exp
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software
-# 2004, 2005, 2006, 2007, 2008, 2009, 2010 Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This is a list of toolchains that are supported on this board.
-set_board_info target_install {xscale-elf}
-
-# Load the generic configuration for this board. This will define a
-# set of generic routines used by the tool to communicate with the
-# board.
-load_generic_config "cygmon"
-
-# It needs no multilib flags by default.
-process_multilib_options ""
-
-set_board_info compiler  "[find_gcc]"
-set_board_info cflags  "[newlib_include_flags] [libgloss_include_flags]"
-set_board_info ldflags  "[libgloss_link_flags] [newlib_link_flags] [board_info $board addl_link_flags]"
-
-# CygMON linker script.
-
-if {[string compare [board_info $board boardtype] "xaret"] == 0} {
-    set_board_info ldscript "-specs=xaret.specs"
-} elseif {[string compare [board_info $board boardtype] "iq80310"] == 0} {
-    set_board_info ldscript "-specs=iq80310.specs"
-}
-
-# Standard remote protocol.
-set_board_info gdb_protocol "remote"
-# We can't do input in GDB (yet! HA!). It *will* do output, hurrah.
-set_board_info gdb,noinferiorio 1
-# Or pass arguments.
-set_board_info gdb,noargs  1
-set_board_info noargs 1
-# Or do signals.
-set_board_info gdb,nosignals 1
-
-set_board_info shell_prompt "cygmon>"
-
-set_board_info use_gdb_stub 1
-set_board_info use_cygmon 1
diff --git a/config/arc.exp b/config/arc.exp
deleted file mode 100644
index 72ba6dc..0000000
--- a/config/arc.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
diff --git a/config/arm-ice.exp b/config/arm-ice.exp
deleted file mode 100644
index 72ba6dc..0000000
--- a/config/arm-ice.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
diff --git a/config/base-config.exp b/config/base-config.exp
deleted file mode 100644
index 087ec13..0000000
--- a/config/base-config.exp
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-#
-# reboot_hook -- called to reboot a target board. Returns 1 on
-# success, 0 otherwise.
-#
-proc reboot_via_x10 { dest } {
-    if {[board_info $dest exists name]} {
-	set dest [board_info $dest name]
-    }
-
-    if {[board_info $dest exists x10]} {
-	set x10 [board_info $dest x10]
-	verbose "rebooting x10 unit $x10" 1
-	rsh_exec rtl "/usr/unsupported/bin/x10-hellcab unit $x10 off"
-	sleep 2
-	rsh_exec rtl "/usr/unsupported/bin/x10-hellcab unit $x10 on"
-	sleep 2
-	return 1
-    }
-    return 0
-}
-
-proc ${board}_reboot { args } {
-    if { [llength $args] > 0} {
-	set dest [lindex $args 0]
-    } else {
-	set dest target
-    }
-    return [reboot_via_x10 $dest]
-}
diff --git a/config/base68k.exp b/config/base68k.exp
deleted file mode 100644
index 75ef161..0000000
--- a/config/base68k.exp
+++ /dev/null
@@ -1,323 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file was written by Bob Manson (manson@cygnus.com)
-# based on earlier work by JT Conklin (jtc@cygnus.com)
-
-#
-# base68k_load -- load the program and execute it
-#
-
-proc base68k_ld { dest prog } {
-    global tmpdir
-
-    set shell_prompt [board_info $dest shell_prompt]
-
-    if {![file exists $prog]} then {
-	verbose -log "$prog does not exist."
-	return "untested"
-    }
-    if {[is_remote host]} {
-	set prog [remote_download host $prog]
-	if { $prog == "" } {
-	    verbose -log "Unable to download $prog to host."
-	    return "untested"
-	}
-    }
-
-    if {[board_info $dest exists objcopy]} {
-	set OBJCOPY [board_info $dest objcopy]
-	set exec_file "${prog}.srec"
-	set objcopy_args ""
-	if {[board_info $dest exists use_vma_offset]} {
-	    set objcopy_args "--adjust-vma=[board_info $dest hex_startaddr]"
-	}
-	set status [remote_exec host "$OBJCOPY $objcopy_args -O srec $prog ${prog}.srec"]
-	set result [lindex $status 1]
-	regsub -all -- "\[\r\n\]*" $result "" result
-	if { $result != ""  || [lindex $status 0] != 0 } {
-	    warning "Got \"$result\" from $OBJCOPY"
-	    verbose -log "Couldn't convert to srecord for downloading"
-	    remote_close $dest
-	    return "untested"
-	} else {
-	    verbose "Converted $prog to an srecord." 2
-	}
-    } else {
-	set exec_file $prog
-    }
-
-    set value 0
-    if {![board_info $dest exists fileid]} {
-	while { $value < 2 } {
-	    set rom68k_shell_id [remote_open $dest]
-	    if { $rom68k_shell_id < 0 } {
-		if { $value > 0 || ![remote_reboot $dest] } {
-		    verbose -log "$prog not executed, couldn't connect to target."
-		    return "untested"
-		}
-		incr value
-	    } else {
-		break
-	    }
-	}
-	# dbug has problems if we go into binary mode, so this allows us to
-	# disable entry into binary mode.
-	if {![board_info $dest exists no_binary_mode]} {
-	    remote_binary $dest
-	}
-    }
-
-    # if we built the srecord on a remote host, copy it back here so we
-    # can load it
-    if {[is_remote host]} {
-	global objdir
-	set exec_file [remote_upload host ${exec_file} "${objdir}/a.out"]
-    }
-
-    set got_p 0
-    for { set tries 0 } { (! $got_p) && $tries < 5 } { incr tries } {
-	remote_send $dest "\r\n\r\n"
-	remote_expect $dest 5 {
-	    -re "${shell_prompt}$" {
-		verbose "Got prompt."
-		set result 0
-		set got_p 1
-	    }
-	    timeout {
-		warning "Never got prompt."
-	    }
-	}
-	if { ! $got_p } {
-	    if { $tries <= 4 } then {
-		if { $tries == 3 } then {
-		    remote_reboot $dest
-		} else {
-		    remote_send $dest "\r\n"
-		}
-	    }
-	}
-    }
-
-    # We need to do this in case the connection to the remote side is
-    # scrogged -- the remote_expect above will fail in a lot of
-    # non-clean ways.
-    if { ! $got_p } {
-	remote_close $dest
-	remote_reboot $dest
-	return "unresolved"
-    } else {
-	# Flush out any remaining cruft.
-	remote_expect $dest 2 {
-	    timeout { }
-	    -re ".+" { exp_continue }
-	    default { }
-	}
-    }
-
-    if {[board_info $dest exists download_command]} {
-	# Load the program.
-	remote_send $dest "\r\n"
-	# dbug has problems sending download command immediately after a
-	# newline, so we wait for the prompt to come back first.
-	remote_expect $dest 5 {
-	    -re "${shell_prompt}$" {
-		verbose -log "Got prompt."
-	    }
-	    timeout {
-		warning "Never got prompt."
-	    }
-	}
-	remote_send $dest [board_info $dest download_command]
-	if {[board_info $dest exists download_response]} {
-	    remote_expect $dest 5 {
-		[board_info $dest download_response] { }
-		timeout {
-		    perror "Download command never responded."
-		    return "unresolved"
-		}
-	    }
-	}
-    }
-
-    verbose "Writing records to target..."
-    set status [remote_transmit $dest $exec_file]
-    if { $exec_file != $prog } {
-	remote_file build delete $exec_file
-    }
-    if { $status != 0 } {
-	remote_close $dest
-	verbose -log "Transmission of $exec_file to the target failed." 3
-	return "unresolved"
-    }
-    verbose "Wrote records to target...waiting for prompt."
-    remote_send $dest "\n"
-    set got_p 0
-    remote_expect $dest 50 {
-	-re "$shell_prompt$" {
-	    verbose "Got prompt."
-	    set got_p 1
-	}
-	timeout { }
-    }
-    if { $got_p } {
-	# Flush any remaining cruft. 2 seconds may be too long, dunno.
-	remote_expect $dest 2 {
-	    timeout { }
-	    -re ".+" { exp_continue }
-	    default { }
-	}
-	return "pass"
-    } else {
-	remote_close $dest
-	remote_reboot $dest
-	return "unresolved"
-    }
-
-}
-
-
-proc base68k_spawn { dest prog args } {
-    set shell_prompt [board_info $dest shell_prompt]
-
-    set result [remote_ld $dest $prog]
-    if { $result != "pass" } {
-	return [list $result ""]
-    }
-
-    if {[board_info $dest exists startaddr]} {
-	set go_command "[board_info $dest go_command] [board_info $dest startaddr]"
-    } else {
-	set go_command "[board_info $dest go_command]"
-    }
-
-    verbose "Sending $go_command, waiting for results."
-    remote_send $dest "${go_command}\n"
-    return { "pass" "" }
-}
-
-proc base68k_wait { dest timeout } {
-    set shell_prompt [board_info $dest shell_prompt]
-    set noappend 0
-    set result -1
-
-    set output ""
-
-    remote_expect $dest $timeout {
-	-re [board_info $dest go_response] {
-	    append output $expect_out(buffer)
-	    set noappend 1
-	    set result 0
-	    exp_continue -continue_timer
-	}
-	-re "$shell_prompt$" {
-	    verbose "Got prompt."
-	    set result 0
-	}
-	-re "\[\r\n\]+" {
-	    if { ! $noappend } {
-		append output $expect_out(buffer)
-		if { [string length $output] < 512000 } {
-		    exp_continue -continue_timer
-		} else {
-		    set result -1
-		}
-	    }
-	}
-	timeout {
-	    warning "Nothing ever came back."
-	    set result -1
-	}
-    }
-
-    if {[board_info $dest exists output_end]} {
-	regsub "[board_info $dest output_end]" "$output" "\n" output
-    }
-
-    # There has got to be a better way. (We need to do this in order to remove
-    # the echoed "go command".
-    if {[board_info $dest exists startaddr]} {
-	set go_command "[board_info $dest go_command] [board_info $dest startaddr]"
-    } else {
-	set go_command "[board_info $dest go_command]"
-    }
-
-    regsub "^.*$go_command\[\r\n\]*" "$output" "" output
-    regsub "^.*$go_command\[\r\n\]*" "$output" "" output
-
-    # We always want to check for a status, even if there was a funky weird
-    # failure above.
-    set status [check_for_board_status output]
-    if { $result == 0 } {
-	set result $status
-	verbose -log "exit status was $status"
-    }
-    # A negative value indicates that we should reboot. Otherwise, return
-    # the exit status from the program if we got one (and we should have).
-    return [list $result "$output"]
-}
-
-proc base68k_load { dest prog args } {
-    global base68k_retry
-
-    set shell_prompt [board_info $dest shell_prompt]
-
-    if { [llength $args] > 0 } {
-	for { set x 0 } { $x < [llength $args] } { incr x } {
-	    if { [lindex $args $x] != "" } {
-		verbose -log "Cannot pass parameters or input file to this target"
-		return [list "unsupported" ""]
-	    }
-	}
-    }
-
-    set result [remote_spawn $dest $prog]
-    if { [lindex $result 0] != "pass" } {
-	return $result
-    }
-
-    # FIXME: The value 360 below should be a parameter.
-
-    set result [remote_wait $dest 360]
-    set output [lindex $result 1]
-    set status [lindex $result 0]
-
-    verbose "output from board is $output"
-
-    # Make sure there's a newline before the PASS/FAIL/whatever for the log.
-    send_log "\n"
-
-    if { $status > 0 } {
-	return [list "fail" $output]
-    } elseif { $status == 0 } {
-	return [list "pass" $output]
-    } else {
-	if {[info exists base68k_retry]} {
-	    return [list "fail" $output]
-	}
-	set base68k_retry 1
-	remote_reboot $dest
-	set status [eval base68k_load \{$dest\} \{$prog\} $args]
-	unset base68k_retry
-	return $status
-    }
-}
-
-set_board_info protocol "base68k"
-set_board_info send_initial_cr 1
diff --git a/config/bug.exp b/config/bug.exp
deleted file mode 100644
index 46643dc..0000000
--- a/config/bug.exp
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file was written by Bob Manson (manson@cygnus.com).
-
-load_generic_config "base68k"
-
-set_board_info shell_prompt "\[0-9\]+Bug>"
-set_board_info download_command "lo 0\r"
-set_board_info download_response "lo 0.*"
-set_board_info go_command "go"
-set_board_info go_response "\*\*\*EXIT code.*"
-set_board_info startaddr "10000"
diff --git a/config/cfdbug.exp b/config/cfdbug.exp
deleted file mode 100644
index da8e4fa..0000000
--- a/config/cfdbug.exp
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file was written by Bob Manson (manson@cygnus.com).
-
-load_generic_config "base68k"
-
-set_board_info shell_prompt "dBUG> *"
-set_board_info download_command "dl\r\n"
-set_board_info download_response "*Escape to local*"
-set_board_info go_command "go"
-set_board_info go_response "\[*\]\[*\]\[*\] EXIT code \[^\r\n\]*\[\r\n\]"
-set_board_info startaddr "10000"
-set_board_info hex_startaddr "0x10000"
-set_board_info no_binary_mode 1
diff --git a/config/cygmon.exp b/config/cygmon.exp
deleted file mode 100644
index b37f780..0000000
--- a/config/cygmon.exp
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
-
-set_board_info send_initial_cr 1
diff --git a/config/d10v.exp b/config/d10v.exp
deleted file mode 100644
index 72ba6dc..0000000
--- a/config/d10v.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
diff --git a/config/ddb-ether.exp b/config/ddb-ether.exp
deleted file mode 100644
index 26597ea..0000000
--- a/config/ddb-ether.exp
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file was written by Bob Manson (manson@cygnus.com)
-
-# Reset the prompt to what GDB needs.
-proc ${board}_init { dest } {
-    global doing_ddb_init
-
-    if {![info exists doing_ddb_init]} {
-	set doing_ddb_init 1
-
-	remote_close $dest
-	for { set x 0 } { $x < 3 } { incr x } {
-	    set shell_id [remote_open $dest]
-	    if { $shell_id == "" || $shell_id < 0 } {
-		remote_reboot $dest
-	    } else {
-		break
-	    }
-	}
-
-	set shell_prompt [board_info $dest shell_prompt]
-
-	remote_send $dest "\n"
-	remote_expect $dest 10 {
-	    -re ".*PMON> $" {
-		remote_send $dest "set prompt \"$shell_prompt\"\n"
-		exp_continue
-	    }
-	    -re ".*${shell_prompt}$" { }
-	}
-	remote_close $dest
-	unset doing_ddb_init
-    } else {
-	return
-    }
-}
-
-proc ddb_ether_load { dest prog args } {
-    for { set x 0 } { $x < 3 } { incr x } {
-	set result [eval remote_spawn \{$dest\} \{$prog\} $args]
-	if { $result < 0 } {
-	    remote_reboot $dest
-	} else {
-	    set result [remote_wait $dest 300]
-	    set status [lindex $result 0]
-	    set output [lindex $result 1]
-	    if { $status >= 0 } {
-		if { $status > 0 } {
-		    return [list "fail" $output]
-		} else {
-		    return [list "pass" $output]
-		}
-	    }
-	}
-    }
-    return [list "fail" ""]
-}
-
-proc ddb_ether_ld { dest prog } {
-    if {![board_info $dest exists tftpdir]} {
-	perror "Must set_board_info tftpdir for [board_info $dest name]"
-	return "fail"
-    }
-
-    if {![board_info $dest exists fileid]} {
-	set spawn_id [remote_open $dest]
-	if { $spawn_id == "" || $spawn_id < 0 } {
-	    return "retry"
-	}
-	remote_binary $dest
-    }
-
-    set shell_prompt [board_info $dest shell_prompt]
-
-    remote_send $dest "\n"
-    remote_expect $dest 10 {
-	-re ".*${shell_prompt}$" { }
-	default {
-	    return "retry"
-	}
-    }
-    set basename "a.out.[pid]"
-    set file "[board_info $dest tftpdir]/$basename"
-    set file [remote_download build $prog $file]
-    if { $file == "" } {
-	perror "download to tftp area failed"
-	return "fail"
-    }
-    set state "pass"
-
-    remote_send $dest "boot /$basename\n"
-    set tries 0
-    remote_expect $dest 30 {
-	-re "Loading.*Entry address is.*${shell_prompt}$" { }
-	-re "invalid executable.*${shell_prompt}$" {
-	    incr tries
-	    if { $tries < 3 } {
-		sleep 2
-		remote_send $dest "boot /$basename\n"
-		exp_continue
-	    }
-	}
-	-re ".*${shell_prompt}$" {
-	    set state "fail"
-	}
-	default {
-	    set state "fail"
-	}
-    }
-    remote_file build delete $file
-    if { $state == "fail" } {
-	return $state
-    }
-    return "pass"
-}
-
-proc ddb_ether_spawn { dest prog args } {
-    set state [ddb_ether_ld $dest $prog]
-
-    if { $state != "pass" } {
-	return -1
-    }
-    remote_send $dest "g\n"
-    remote_expect $dest 5 {
-	-re "g\[\r\n\]\[\r\n\]?" { }
-	default { }
-    }
-
-    return [board_info $dest fileid]
-}
-
-proc ddb_ether_wait { dest timeout } {
-    set output ""
-    set shell_prompt [board_info $dest shell_prompt]
-
-    remote_expect $dest $timeout {
-	-re "^g\[\r\n\]\[\r\n\]?" {
-	    if { $output != "" } {
-		append output $expect_out(buffer)
-	    }
-	    exp_continue
-	}
-	-re "(.*)$shell_prompt" {
-	    append output $expect_out(1,string)
-	    set status [check_for_board_status output]
-	    if { $status > 0 } {
-		return [list $status $output]
-	    } else {
-		if {[regexp "Exception Cause=" $output]} {
-		    remote_reboot $dest
-		    return [list -1 $output]
-		}
-		return [list 0 $output]
-	    }
-	}
-	-re "\[\r\n\]+" {
-	    append output $expect_out(buffer)
-	    if { [string length $output] < 512000 } {
-		exp_continue
-	    } else {
-		return [list -1 ""]
-	    }
-	}
-	default {
-	    return [list -1 ""]
-	}
-    }
-}
-
-set_board_info send_initial_cr 1
-set_board_info protocol "ddb_ether"
-set_board_info shell_prompt "NEC010> "
diff --git a/config/ddb.exp b/config/ddb.exp
deleted file mode 100644
index 426f8ee..0000000
--- a/config/ddb.exp
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file was written by Bob Manson (manson@cygnus.com)
-
-# We use GDB to talk to a vr4300 board.
-load_generic_config "base68k"
-
-set_board_info shell_prompt "NEC010> "
-set_board_info download_command "load tty0\n"
-set_board_info download_response "Downloading from"
-set_board_info go_command "g -e"
-set_board_info startaddr "a0100000"
-set_board_info hex_startaddr "0xa0100000"
-set_board_info go_response "(^|\[\r\n\])(Exception Cause|\[0-9a-z\]+ \[0-9a-z\]+ break|\\*\\*\\*EXIT code )\[^\r\n\]*\[\r\n\]"
-set_board_info output_end "\[\r\n\](Exception Cause|\[0-9a-z\]+ \[0-9a-z\]+ break).*$"
-
-# Reset the prompt to what GDB needs.
-proc ${board}_init { dest } {
-    global doing_ddb_init
-    if {[is_remote host]} {
-	return
-    }
-
-    if {![info exists doing_ddb_init]} {
-	set doing_ddb_init 1
-
-	for { set i 1 } { $i <= 3 } { incr i } {
-	    remote_close $dest
-	    for { set x 0 } { $x < 3 } { incr x } {
-		set shell_id [remote_open $dest]
-		if { $shell_id == "" || $shell_id < 0 } {
-		    remote_reboot $dest
-		} else {
-		    break
-		}
-	    }
-
-	    set count 0
-	    remote_send $dest "\n"
-	    remote_expect $dest 20 {
-		-re ".*PMON> $" {
-		    remote_send $dest "set prompt \"NEC010> \"\n"
-		    exp_continue
-		}
-		-re "NEC010> $" {
-		    set i 10
-		}
-		timeout { }
-		-re "0x0" {
-		    incr count
-		    if(count<5) {
-			exp_continue
-		    }
-		}
-	    }
-	    if { $i < 3 }  {
-		remote_reboot $dest
-	    }
-	}
-	remote_close $dest
-	unset doing_ddb_init
-    } else {
-	return
-    }
-}
-
-set_board_info send_initial_cr  1
-set_board_info dont_wait_for_prompt 1
-
-# If no output format is specified, use objcopy.
-if {![board_info $board exists output_format]} {
-    set tempfil [lookfor_file $tool_root_dir binutils/objcopy]
-    if { $tempfil != "" } {
-	set_board_info objcopy $tempfil
-    } else {
-	set_board_info objcopy [transform objcopy]
-    }
-    unset tempfil
-}
diff --git a/config/dos.exp b/config/dos.exp
deleted file mode 100644
index ea447cf..0000000
--- a/config/dos.exp
+++ /dev/null
@@ -1,483 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file was written by Bob Manson (manson@cygnus.com)
-
-#
-# Open a connection to the remote DOS host.
-#
-proc dos_open { dest args } {
-    global destbat_num
-    global board_info
-
-    if {![info exists destbat_num]} {
-	set destbat_num [pid]
-    }
-    if { [board_info $dest conninfo] == "" } {
-	set name [board_info $dest name]
-
-	set board_info($name,conninfo) "b${destbat_num}.bat"
-	incr destbat_num
-    }
-
-    if {[board_info $dest exists fileid]} {
-	return [board_info $dest fileid]
-    }
-
-    verbose "doing a dos_open to $dest"
-
-    set shell_prompt [board_info $dest shell_prompt]
-
-    set shell_id [remote_raw_open $dest]
-
-    if { $shell_id == "" || $shell_id < 0 } {
-	return -1
-    }
-
-    if {[board_info $dest exists init_command]} {
-	remote_send $dest "[board_info $dest init_command]\n"
-	remote_expect $dest 10 {
-	    -re "$shell_prompt" { }
-	    default {
-		perror "failed connection to DOS on $dest."
-		return -1
-	    }
-	}
-    }
-
-    if {[board_info $dest exists ftp_directory]} {
-	set dir [board_info $dest ftp_directory]
-	regsub -all "/" "$dir" "\\" dir
-	remote_send $dest "cd $dir\n"
-	remote_expect $dest 10 {
-	    -re "$shell_prompt" { }
-	    default {
-		perror "failed connection to DOS on $dest."
-		return -1
-	    }
-	}
-    }
-
-    if {[board_info $dest exists dos_dir]} {
-	set dos_dir [board_info $dest dos_dir]
-	regsub -all "^(\[a-zA-Z]:).*$" "$dos_dir" "\\1" drive
-	regsub -all "^\[a-zA-Z]:" "$dos_dir" "" dos_dir
-	remote_send $dest "${drive}\n"
-	remote_expect $dest 10 {
-	    -re "$shell_prompt" { }
-	    default {
-		perror "failed connection to DOS on $dest."
-		return -1
-	    }
-	}
-	remote_send $dest "cd $dos_dir\n"
-	remote_expect $dest 10 {
-	    -re "$shell_prompt" { }
-	    default {
-		perror "failed connection to DOS on $dest."
-		return -1
-	    }
-	}
-    }
-
-    global target_alias
-    if {[info exists target_alias]} {
-	set talias $target_alias
-    } else {
-	set talias "foo-bar"
-    }
-
-    if {[board_info $dest exists name]} {
-	set n [board_info $dest name]
-    } else {
-	set n $dest
-    }
-    set board_info($n,fileid) $shell_id
-
-    if {[board_info $dest exists init_script]} {
-	remote_exec $dest "[board_info $dest init_script] $talias"
-    }
-
-    verbose "Succeeded in connecting to DOS."
-    return $shell_id
-}
-
-#
-# Close the connection to the remote host. If we're telnetting there, we
-# need to exit the connection first (ataman telnetd gets confused otherwise).
-#
-proc dos_close { dest args } {
-    if {[board_info $dest exists fileid]} {
-	if { [board_info $dest connect] == "telnet" } {
-	    remote_send $dest "exit\n"
-	    sleep 2
-	}
-	return [remote_raw_close $dest]
-    }
-}
-
-proc dos_prep_command { dest cmdline } {
-    global board_info
-
-    set name [board_info $dest name]
-    set shell_id [remote_open "$dest"]
-
-    set localbat "/tmp/b[pid].bat"
-    set remotebat [board_info $dest conninfo]
-
-    verbose "opened"
-    if { $shell_id != "" && $shell_id >= 0 } {
-	set fileid [open "$localbat" "w"]
-	puts -nonewline $fileid "@echo off\r\n$cmdline\r\nif errorlevel 1 echo *** DOSEXIT code 1\r\nif not errorlevel 1 echo *** DOSEXIT code 0\r\n"
-	close $fileid
-	set result [remote_download $dest $localbat $remotebat]
-    } else {
-	set result ""
-    }
-    remote_file build delete $localbat
-    return $result
-}
-
-#
-# Run CMDLINE on DESTHOST. We handle two cases; one is where we're at
-# a DOS prompt, and the other is where we're in GDB.
-# We run CMDLINE by creating a batchfile, downloading it, and then
-# executing it; this handles the case where the commandline is too
-# long for command.com to deal with.
-#
-
-proc dos_exec { dest program pargs inp outp } {
-    set cmdline "$program $pargs"
-
-    set shell_prompt [board_info $dest shell_prompt]
-
-    if { $inp != "" } {
-	set inp [remote_download $dest $inp inpfile]
-	if { $inp != "" } {
-	    set inp " < $inp"
-	}
-    }
-
-    if { $outp != "" } {
-	set outpf " > tempout"
-    }  else {
-	set outpf ""
-    }
-
-    verbose "cmdline is $cmdline$inp." 2
-
-    # Make a DOS batch file; we use @echo off so we don't have to see
-    # the DOS command prompts and such.
-    for { set i 0 } { $i < 2 } { incr i } {
-	set exit_status -1
-	verbose "calling open"
-	set batfile [dos_prep_command $dest "$cmdline$inp$outpf"]
-	if { $batfile != "" } {
-	    if { [dos_start_command $batfile $dest] == "" } {
-		# FIXME: The 300 below should be a parameter.
-		set result [remote_wait $dest 300]
-		set exit_status [lindex $result 0]
-		set output [lindex $result 1]
-	    }
-	}
-	if { $exit_status >= 0 } {
-	    if { $outp != "" } {
-		remote_upload $dest tempout $outp
-		remote_file $dest delete tempout
-	    }
-	    return [list $exit_status $output]
-	}
-	if { $exit_status != -2 } {
-	    remote_close $dest
-	    remote_reboot $dest
-	}
-    }
-    return [list -1 "program execution failed"]
-}
-
-#
-# Start CMDLINE executing on DEST.
-# There are two cases that we handle, one where we're at a DOS prompt
-# and the other is when the remote machine is running GDB.
-#
-
-proc dos_start_command { cmdline dest } {
-    set shell_prompt [board_info $dest shell_prompt]
-    set prefix ""
-    set ok 0
-    for { set i 0 } {$i <= 2 && ! $ok} { incr i } {
-	set shell_id [remote_open $dest]
-	if { $shell_id != "" && $shell_id > 0 } {
-	    remote_send $dest "echo k\r"
-	    remote_expect $dest 20 {
-		-re "\\(gdb\\)" {
-		    set shell_prompt "\\(gdb\\)"
-		    # gdb uses 'shell command'.
-		    set prefix "shell "
-		    set ok 1
-		}
-		-re "$shell_prompt" {
-		    set ok 1
-		}
-		default { }
-	    }
-	}
-	if { ! $ok } {
-	    remote_close $dest
-	    remote_reboot $dest
-	}
-    }
-    if { ! $ok } {
-	return "unable to start command"
-    } else {
-	remote_send $dest "${prefix}${cmdline}\n"
-	remote_expect $dest 2 {
-	    -re "${cmdline}\[\r\n\]\[\r\n\]?" { }
-	    timeout { }
-	}
-	return ""
-    }
-}
-
-#
-# Send STRING to DEST, translating all LFs to CRs first, and sending one
-# line at a time because of strangeness with telnet in some circumstances.
-#
-
-proc dos_send { dest string } {
-    verbose "Sending '$string' to $dest" 2
-    # Convert LFs to CRs, 'cause that is what DOS wants to see.
-    set first 1
-    set string [string trimright $string "\r\n"]
-    foreach line [split $string "\r\n"] {
-	if {$first} {
-	    set first 0
-	} else {
-	    # small delay between lines, to keep from
-	    # overwhelming the stupid telnet server.
-	    sleep 1.0
-	}
-	remote_raw_send $dest "$line\r"
-    }
-}
-
-#
-# Spawn PROGRAM on DEST, and return the spawn_id associated with the
-# connection; we can only spawn one command at a time.
-#
-
-proc dos_spawn { dest program args } {
-    verbose "running $program on $dest"
-    set remotebat [dos_prep_command $dest $program]
-
-    for { set x 0 } { $x < 3 } { incr x } {
-	if { [dos_start_command $remotebat $dest] == "" } {
-	    return [board_info $dest fileid]
-	}
-	remote_close $dest
-	remote_reboot $dest
-    }
-    return -1
-}
-
-proc dos_wait { dest timeout } {
-    set output ""
-    set shell_prompt [board_info $dest shell_prompt]
-    set status 1
-
-    verbose "waiting in dos_wait"
-    remote_expect $dest $timeout {
-	-re "(.*)\[*\]\[*\]\[*\] DOSEXIT code (\[0-9\]+)\[\r\n\]\[\r\n\]?" {
-	    verbose "got exit status"
-	    append output $expect_out(1,string)
-	    set status $expect_out(2,string)
-	    exp_continue
-	}
-
-	-re "(.*)${shell_prompt}" {
-	    append output $expect_out(1,string)
-	    verbose "output from dos is:'$output'"
-	    return [list $status $output]
-	}
-
-	-re "(.*)\\(gdb\\)" {
-	    append output $expect_out(1,string)
-	    return [list $status $output]
-	}
-
-	-re "In.*cygwin.*except" {
-	    remote_close $dest
-	    remote_reboot $dest
-	    return [list -2 $output]
-	}
-
-	-re "\[\r\n\]+" {
-	    # This is a bit obscure. We only want to put whole
-	    # lines into the output string, because otherwise we
-	    # might miss a prompt because we only got 1/2 of it the
-	    # first time 'round. The other tricky bit is that
-	    # expect_out(buffer) will contain everything before and including
-	    # the matched pattern.
-	    append output $expect_out(buffer)
-	    exp_continue -continue_timer
-	}
-
-	timeout {
-	    warning "timeout in dos_wait"
-	    if { [dos_interrupt_job $dest] == "" } {
-		return [list 1 $output]
-	    }
-	}
-
-	eof {
-	    warning "got EOF from dos host."
-	}
-    }
-
-    remote_close $dest
-
-    return [list -1 $output]
-}
-
-proc dos_load { dest prog args } {
-    global dos_dll_loaded
-    set progargs ""
-    set inpfile ""
-    if { [llength $args] > 0 } {
-	set progargs [lindex $args 1]
-    }
-    if { [llength $args] > 1 } {
-	set inpfile [lindex $args 1]
-    }
-    if {![info exists dos_dll_loaded]} {
-	if {![is_remote host]} {
-	    global target_alias
-
-	    set comp [get_multilibs]
-	    if {[file exists [file join ${comp} winsup new-cygwin1.dll]]} {
-		set dll "${comp}/winsup/new-cygwin1.dll"
-		set dll_name "cygwin1.dll"
-	    } elseif {[file exists [file join ${comp} winsup new-cygwin.dll]]} {
-		set dll "${comp}/winsup/new-cygwin.dll"
-		set dll_name "cygwin.dll"
-	    } elseif {[file exists [file join ${comp} lib cygwin1.dll]]} {
-		set dll "${comp}/lib/cygwin1.dll"
-		set dll_name "cygwin1.dll"
-	    } elseif {[file exists [file join ${comp} lib cygwin.dll]]} {
-		set dll "${comp}/lib/cygwin.dll"
-		set dll_name "cygwin.dll"
-	    } else {
-		error "couldn't find cygwin.dll:$comp"
-		return "fail"
-	    }
-	    remote_download $dest $dll $dll_name
-	}
-	set dos_dll_loaded 1
-    }
-    set remote_prog [remote_download $dest $prog "aout.exe"]
-    set result [remote_exec $dest $remote_prog $progargs $inpfile]
-    set status [lindex $result 0]
-    set output [lindex $result 1]
-    set status2 [check_for_board_status output]
-    if { $status2 >= 0 } {
-	set status $status2
-    }
-    if { $status != 0 } {
-	set status "fail"
-    } else {
-	set status "pass"
-    }
-    return [list $status $output]
-}
-
-proc dos_file { dest op args } {
-    switch $op {
-	delete {
-	    foreach x $args {
-		remote_exec $dest "del" "$x"
-	    }
-	    return
-
-	}
-	default {
-	    return [eval standard_file \{$dest\} \{$op\} $args]
-	}
-    }
-}
-
-#
-# Interrupt the current spawned command being run; the only tricky
-# part is that we have to handle the "Terminate batch job" prompt.
-#
-proc dos_interrupt_job { host } {
-    set shell_prompt [board_info $host shell_prompt]
-
-    remote_send $host "\003"
-    remote_expect $host 10 {
-	-re "Terminate batch job.*Y/N\[)\]\[?\] *$" {
-	    remote_send $host "n\n"
-	    exp_continue
-	}
-	-re "$shell_prompt" {
-	    return ""
-	}
-	-re ">" {
-	    remote_send $host "\n"
-	    exp_continue
-	}
-    }
-    return "fail"
-}
-
-proc dos_copy_download { host localfile remotefile } {
-    remote_file build delete "[board_info $host local_dir]/$remotefile"
-    if {[remote_file build exists $localfile]} {
-	set result [remote_download build $localfile "[board_info $host local_dir]/$remotefile"]
-	if { $result != "" } {
-	    remote_exec build "chmod" "a+rw $result"
-	    return $remotefile
-	}
-    } else {
-	return ""
-    }
-}
-
-proc dos_copy_upload { host remotefile localfile } {
-    remote_file build delete $localfile
-    if {[file exists [file join [board_info $host local_dir] $remotefile]]} {
-	set result [remote_download build "[board_info $host local_dir]/$remotefile" $localfile]
-    } else {
-	set result ""
-    }
-    if { $result != "" } {
-	remote_exec build "chmod" "a+rw $result"
-	return $result
-    }
-}
-
-proc dos_copy_file { dest op args } {
-    if { $op == "delete" } {
-	set file "[board_info $dest local_dir]/[lindex $args 0]"
-	remote_file build delete $file
-    }
-}
-
-set_board_info protocol  "dos"
-set_board_info shell_prompt  "(^|\[\r\n\])\[a-zA-Z\]:\[^\r\n\]*>\[ \t\]*$"
-set_board_info needs_status_wrapper 1
diff --git a/config/dve.exp b/config/dve.exp
deleted file mode 100644
index 07e8793..0000000
--- a/config/dve.exp
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# For Densan MIPS boards we use gdb to load and execute programs.
-
-load_generic_config "gdb-comm"
diff --git a/config/h8300.exp b/config/h8300.exp
deleted file mode 100644
index 72ba6dc..0000000
--- a/config/h8300.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
diff --git a/config/i386-bozo.exp b/config/i386-bozo.exp
deleted file mode 100644
index a0f4ccb..0000000
--- a/config/i386-bozo.exp
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
-
-proc ${board}_init { args } {
-    set linux_box [target_info linux_box]
-    set bozo_server [target_info bozo_server]
-    remote_spawn $linux_box "$bozo_server unknown"
-    remote_expect $linux_box 60 {
-	-re "port is (\[0-9\]+)" {
-	    set_currtarget_info netport "${linux_box}:$expect_out(1,string)"
-	}
-    }
-}
-
-proc ${board}_close { board } {
-    set linux_box [board_info $board linux_box]
-    if {[board_info $linux_box exists fileid]} {
-	remote_send $linux_box "\003"
-	remote_close $linux_box
-    }
-    standard_close $board
-}
-
-proc ${board}_reboot { board args } {
-    remote_close $board
-    unset_currtarget_info netport
-    return 1
-}
diff --git a/config/i960.exp b/config/i960.exp
deleted file mode 100644
index 5715fe7..0000000
--- a/config/i960.exp
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-#
-# Initialize the board on initial connection or after rebooting.
-# Since the board autobauds, we have to be a bit aggressive about
-# getting a valid prompt.
-#
-proc ${board}_init { dest } {
-    global i960_try_count
-
-    set prompt [board_info $dest shell_prompt]
-    set done 0
-
-    if {![info exists i960_try_count]} {
-	set i960_try_count 1
-    }
-
-    remote_close $dest
-    if { [remote_open $dest] != "" } {
-	for { set tries 0 } { $tries < 7 && ! $done } { incr tries } {
-	    remote_send $dest "\n"
-	    remote_expect $dest 1 {
-		-re "${prompt}" {
-		    set done 1
-		}
-		-re ".+" { exp_continue }
-		timeout { }
-	    }
-	}
-    }
-
-    remote_close $dest
-    if { ! $done } {
-	if { $i960_try_count == 3 } {
-	    perror "Couldn't connect to board."
-	} else {
-	    incr i960_try_count
-	    remote_close $dest
-	    remote_reboot $dest
-	}
-    }
-    if {[info exists i960_try_count]} {
-	unset i960_try_count
-    }
-}
-
-proc i960_ld { dest prog } {
-    if {![file exists $prog]} {
-	perror "$prog does not exist."
-        return "untested"
-    }
-    set shell_prompt [board_info $dest shell_prompt]
-    set strip [board_info $dest strip]
-    set rprog [remote_download host $prog a.out]
-    if { $strip != "" } {
-	remote_exec host $strip $rprog
-    }
-    remote_upload host $rprog a.out
-
-    set id [remote_open $dest]
-    if { $id < 0 } {
-	return -1
-    }
-    remote_binary $dest
-    remote_send $dest "\n"
-    remote_expect $dest 5 {
-	-re $shell_prompt { }
-    }
-    remote_send $dest "do\n"
-    remote_expect $dest 5 {
-	-re "Downloading" { }
-    }
-    # Nasty.
-    if { [board_info $dest connect] == "telnet" } {
-	global board_info
-
-	remote_close $dest
-	set hp [split [board_info $dest netport] ":"]
-	set host [lindex $hp 0]
-	set port [lindex $hp 1]
-	set status -1
-	while { $status != 0 } {
-	    set status [catch "socket $host $port" id2]
-	    if { $status != 0 } {
-		sleep 5
-	    }
-	}
-    } else {
-	set id2 [exp_open -leaveopen -i $id]
-    }
-    if {[catch "exec sx -bX a.out <@$id2 >@$id2 2>/dev/null" error]} {
-	perror "exec sx failed: $error"
-    }
-    if { [board_info $dest connect] == "telnet" } {
-	close $id2
-	sleep 2
-	remote_open $dest
-	remote_binary $dest
-    }
-    set result 1
-    remote_send $dest "\n"
-    remote_expect $dest 1 {
-	-re "$shell_prompt" {
-	    set result 0
-	    exp_continue
-	}
-	timeout { }
-    }
-    return $result
-}
-
-proc i960_spawn { dest prog args } {
-    set shell_prompt [board_info $dest shell_prompt]
-
-    for { set tries 0 } { $tries < 3 } { incr tries } {
-	set result [remote_ld $dest $prog]
-	if { $result == 0 } {
-	    set comm "go [board_info $dest start_addr]"
-	    remote_send $dest "$comm\n"
-	    remote_expect $dest 10 {
-		-re "$comm\[\r\n\]\[\r\n\]?" { }
-		default { }
-	    }
-	    return [board_info $dest fileid]
-	} else {
-	    remote_reboot $dest
-	}
-    }
-    return -1
-}
-
-proc i960_wait { dest timeout } {
-    set output ""
-    set shell_prompt [board_info $dest shell_prompt]
-    set status -1
-
-    remote_expect $dest $timeout {
-	-re " fault at \[0-9a-h\]+, subtype \[0-9a-h\]+" {
-	    set status -1
-	    exp_continue
-	}
-	-re "(.*)(\[\r\n\]|^)Program Exit: (\[0-9\]+)\[\r\n\]" {
-	    append output $expect_out(1,string)
-	    set status $expect_out(3,string)
-	    exp_continue
-	}
-	-re "(.*)$shell_prompt" {
-	    append output $expect_out(1,string)
-	    set bstatus [check_for_board_status output]
-	    if { $bstatus >= 0 } {
-		set status $bstatus
-	    }
-	}
-	-re "\[\r\n\]+" {
-	    # Sometimes the board goes wacky in the head, and we have
-	    # to shoot it.
-	    append output $expect_out(buffer)
-	    if { [string length $output] < 512000 } {
-		exp_continue
-	    } else {
-		set status -1
-	    }
-	}
-	default {
-	    set status -1
-	}
-    }
-    return [list $status $output]
-}
-
-proc i960_load { dest prog args } {
-    for { set x 0 } { $x < 3 } { incr x } {
-	set id [eval remote_spawn \{$dest\} \{$prog\} $args]
-	if { $id < 0 } {
-	    return [list "fail" ""]
-	}
-	set result [remote_wait $dest 120]
-	set status [lindex $result 0]
-	set output [lindex $result 1]
-
-	if { $status == 0 } {
-	    return [list "pass" $output]
-	} else {
-	    global i960_retry
-
-	    if { [board_info $dest exists unreliable] && ![info exists i960_retry] } {
-		set i960_retry 1
-		remote_reboot $dest
-		set result [eval i960_load \{$dest\} \{$prog\} $args]
-		unset i960_retry
-		return $result
-	    } else {
-		if { $status < 0 } {
-		    remote_reboot $dest
-		}
-		return [list "fail" $output]
-	    }
-	}
-    }
-}
-
-set_board_info shell_prompt "=>"
-set_board_info send_initial_cr 1
-# We take care of getting a prompt in ${board}_init.
-set_board_info dont_wait_for_prompt 1
diff --git a/config/m32r-stub.exp b/config/m32r-stub.exp
deleted file mode 100644
index 17016bc..0000000
--- a/config/m32r-stub.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb_stub"
diff --git a/config/m32r.exp b/config/m32r.exp
deleted file mode 100644
index 72ba6dc..0000000
--- a/config/m32r.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
diff --git a/config/m68hc11.exp b/config/m68hc11.exp
deleted file mode 100644
index 72ba6dc..0000000
--- a/config/m68hc11.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
diff --git a/config/m68k-emc.exp b/config/m68k-emc.exp
deleted file mode 100644
index 546360d..0000000
--- a/config/m68k-emc.exp
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-proc ${board}_init { dest } {
-    global doing_emc_init
-
-    if {[info exists doing_emc_init]} {
-	return
-    }
-    set doing_emc_init 1
-    remote_close $dest
-    set dos_host [board_info $dest dos_host]
-    remote_reboot $dos_host
-    unset doing_emc_init
-}
-
-proc m68k_emc_board_connect { dest } {
-    global board_info
-    set tname [board_info $dest name]
-
-    set board_info($tname,m68k_connected) 1
-    set dos_host [board_info $dest dos_host]
-
-    for { set x 0 } { $x < 3 } { incr x } {
-	set shell_id [remote_open $dos_host]
-	if { $shell_id == "" || $shell_id < 0 } {
-	    remote_reboot $dos_host
-	} else {
-	    break
-	}
-    }
-    remote_send $dos_host "c:\\symetrix.bat\n"
-    remote_expect $dos_host 300 {
-	-re "SymmComm.*Installed.*\033.2J.*\033.2J" { }
-	default {
-	    warning "Never got clear screen sequence from remote side."
-	}
-    }
-    # Flush the buffer.
-    remote_expect $dos_host 2 {
-	-re ".+" { exp_continue }
-    }
-    # Get past first menu.
-    remote_send $dos_host "\n"
-    remote_expect $dos_host 10 {
-	-re "\033.07;02H" { }
-	default { }
-    }
-    # We don't want a log file.
-    remote_send $dos_host "\n"
-    remote_expect $dos_host 10 {
-	-re "\033.02;24H" { }
-	default { }
-    }
-}
diff --git a/config/mips-idt.exp b/config/mips-idt.exp
deleted file mode 100644
index 06921fc..0000000
--- a/config/mips-idt.exp
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# For MIPS/IDT we use gdb to load and execute programs.
-
-load_generic_config "gdb-comm"
-
-set_board_info gdb_init_command "set syn-garbage-limit 0"
diff --git a/config/mn10200-eval.exp b/config/mn10200-eval.exp
deleted file mode 100644
index 7225fc9..0000000
--- a/config/mn10200-eval.exp
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# For MN10200 evaluation boards we use gdb to load and execute programs.
-
-load_generic_config "gdb-comm"
diff --git a/config/mn10300-eval.exp b/config/mn10300-eval.exp
deleted file mode 100644
index 2acc439..0000000
--- a/config/mn10300-eval.exp
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# For MN10300 evaluation boards we use gdb to load and execute programs.
-
-load_generic_config "gdb-comm"
diff --git a/config/netware.exp b/config/netware.exp
deleted file mode 100644
index 6c0866e..0000000
--- a/config/netware.exp
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file was written by J.T. Conklin. (jtc@cygnus.com)
-
-#
-# load support libraries
-#
-load_lib remote.exp
-
-# set target variables only if needed
-
-proc ${board}_init { args } {
-    global NLMCONV
-
-    # FIXME: rootme is undefined.
-    if {![info exists NLMCONV]} then {
-	set NLMCONV [findfile "$rootme/../binutils/nlmconv"]
-    }
-    global LD
-    if {![info exists LD]} then {
-	set LD [findfile "$rootme/../ld/ld-new" "$rootme/../ld/ld-new" [transform "ld"]]
-    }
-
-    set shell_prompt "Password:"
-    set shell_id [remote_open target]
-    if {[target_info exists passwd]} {
-	set passwd [target_info passwd]
-    } else {
-	set passwd ""
-    }
-    if {$shell_id < 0} then {
-	warning "Couldn't connect to target"
-	return -1
-    }
-
-    if {[string match "" $passwd]} then {
-	stty -echo
-	send_user "Password: "
-	expect_user -re "(.*)\n"
-	send_user "\n"
-	set passwd "$expect_out(1,string)"
-	stty echo
-    }
-
-    send -i $shell_id "$passwd\n"
-    expect {
-	-i $shell_id ":" {
-	    verbose "Got termtype prompt" 0
-	}
-
-	-i $shell_id timeout {
-	    warning "Connection timed out"
-	    return -1
-	}
-    }
-
-    # FIXME
-    set shell_prompt "[string toupper [target_info name]]:"
-    send -i $shell_id "1\n"
-
-    expect {
-	-i $shell_id -re "$shell_prompt" {}
-	-i $shell_id timeout {
-	    warning "Connection timed out"
-	    return -1
-	}
-    }
-}
-
-
-#
-# ${board}_load -- load the program and execute it
-#
-# See default.exp for explanation of arguments and results.
-#
-
-proc ${board}_load { dest prog args } {
-    global LD NLMCONV
-    global tmpdir
-    global errorCode
-
-    if {[board_info $dest exists fileid]} {
-	set shell_id [board_info $dest fileid]
-    } else {
-	set shell_id -1
-    }
-
-    set output ""
-
-    if {$shell_id < 0} then {
-	verbose -log "$prog not executed because there is no target" 3
-	return "untested"
-    }
-
-    #
-    set exe [file tail $prog]
-
-    # We can't blindly append a suffix to the object name, because the
-    # result may not be valid on netware's 8.3 filesystem.
-    #
-    # FIXME: tmpdir is undefined.
-    set nlm "$tmpdir/x.nlm"
-    set lnk "$tmpdir/x.lnk"
-
-    # build *.lnk file
-    set fd [open $lnk w]
-    puts $fd "description \"$exe\""
-    puts $fd "screenname \"System Console\""
-    puts $fd "module clib.nlm"
-    puts $fd "module mathlib.nlm"
-    puts $fd "stack 65536"
-    puts $fd "debug"
-    # FIXME: don't hardcode location of prelude.o
-    puts $fd "input /s1/cygnus/dejagnu/i386-netware/lib/prelude.o"
-    puts $fd "input $prog"
-    puts $fd "output $nlm"
-    close $fd
-
-    # run nlmconv
-    verbose "Executing: $NLMCONV -l$LD -T$lnk" 1
-    catch "exec $NLMCONV -l$LD -T$lnk" output
-    if {![string match "" $output]} then {
-	verbose $output 1
-    }
-    if {![string match "NONE" $errorCode]} {
-	verbose -log "Can't link $prog" 3
-	return "fail"
-    }
-
-    # download
-    verbose "Downloading $nlm" 1
-    catch "exec cp $nlm /.NetWare/[board_info $dest name].nws/sys.nwv/tmp/x.nlm" output
-    if {![string match "" $output]} then {
-	verbose $output 1
-	verbose -log "cp failed for $nlm" 3
-	return "unresolved"
-    }
-
-    # Wait a second for the file to "settle" on the NetWare server.
-    # I've encountered unexplained failures without this delay.
-    #    sleep 1
-
-
-    # The NetWare remote console expects to be connected to a vt100
-    # compatible terminal.  It isn't very efficent, and it seems to
-    # send screen repaints for no reason.  So we have to clear the
-    # screen as we run each test, otherwise a shell prompt or abort
-    # message from a previous test could cause incorrect results.
-    send -i $shell_id "CLS\r\n"
-    set timeout 1
-    expect {
-	-i $shell_id -re "$shell_prompt" {
-	    exp_continue
-	}
-    }
-    set timeout 10
-
-
-    # Netware does not support exit status.  The best we can do to
-    # detect failures is to look for the "ABNORMAL NLM TERMINATION"
-    # message printed by abort().
-    set ret 0
-    send -i $shell_id "LOAD X.NLM\r\n"
-    expect {
-	-i $shell_id "ABNORMAL NLM TERMINATION" {
-	    set ret 1
-	    exp_continue
-	}
-	-i $shell_id "Unable to find load file" {
-	    perror "Couldn't execute program"
-	    verbose -log "Couldn't execute program" 3
-	    return "unresolved"
-	}
-	-i $shell_id timeout {
-	    perror "Couldn't execute program (timed out)"
-	    verbose -log "Couldn't execute program (timed out)" 3
-	    return "unresolved"
-	}
-	-i $shell_id -re "[format "%sLOAD" $shell_prompt]" {
-	    exp_continue
-	}
-	-i $shell_id -re "$shell_prompt" {}
-    }
-
-    catch [file delete -force -- $lnk $nlm]
-
-    if { $ret == 0 } {
-	return "pass"
-    } else {
-	return "fail"
-    }
-}
-
-#
-# ${tool}_exit -- shutdown the connection
-#
-
-proc ${board}_exit {} {
-    remote_close target
-}
diff --git a/config/powerpc-bug.exp b/config/powerpc-bug.exp
deleted file mode 100644
index 72ba6dc..0000000
--- a/config/powerpc-bug.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
diff --git a/config/proelf.exp b/config/proelf.exp
deleted file mode 100644
index da32e8a..0000000
--- a/config/proelf.exp
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "base68k"
-set_board_info shell_prompt "#"
-set_board_info download_command "r 0\n"
-set_board_info go_command "g"
-set_board_info startaddr "40000"
-
-set_board_info go_response "\[\r\n\]+\[a-z \]+\\(\[0-9\]+\\) pc=\[0-9A-Ha-h\]+\[\r\n\]+\[0-9A-H\]+ \[0-9A-H\]+ \[^\r\n\]+\[\r\n\]+|\\*\\*\\*EXIT code "
-set_board_info output_end "\[\r\n\]+\[a-z \]+\\(\[0-9\]+\\) pc=\[0-9A-Ha-h\]+\[\r\n\]+.*$"
diff --git a/config/rom68k.exp b/config/rom68k.exp
deleted file mode 100644
index a6c113b..0000000
--- a/config/rom68k.exp
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file was written by Bob Manson (manson@cygnus.com)
-# based on earlier work by J.T. Conklin (jtc@cygnus.com)
-
-load_generic_config "base68k"
-
-set_board_info shell_prompt "ROM68K :-> "
-set_board_info download_command "DC\n"
-set_board_info download_response "Waiting for S-records from host... "
-set_board_info go_command "GO"
-set_board_info startaddr "10000"
-set_board_info hex_startaddr "0x10000"
-set_board_info go_response "(Emul|RS Except|TRAP #\[1-9\]|\\*\\*\\*EXIT code ).*"
-set_board_info output_end "\[\r\n\]((\[^\r\n\]*\[\r\n\]-----*)|Emul|RS Except|TRAP #|Bus/Address).*$"
diff --git a/config/sh.exp b/config/sh.exp
deleted file mode 100644
index 72ba6dc..0000000
--- a/config/sh.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb-comm"
diff --git a/config/slite.exp b/config/slite.exp
deleted file mode 100644
index 17016bc..0000000
--- a/config/slite.exp
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-load_generic_config "gdb_stub"
diff --git a/config/sparclet.exp b/config/sparclet.exp
deleted file mode 100644
index 7864d07..0000000
--- a/config/sparclet.exp
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# This file was written by Michael Snyder <msnyder@cygnus.com>.
-
-load_generic_config "gdb_stub"
-
-# This is the old GDB prompt for the toolchain.
-# Uncomment for old tests
-#set_board_info gdb_prompt "\\(gdbslet\\)"
diff --git a/config/tic80.exp b/config/tic80.exp
deleted file mode 100644
index d9e37d0..0000000
--- a/config/tic80.exp
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-#
-# Nasty ugly stuff.
-#
-# We have to maintain two connections to the DOS box where the board
-# is being held. One of them runs an I/O monitor process, while the other
-# is used to actually start the program under test running on the board.
-#
-
-proc tic80_load { dest prog args } {
-    set dos_box [board_info $dest dos_host]
-
-    remote_spawn $dos_box [board_info $dest io_program]
-
-    set status [remote_ld $dest $prog]
-
-    if { $status != "pass" } {
-	return $status
-    }
-
-    set result [remote_wait $dos_box 300]
-    set output [lindex $result 1]
-    if { [lindex $result 0] < 0 } {
-	if {[board_info $dos_box exists fileid]} {
-	    dos_interrupt_job $dos_box
-	} else {
-	    remote_close $dos_box
-	}
-    }
-
-    set status "fail"
-    regsub "(\\*\\*\\* EXIT code \[0-9\]+\[\r\n]+).*$" "$output" "\\1" output
-    verbose "board out is $output"
-    set bstatus [check_for_board_status output]
-    if { [lindex $result 0] >= 0 } {
-	if { $bstatus == 0 } {
-	    set status "pass"
-	}
-    }
-    remote_file build delete "a.fix"
-    return [list $status $output]
-}
-
-proc tic80_ld { dest prog } {
-    set dos_box [board_info $dest dos_host]
-    set dopush 0
-
-    if { [remote_swap_conn $dos_box] == "fail" } {
-	if { [remote_push_conn $dos_box] == "fail" } {
-	    set dopush 1
-	}
-	remote_open $dos_box
-    }
-    set prog [remote_download $dos_box $prog "a.fix"]
-
-    remote_spawn $dos_box "[board_info $dest start_program] $prog"
-    remote_expect $dos_box 10 {
-	-re "file\[(\]s\[)\] copied" {}
-    }
-    sleep 3
-    dos_interrupt_job $dos_box
-    if { $dopush } {
-	remote_push_conn $dos_box
-    } else {
-	remote_swap_conn $dos_box
-    }
-    return "pass"
-}
-#
-# Close the connection to the DOS box.
-#
-proc tic80_close { host } {
-    set dos_box [board_info $host dos_host]
-
-    return [remote_close $dos_box]
-}
-
-set_board_info protocol "tic80"
-set_board_info gdb,use_standard_load 1
-set_board_info gdb,no_push_conn 1
-set_board_info gdb,do_reload_on_run 1
-set_board_info gdb,use_breakpoint_for_stub 1
diff --git a/config/vr4100.exp b/config/vr4100.exp
deleted file mode 100644
index e1e384f..0000000
--- a/config/vr4100.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# We're using a ddb monitor.
-load_generic_config "ddb"
diff --git a/config/vr4300.exp b/config/vr4300.exp
deleted file mode 100644
index e1e384f..0000000
--- a/config/vr4300.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# We're using a ddb monitor.
-load_generic_config "ddb"
diff --git a/config/vr5000.exp b/config/vr5000.exp
deleted file mode 100644
index d28a36c..0000000
--- a/config/vr5000.exp
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
-# 2002, 2003, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This file is part of DejaGnu.
-#
-# DejaGnu is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-#
-# DejaGnu is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with DejaGnu; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
-
-# We're using a ddb monitor, but we want to use the ethernet to load files.
-load_generic_config "ddb-ether"