From 12ab522402d7ea13c016b7b71f74183d97bfc6ef Mon Sep 17 00:00:00 2001
From: rearnsha <rearnsha>
Date: Thu, 26 Sep 2002 09:50:02 +0000
Subject: [PATCH] * lib/libgloss.exp (build_wrapper): Use a tool-specific
 filename on the host for the testglue.

---
 dejagnu/ChangeLog        | 5 +++++
 dejagnu/lib/libgloss.exp | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/dejagnu/ChangeLog b/dejagnu/ChangeLog
index d37a576dbf..76bf62b3ef 100644
--- a/dejagnu/ChangeLog
+++ b/dejagnu/ChangeLog
@@ -1,3 +1,8 @@
+2002-09-26  Richard Earnshaw  <rearnsha@arm.com>
+
+	* lib/libgloss.exp (build_wrapper): Use a tool-specific filename on
+	the host for the testglue.
+
 2002-08-30  Nick Clifton  <nickc@redhat.com>
 
         * acinclude.m4: Provide alternative definition of AC_PROG_CXX
diff --git a/dejagnu/lib/libgloss.exp b/dejagnu/lib/libgloss.exp
index 26335a7f21..b2ffd21c9e 100644
--- a/dejagnu/lib/libgloss.exp
+++ b/dejagnu/lib/libgloss.exp
@@ -812,6 +812,7 @@ proc find_ld { } {
 
 proc build_wrapper { gluefile } {
     global libdir
+    global tool
 
     if [target_info exists wrap_m68k_aout] {
 	set flags "additional_flags=-DWRAP_M68K_AOUT";
@@ -832,7 +833,7 @@ proc build_wrapper { gluefile } {
 	lappend flags "additional_flags=[target_info wrap_compile_flags]";
     }
     if { [target_compile ${libdir}/testglue.c ${gluefile} object $flags] == "" } {
-	set gluefile [remote_download host ${gluefile} testglue.o];
+      set gluefile [remote_download host ${gluefile} ${tool}_tg.o];
 	return [list $gluefile $result];
     } else {
 	return ""
-- 
2.11.0