From 0b9158e6fa36e123f281a1696e66d090d2139fba Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Mon, 30 May 1994 05:34:32 +0000
Subject: [PATCH] 	* Makefile.in:  Fix bit-rot in definitions of CHILL, 
 CHILL_FOR_TARGET and Chill_LIB.

---
 gdb/testsuite/ChangeLog   |  8 ++++++++
 gdb/testsuite/Makefile.in | 24 +++++++++++-------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8ec1e5d433b..cc29c8d791c 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 083923e977e..ec7423ebebd 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -106,28 +106,26 @@ 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/; \
+  if [ -f $${rootme}/../../gcc/Makefile ] ; then \
+    echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo $(CC); \
+      echo gcc; \
     else \
       t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
     fi; \
   fi`
+CHILL = $(CHILL_FOR_TARGET)
 
-CHILL_LIB = -lchill
-
-CHILL = ` \
-  if [ -f $${rootme}/../../gcc/Makefile ] ; then \
-    echo $${rootme}/../../gcc/xgcc -B$${rootme}../../gcc/ -L$${rootme}../../chillrt/; \
+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 \
-    if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
-      echo gcc; \
-    else \
-      t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \
-    fi; \
+      echo -lchill; \
   fi`
+
+CHILL_LIB = -lchill
 # end-sanitize-chill
 
 GDB = ` \
-- 
2.30.2