From: Richard Henderson <rth@redhat.com>
Date: Tue, 13 Jan 2015 00:26:31 +0000 (-0800)
Subject: Fix libjava failures on i686-linux
X-Git-Tag: releases/gcc-5.1.0~1848
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ca46eab70b12b0c4a81e6ed0a0fa20d54e943387;p=thirdparty%2Fgcc.git

Fix libjava failures on i686-linux

	* src/x86/ffi.c (ffi_raw_call): Fill in frame.

From-SVN: r219505
---

diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 741679386a4b..2ca6aac79181 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-12  Richard Henderson  <rth@redhat.com>
+
+	* src/x86/ffi.c (ffi_raw_call): Fill in frame.
+
 2015-01-12  Richard Henderson  <rth@redhat.com>
 
 	Merge to upstream commit c82cc159426d8d4402375fa1ae3f045b9cf82e16.
diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c
index 3885e3995016..feb5cbbb4ac1 100644
--- a/libffi/src/x86/ffi.c
+++ b/libffi/src/x86/ffi.c
@@ -675,6 +675,10 @@ ffi_raw_call(ffi_cif *cif, void (*fn)(void), void *rvalue, ffi_raw *avalue)
   if (rsize)
     rvalue = frame + 1;
 
+  frame->fn = fn;
+  frame->flags = flags;
+  frame->rvalue = rvalue;
+
   narg_reg = 0;
   switch (flags)
     {