From fdc6959794ed299189bc1663a5eb94d2af2ad9a3 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Wed, 27 Oct 2004 10:56:06 +0000
Subject: [PATCH] libffi-db.exp (load_gcc_lib): New function.

* testsuite/lib/libffi-db.exp (load_gcc_lib): New function.
(libffi_exit): New function.
(libffi_init): Build the testglue wrapper if needed.

From-SVN: r89636
---
 libffi/ChangeLog                   |  6 ++++++
 libffi/testsuite/lib/libffi-dg.exp | 18 +++++++++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index ea883fc4c0b..fa47aeb63de 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-27  Richard Earnshaw  <rearnsha@arm.com>
+
+	* testsuite/lib/libffi-db.exp (load_gcc_lib): New function.
+	(libffi_exit): New function.
+	(libffi_init): Build the testglue wrapper if needed.
+
 2004-10-25  Eric Botcazou  <ebotcazou@libertysurf.fr>
 
 	PR other/18138
diff --git a/libffi/testsuite/lib/libffi-dg.exp b/libffi/testsuite/lib/libffi-dg.exp
index b8ada00cc29..b31a95f7f48 100644
--- a/libffi/testsuite/lib/libffi-dg.exp
+++ b/libffi/testsuite/lib/libffi-dg.exp
@@ -14,9 +14,14 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
+proc load_gcc_lib { filename } {
+    global srcdir
+    load_file $srcdir/../../gcc/testsuite/lib/$filename
+}
+
 load_lib dg.exp
 load_lib libgloss.exp
-
+load_gcc_lib wrapper.exp
 
 
 # Define libffi callbacks for dg.exp.
@@ -71,6 +76,7 @@ proc libffi-init { args } {
     global gluefile wrap_flags;
     global srcdir
     global blddirffi
+    global objdir
     global blddircxx
     global TOOL_OPTIONS
     global tool
@@ -148,6 +154,16 @@ proc libffi-init { args } {
 	    }
 	}
     }
+    libffi_maybe_build_wrapper "${objdir}/testglue.o"
+}
+
+proc libffi_exit { } {
+    global gluefile;
+
+    if [info exists gluefile] {
+	file_on_build delete $gluefile;
+	unset gluefile;
+    }
 }
 
 proc libffi_target_compile { source dest type options } {