diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8ec1e5d433..cc29c8d791 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+Sun May 29 22:31:42 1994  Per Bothner  (bothner@kalessin.cygnus.com)
+
+	* Makefile.in:  Fix bit-rot in definitions of CHILL,
+	CHILL_FOR_TARGET and Chill_LIB.
+	* gdb.t31/gdbme.ch:  Fix syntax of nested array tuples.
+	* gdb.t31/Makefile.in:  Add definitions for CHILLFLAGS,
+	CHILL, and CHILL_LIB.
+
 Wed May 25 17:10:38 1994  Per Bothner  (bothner@kalessin.cygnus.com)
 
 	* Makefile.in (TARGET_FLAGS_TO_PASS): Fix syntax of
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 083923e977..ec7423ebeb 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -106,21 +106,8 @@ CXX_FOR_TARGET = ` \
 CHILLFLAGS = $(CFLAGS)
 CHILL = gcc
 CHILL_FOR_TARGET = ` \
-  if [ -f $${rootme}/../../gcc/xgcc ] ; then \
-    echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/ -L$${rootme}/../../chillrt/; \
-  else \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
-  fi`
-
-CHILL_LIB = -lchill
-
-CHILL = ` \
   if [ -f $${rootme}/../../gcc/Makefile ] ; then \
-    echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/ -L$${rootme}../../chillrt/; \
+    echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo gcc; \
@@ -128,6 +115,17 @@ CHILL = ` \
       t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
     fi; \
   fi`
+CHILL = $(CHILL_FOR_TARGET)
+
+CHILL_LIB = ` \
+  if [ -f $${rootme}/../../gcc/ch/runtime/libchill.a ] ; then \
+    echo $${rootme}/../../gcc/ch/runtime/chillrt0.o \
+      $${rootme}/../../gcc/ch/runtime/libchill.a; \
+  else \
+      echo -lchill; \
+  fi`
+
+CHILL_LIB = -lchill
 # end-sanitize-chill
 
 GDB = ` \