diff --git a/binutils/testsuite/config/abug.exp b/binutils/testsuite/config/abug.exp
deleted file mode 100644
index d71e3e9c283..00000000000
--- a/binutils/testsuite/config/abug.exp
+++ /dev/null
@@ -1,45 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@prep.ai.mit.edu
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-load_lib util-defs.exp
-
-#
-# nm_version -- extract and print the version number of nm
-#
-proc nm_version { } {
-    set tmp [exec $NM +version]
-    regexp " \[0-9\.\]+" $tmp version
-    clone_output "[which $NM] version $version\n"
-    unset tmp
-    unset version
-}
-
-#
-# add some basic error trapping. These mostly catch programming error's
-# within the tests themselves
-#
-expect_before {
-    buffer_full		   { error "internal buffer is full." }
-    "can't open '*'" { error "Can't open test file." }
-}
-
-
-
diff --git a/binutils/testsuite/config/aout.exp b/binutils/testsuite/config/aout.exp
deleted file mode 100644
index d71e3e9c283..00000000000
--- a/binutils/testsuite/config/aout.exp
+++ /dev/null
@@ -1,45 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@prep.ai.mit.edu
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-load_lib util-defs.exp
-
-#
-# nm_version -- extract and print the version number of nm
-#
-proc nm_version { } {
-    set tmp [exec $NM +version]
-    regexp " \[0-9\.\]+" $tmp version
-    clone_output "[which $NM] version $version\n"
-    unset tmp
-    unset version
-}
-
-#
-# add some basic error trapping. These mostly catch programming error's
-# within the tests themselves
-#
-expect_before {
-    buffer_full		   { error "internal buffer is full." }
-    "can't open '*'" { error "Can't open test file." }
-}
-
-
-
diff --git a/binutils/testsuite/config/coff.exp b/binutils/testsuite/config/coff.exp
deleted file mode 100644
index d71e3e9c283..00000000000
--- a/binutils/testsuite/config/coff.exp
+++ /dev/null
@@ -1,45 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@prep.ai.mit.edu
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-load_lib util-defs.exp
-
-#
-# nm_version -- extract and print the version number of nm
-#
-proc nm_version { } {
-    set tmp [exec $NM +version]
-    regexp " \[0-9\.\]+" $tmp version
-    clone_output "[which $NM] version $version\n"
-    unset tmp
-    unset version
-}
-
-#
-# add some basic error trapping. These mostly catch programming error's
-# within the tests themselves
-#
-expect_before {
-    buffer_full		   { error "internal buffer is full." }
-    "can't open '*'" { error "Can't open test file." }
-}
-
-
-
diff --git a/binutils/testsuite/config/mt-a29k-udi b/binutils/testsuite/config/mt-a29k-udi
new file mode 100644
index 00000000000..f88f2085c27
--- /dev/null
+++ b/binutils/testsuite/config/mt-a29k-udi
@@ -0,0 +1 @@
+CFLAGS_FOR_TARGET = 
diff --git a/binutils/testsuite/config/mt-i386-aout b/binutils/testsuite/config/mt-i386-aout
new file mode 100644
index 00000000000..f88f2085c27
--- /dev/null
+++ b/binutils/testsuite/config/mt-i386-aout
@@ -0,0 +1 @@
+CFLAGS_FOR_TARGET = 
diff --git a/binutils/testsuite/config/mt-i960-nindy b/binutils/testsuite/config/mt-i960-nindy
new file mode 100644
index 00000000000..a6ae4b615d9
--- /dev/null
+++ b/binutils/testsuite/config/mt-i960-nindy
@@ -0,0 +1 @@
+CFLAGS_FOR_TARGET = -nostartfiles
diff --git a/binutils/testsuite/config/mt-lynx b/binutils/testsuite/config/mt-lynx
new file mode 100644
index 00000000000..f88f2085c27
--- /dev/null
+++ b/binutils/testsuite/config/mt-lynx
@@ -0,0 +1 @@
+CFLAGS_FOR_TARGET = 
diff --git a/binutils/testsuite/config/mt-m68k b/binutils/testsuite/config/mt-m68k
new file mode 100644
index 00000000000..493d702da31
--- /dev/null
+++ b/binutils/testsuite/config/mt-m68k
@@ -0,0 +1 @@
+CFLAGS_FOR_TARGET = -Tidp.ld -nostartfiles
diff --git a/binutils/testsuite/config/mt-mips-ecoff b/binutils/testsuite/config/mt-mips-ecoff
new file mode 100644
index 00000000000..f88f2085c27
--- /dev/null
+++ b/binutils/testsuite/config/mt-mips-ecoff
@@ -0,0 +1 @@
+CFLAGS_FOR_TARGET = 
diff --git a/binutils/testsuite/config/mt-slite b/binutils/testsuite/config/mt-slite
new file mode 100644
index 00000000000..abd67cc907a
--- /dev/null
+++ b/binutils/testsuite/config/mt-slite
@@ -0,0 +1 @@
+CFLAGS_FOR_TARGET = -Tex93x.ld -nostartfiles
diff --git a/binutils/testsuite/config/mt-sparc-aout b/binutils/testsuite/config/mt-sparc-aout
new file mode 100644
index 00000000000..f88f2085c27
--- /dev/null
+++ b/binutils/testsuite/config/mt-sparc-aout
@@ -0,0 +1 @@
+CFLAGS_FOR_TARGET = 
diff --git a/binutils/testsuite/config/mt-vxworks b/binutils/testsuite/config/mt-vxworks
new file mode 100644
index 00000000000..23bb8bcd287
--- /dev/null
+++ b/binutils/testsuite/config/mt-vxworks
@@ -0,0 +1 @@
+CFLAGS_FOR_TARGET = -r
diff --git a/binutils/testsuite/config/nind.exp b/binutils/testsuite/config/nind.exp
deleted file mode 100644
index d71e3e9c283..00000000000
--- a/binutils/testsuite/config/nind.exp
+++ /dev/null
@@ -1,45 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@prep.ai.mit.edu
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-load_lib util-defs.exp
-
-#
-# nm_version -- extract and print the version number of nm
-#
-proc nm_version { } {
-    set tmp [exec $NM +version]
-    regexp " \[0-9\.\]+" $tmp version
-    clone_output "[which $NM] version $version\n"
-    unset tmp
-    unset version
-}
-
-#
-# add some basic error trapping. These mostly catch programming error's
-# within the tests themselves
-#
-expect_before {
-    buffer_full		   { error "internal buffer is full." }
-    "can't open '*'" { error "Can't open test file." }
-}
-
-
-
diff --git a/binutils/testsuite/config/udi.exp b/binutils/testsuite/config/udi.exp
deleted file mode 100644
index 29ea0d861b2..00000000000
--- a/binutils/testsuite/config/udi.exp
+++ /dev/null
@@ -1,53 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@prep.ai.mit.edu
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-load_lib util-defs.exp
-
-if ![info exists NM] then {
-    set NM [transform nm]
-}
-if ![info exists NMFLAGS] then {
-    set NMFLAGS ""
-}
-if ![info exists SIZE] then {
-    set SIZE [transform size]
-}
-if ![info exists SIZEFLAGS] then {
-    set SIZEFLAGS ""
-}
-if ![info exists OBJDUMP] then {
-    set OBJDUMP [transform objdump]
-}
-if ![info exists OBJDUMPFLAGS] then {
-    set OBJDUMPFLAGS ""
-}
-
-#
-# add some basic error trapping. These mostly catch programming error's
-# within the tests themselves
-#
-expect_before {
-    buffer_full		   { error "internal buffer is full." }
-    "can't open '*'" { error "Can't open test file." }
-}
-
-
-
diff --git a/binutils/testsuite/config/vx.exp b/binutils/testsuite/config/vx.exp
deleted file mode 100644
index d71e3e9c283..00000000000
--- a/binutils/testsuite/config/vx.exp
+++ /dev/null
@@ -1,45 +0,0 @@
-#   Copyright (C) 1988, 1990, 1991, 1992 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-# 
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-dejagnu@prep.ai.mit.edu
-
-# This file was written by Rob Savoye. (rob@cygnus.com)
-
-load_lib util-defs.exp
-
-#
-# nm_version -- extract and print the version number of nm
-#
-proc nm_version { } {
-    set tmp [exec $NM +version]
-    regexp " \[0-9\.\]+" $tmp version
-    clone_output "[which $NM] version $version\n"
-    unset tmp
-    unset version
-}
-
-#
-# add some basic error trapping. These mostly catch programming error's
-# within the tests themselves
-#
-expect_before {
-    buffer_full		   { error "internal buffer is full." }
-    "can't open '*'" { error "Can't open test file." }
-}
-
-
-