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 741679386a4b476e173949d88545ed7668fcc4a0..2ca6aac791818dc1eb304484b6b395557816e288 100644 (file)
--- 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 3885e3995016aa7c0f825a7f8846ed0344b8ce5d..feb5cbbb4ac1371c7eb68668eea6a2238a6ad40d 100644 (file)
--- 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)
     {