diff options
| author | Richard Henderson <rth@redhat.com> | 2015-01-12 16:26:31 -0800 |
|---|---|---|
| committer | Richard Henderson <rth@gcc.gnu.org> | 2015-01-12 16:26:31 -0800 |
| commit | ca46eab70b12b0c4a81e6ed0a0fa20d54e943387 (patch) | |
| tree | fc5783558f47574bee5406df749d92aae7c7e870 /libffi | |
| parent | b891a9a6d85a79d20bf2c99a351906b50493b9bf (diff) | |
Fix libjava failures on i686-linux
* src/x86/ffi.c (ffi_raw_call): Fill in frame.
From-SVN: r219505
Diffstat (limited to 'libffi')
| -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 741679386a4..2ca6aac7918 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 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) { |