* Makefile.in: Fix bit-rot in definitions of CHILL,

	CHILL_FOR_TARGET and Chill_LIB.

1 files changed, 11 insertions, 13 deletions

diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 083923e..ec7423e 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 = ` \