diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ec4da75bb71..5ef56cc901c 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,8 @@
 Wed Jul 12 10:20:08 1995  Fred Fish  (fnf@rtl.cygnus.com)
 
+	* configure.in (configdirs):  Remove gdb.chill from default list
+	of subdirs and then add it back in only if doing a native build.
+	The current chill compiler does not yet work in any cross build.
 	* Revert all signal changes from Jul 6.
 	* gdb.base/{sigall.c signals.c}:  Define away signal() and alarm()
 	for sh-hms targets, allowing these tests to link, with no other
diff --git a/gdb/testsuite/configure.in b/gdb/testsuite/configure.in
index d4c24fce3dd..ff3f1c8563f 100644
--- a/gdb/testsuite/configure.in
+++ b/gdb/testsuite/configure.in
@@ -7,7 +7,7 @@ srctrigger="Makefile.in"
 srcname="GDB Test Suite"
 
 # Directories to use in all configurations.
-configdirs="gdb.base gdb.c++ gdb.chill gdb.disasm"
+configdirs="gdb.base gdb.c++ gdb.disasm"
 
 # Directories to use for a configuration which supports signals.
 # This usually excludes cross targets.
@@ -51,6 +51,11 @@ case "${target}" in
 				;;
 esac
 
+# Chill currently doesn't link cross targets, so only config and test natives
+if [ "${host}" = "${target}" ] ; then
+	configdirs="$configdirs} gdb.chill"
+fi
+
 # link in the lib directory if needed
 #if [ ! -d lib ] ; then
 #    files="lib"