diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 315c67c79a..eb13bd5525 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,12 @@
 Wed Jun 15 12:10:10 1994  Stan Shebs  (shebs@andros.cygnus.com)
 
+	* config/mt-a29k-udi, config/mt-i960-nindy, config/mt-sparc-aout:
+	Remove all CC, etc definitions.
+	* config/mt-hpux: New file.
+	* config/mt-mips-ecoff (CFLAGS_FOR_TARGET): Remove:
+	(CFLAGS, LDFLAGS): Define.
+	* config/mt-slite (CFLAGS_FOR_TARGET): Change to LDFLAGS.
+
 	* Makefile.in (site.exp): Don't insert host_os, etc.
 	(just-check): Just use RUNTEST with RUNTESTFLAGS only.
 	(distclean): Check existence of subdir.
diff --git a/gdb/testsuite/config/mt-a29k-udi b/gdb/testsuite/config/mt-a29k-udi
index b3b4e4d931..e69de29bb2 100644
--- a/gdb/testsuite/config/mt-a29k-udi
+++ b/gdb/testsuite/config/mt-a29k-udi
@@ -1,59 +0,0 @@
-# compilers and assemblers
-CC = a29k-amd-udi-gcc
-CFLAGS = -g -D${target_os}
-C++ = ${CC}
-C++FLAGS = ${CFLAGS}
-CXX = ${CC}
-CXXFLAGS = ${CFLAGS}
-AS = a29k-amd-udi-as
-ASFLAGS = 
-FC =
-FCFLAGS = 
-LD = ld
-LDFLAGS = 
-LIBS =
-
-# binutils
-
-RANLIB = a29k-amd-udi-ranlib
-RANLIBFLAGS =
-
-NM = a29k-amd-udi-nm
-NMFLAGS =
-
-SIZE = a29k-amd-udi-size
-SIZEFLAGS =
-
-STRIP = a29k-amd-udi-strip
-STRIPFLAGS =
-
-OBJDUMP = a29k-amd-udi-objdump
-OBJDUMPFLAGS =
-
-DEMANGLE = a29k-amd-udi-demangle
-DEMANGLEFLAGS =
-
-COPY = a29k-amd-udi-copy
-COPYFLAGS =
-
-# other utils
-LEX = flex
-LEXFLAGS =
-
-YACC = byacc
-YACCFLAGS = 
-
-AR = a29k-amd-udi-ar
-ARFLAGS =
-
-CPP = ${CC} -E
-CPPFLAGS = 
-
-GDB = a29k-amd-udi-gdb
-GDBFLAGS = -nx
-
-DIFF = diff
-DIFFFLAGS = 
-
-RUNTEST=a29k-amd-udi-runtest
-RUNTESTFLAGS=
diff --git a/gdb/testsuite/config/mt-hpux b/gdb/testsuite/config/mt-hpux
new file mode 100644
index 0000000000..a6960a2e06
--- /dev/null
+++ b/gdb/testsuite/config/mt-hpux
@@ -0,0 +1,4 @@
+# Force static linking for nodebug case.
+
+NODEBUG_FLAGS = -Wl,-a,archive
+
diff --git a/gdb/testsuite/config/mt-i960-nindy b/gdb/testsuite/config/mt-i960-nindy
index bf5e4860d7..9786c51b3c 100644
--- a/gdb/testsuite/config/mt-i960-nindy
+++ b/gdb/testsuite/config/mt-i960-nindy
@@ -1,59 +1 @@
-# compilers and assemblers
-CC = i960-intel-nindy-gcc
-CFLAGS = -g -D${target_os}
-C++ = ${CC}
-C++FLAGS = ${CFLAGS}
-CXX = ${CC}
-CXXFLAGS = ${CFLAGS}
-AS = i960-intel-nindy-as
-ASFLAGS = 
-FC =
-FCFLAGS = 
-LD = ld
-LDFLAGS = 
-LIBS = 
-
-# binutils
-
-RANLIB = i960-intel-nindy-ranlib
-RANLIBFLAGS =
-
-NM = i960-intel-nindy-nm
-NMFLAGS =
-
-SIZE = i960-intel-nindy-size
-SIZEFLAGS =
-
-STRIP = i960-intel-nindy-strip
-STRIPFLAGS =
-
-OBJDUMP = i960-intel-nindy-objdump
-OBJDUMPFLAGS =
-
-DEMANGLE = i960-intel-nindy-demangle
-DEMANGLEFLAGS =
-
-COPY = i960-intel-nindy-copy
-COPYFLAGS =
-
-# other utils
-LEX = flex
-LEXFLAGS =
-
-YACC = byacc
-YACCFLAGS = 
-
-AR = i960-intel-nindy-ar
-ARFLAGS =
-
-CPP = ${CC} -E
-CPPFLAGS = 
-
-GDB = i960-intel-nindy-gdb
-GDBFLAGS = -nx
-
-DIFF = diff
-DIFFFLAGS = 
-
-RUNTEST=i960-intel-nindy-runtest
-RUNTESTFLAGS=
+LDFLAGS_FOR_TARGET = -nostartfiles
diff --git a/gdb/testsuite/config/mt-mips-ecoff b/gdb/testsuite/config/mt-mips-ecoff
index 2a62626490..90dd031785 100644
--- a/gdb/testsuite/config/mt-mips-ecoff
+++ b/gdb/testsuite/config/mt-mips-ecoff
@@ -1 +1,2 @@
-CFLAGS_FOR_TARGET =  -nostartfiles /s1/cygnus/dejagnu/mips-idt-ecoff/crt0.o /s1/cygnus/dejagnu/mips-idt-ecoff/libc.a -g
+CFLAGS = -I/s1/cygnus/dejagnu/mips-idt-ecoff/include -g
+LDFLAGS = -nostartfiles /s1/cygnus/dejagnu/mips-idt-ecoff/crt0.o -L/s1/cygnus/dejagnu/mips-idt-ecoff -g
diff --git a/gdb/testsuite/config/mt-slite b/gdb/testsuite/config/mt-slite
index 2cae3ec01a..4f1c5284f9 100644
--- a/gdb/testsuite/config/mt-slite
+++ b/gdb/testsuite/config/mt-slite
@@ -1 +1 @@
-CFLAGS_FOR_TARGET = -Tex93x.ld -nostartfiles -N
+LDFLAGS = -Tex93x.ld -nostartfiles -N
diff --git a/gdb/testsuite/config/mt-sparc-aout b/gdb/testsuite/config/mt-sparc-aout
index c3abe6504e..e69de29bb2 100644
--- a/gdb/testsuite/config/mt-sparc-aout
+++ b/gdb/testsuite/config/mt-sparc-aout
@@ -1,59 +0,0 @@
-# compilers and assemblers
-CC = sparc-aout-gcc
-CFLAGS = -g -D${target_os}
-C++ = ${CC}
-C++FLAGS = ${CFLAGS}
-CXX = ${CC}
-CXXFLAGS = ${CFLAGS}
-AS = sparc-aout-as
-ASFLAGS = 
-FC =
-FCFLAGS = 
-LD = ld
-LDFLAGS = 
-LIBS = 
-
-# binutils
-
-RANLIB = sparc-aout-ranlib
-RANLIBFLAGS =
-
-NM = sparc-aout-nm
-NMFLAGS =
-
-SIZE = sparc-aout-size
-SIZEFLAGS =
-
-STRIP = sparc-aout-strip
-STRIPFLAGS =
-
-OBJDUMP = sparc-aout-objdump
-OBJDUMPFLAGS =
-
-DEMANGLE = sparc-aout-demangle
-DEMANGLEFLAGS =
-
-COPY = sparc-aout-copy
-COPYFLAGS =
-
-# other utils
-LEX = flex
-LEXFLAGS =
-
-YACC = byacc
-YACCFLAGS = 
-
-AR = sparc-aout-ar
-ARFLAGS =
-
-CPP = ${CC} -E
-CPPFLAGS = 
-
-GDB = sparc-aout-gdb
-GDBFLAGS = -nx
-
-DIFF = diff
-DIFFFLAGS = 
-
-RUNTESTFLAGS=sparc-aout-runtest
-RUNTESTFLAGS=