diff options
| -rw-r--r-- | libffi/ChangeLog | 4 | ||||
| -rw-r--r-- | libffi/src/x86/ffi.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 741679386a4b..2ca6aac79181 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,5 +1,9 @@ 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. 2014-11-21 H.J. Lu <hongjiu.lu@intel.com> 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) { |