From ca46eab70b12b0c4a81e6ed0a0fa20d54e943387 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Mon, 12 Jan 2015 16:26:31 -0800 Subject: Fix libjava failures on i686-linux * src/x86/ffi.c (ffi_raw_call): Fill in frame. From-SVN: r219505 --- libffi/ChangeLog | 4 ++++ libffi/src/x86/ffi.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 741679386a4..2ca6aac7918 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,7 @@ +2015-01-12 Richard Henderson + + * src/x86/ffi.c (ffi_raw_call): Fill in frame. + 2015-01-12 Richard Henderson Merge to upstream commit c82cc159426d8d4402375fa1ae3f045b9cf82e16. diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c index 3885e399501..feb5cbbb4ac 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) { -- cgit v1.2.3