From 37d1429623f8d40b8bfe24fc3b448f90f6eae228 Mon Sep 17 00:00:00 2001
From: Fred Fish <fnf@specifix.com>
Date: Fri, 11 Oct 1996 23:54:12 +0000
Subject: [PATCH] 	* expstruct.exp (objfile2): Set and use, like other
 chill tests. 	* pr-4975.exp: Ditto. 	* pr-5646.exp: Ditto. 	* pr-8134.exp:
 Ditto.

---
 gdb/testsuite/gdb.chill/ChangeLog     | 7 +++++++
 gdb/testsuite/gdb.chill/extstruct.exp | 5 +++--
 gdb/testsuite/gdb.chill/pr-4975.exp   | 5 +++--
 gdb/testsuite/gdb.chill/pr-5646.exp   | 5 +++--
 gdb/testsuite/gdb.chill/pr-8134.exp   | 5 +++--
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/gdb/testsuite/gdb.chill/ChangeLog b/gdb/testsuite/gdb.chill/ChangeLog
index 59e57daea73..23c9263c3b7 100644
--- a/gdb/testsuite/gdb.chill/ChangeLog
+++ b/gdb/testsuite/gdb.chill/ChangeLog
@@ -1,3 +1,10 @@
+Fri Oct 11 16:48:56 1996  Fred Fish  <fnf@cygnus.com>
+
+	* expstruct.exp (objfile2): Set and use, like other chill tests.
+	* pr-4975.exp: Ditto.
+	* pr-5646.exp: Ditto.
+	* pr-8134.exp: Ditto.
+
 Thu Sep  5 01:54:42 1996  Wilfried Moser (Alcatel)  <moser@rtl.cygnus.com>
 
 	* gch1280.exp: Enhance test case.
diff --git a/gdb/testsuite/gdb.chill/extstruct.exp b/gdb/testsuite/gdb.chill/extstruct.exp
index 6ef4b9af717..c789cc222bf 100644
--- a/gdb/testsuite/gdb.chill/extstruct.exp
+++ b/gdb/testsuite/gdb.chill/extstruct.exp
@@ -27,7 +27,8 @@ if [skip_chill_tests] then { continue }
 
 set testfile2 "extstruct-grt"
 set srcfile2 ${srcdir}/$subdir/${testfile2}.ch
-if  { [compile "${srcfile2} -g -c"] != "" } {
+set objfile2 ${objdir}/$subdir/${testfile2}.o
+if  { [compile "${srcfile2} -g -c -o ${objfile2}"] != "" } {
     perror "Couldn't compile ${srcfile2}"
     return -1
 }
@@ -35,7 +36,7 @@ if  { [compile "${srcfile2} -g -c"] != "" } {
 set testfile "extstruct"
 set srcfile ${srcdir}/$subdir/${testfile}.ch
 set binfile ${objdir}/${subdir}/${testfile}.exe
-if  { [compile "${srcfile} -g -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } {
+if  { [compile "${srcfile} -g ${objfile2} -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } {
     perror "Couldn't compile ${srcfile}"
     return -1
 }
diff --git a/gdb/testsuite/gdb.chill/pr-4975.exp b/gdb/testsuite/gdb.chill/pr-4975.exp
index ad3f83ece2b..787b3bd7154 100644
--- a/gdb/testsuite/gdb.chill/pr-4975.exp
+++ b/gdb/testsuite/gdb.chill/pr-4975.exp
@@ -27,7 +27,8 @@ if [skip_chill_tests] then { continue }
 
 set testfile2 "pr-4975-grt"
 set srcfile2 ${srcdir}/$subdir/${testfile2}.ch
-if  { [compile "${srcfile2} -g -c"] != "" } {
+set objfile2 ${objdir}/$subdir/${testfile2}.o
+if  { [compile "${srcfile2} -g -c -o ${objfile2}"] != "" } {
     perror "Couldn't compile ${srcfile2}"
     return -1
 }
@@ -35,7 +36,7 @@ if  { [compile "${srcfile2} -g -c"] != "" } {
 set testfile "pr-4975"
 set srcfile ${srcdir}/$subdir/${testfile}.ch
 set binfile ${objdir}/${subdir}/${testfile}.exe
-if  { [compile "${srcfile} -g -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } {
+if  { [compile "${srcfile} -g ${objfile2} -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } {
     perror "Couldn't compile ${srcfile}"
     return -1
 }
diff --git a/gdb/testsuite/gdb.chill/pr-5646.exp b/gdb/testsuite/gdb.chill/pr-5646.exp
index 8f57c152295..2c0cb08157b 100644
--- a/gdb/testsuite/gdb.chill/pr-5646.exp
+++ b/gdb/testsuite/gdb.chill/pr-5646.exp
@@ -27,7 +27,8 @@ if [skip_chill_tests] then { continue }
 
 set testfile2 "pr-5646-grt"
 set srcfile2 ${srcdir}/$subdir/${testfile2}.ch
-if  { [compile "${srcfile2} -g -c"] != "" } {
+set objfile2 ${objdir}/$subdir/${testfile2}.o
+if  { [compile "${srcfile2} -g -c -o ${objfile2}"] != "" } {
     perror "Couldn't compile ${srcfile2}"
     return -1
 }
@@ -35,7 +36,7 @@ if  { [compile "${srcfile2} -g -c"] != "" } {
 set testfile "pr-5646"
 set srcfile ${srcdir}/$subdir/${testfile}.ch
 set binfile ${objdir}/${subdir}/${testfile}.exe
-if  { [compile "${srcfile} -g -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } {
+if  { [compile "${srcfile} -g ${objfile2} -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } {
     perror "Couldn't compile ${srcfile}"
     return -1
 }
diff --git a/gdb/testsuite/gdb.chill/pr-8134.exp b/gdb/testsuite/gdb.chill/pr-8134.exp
index e2586d0a186..bbf97d9f455 100644
--- a/gdb/testsuite/gdb.chill/pr-8134.exp
+++ b/gdb/testsuite/gdb.chill/pr-8134.exp
@@ -28,7 +28,8 @@ if [skip_chill_tests] then { continue }
 # Note we use pr-8136.ch for pr-8134.exp as well as pr-8136.exp.
 set testfile2 "func1"
 set srcfile2 ${srcdir}/$subdir/${testfile2}.ch
-if  { [compile "${srcfile2} -g -c"] != "" } {
+set objfile2 ${objdir}/$subdir/${testfile2}.o
+if  { [compile "${srcfile2} -g -c -o ${objfile2}"] != "" } {
     perror "Couldn't compile ${srcfile2}"
     return -1
 }
@@ -36,7 +37,7 @@ if  { [compile "${srcfile2} -g -c"] != "" } {
 set testfile "pr-8134"
 set srcfile ${srcdir}/$subdir/pr-8136.ch
 set binfile ${objdir}/${subdir}/${testfile}.exe
-if  { [compile "${srcfile} -g -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } {
+if  { [compile "${srcfile} -g ${objfile2} -o ${binfile} ${CHILL_RT0} ${CHILL_LIB}"] != "" } {
     perror "Couldn't compile ${srcfile}"
     return -1
 }
-- 
2.30.2