Merge pull request #32 from alex/patch-1
Fix for a crasher due to misaligned stack on x86-32.
This commit is contained in:
@@ -1,3 +1,7 @@
|
|||||||
|
2013-03-16 Alex Gaynor <alex.gaynor@gmail.com>
|
||||||
|
|
||||||
|
* src/x86/ffi.c (ffi_prep_cif_machdep): Always align stack.
|
||||||
|
|
||||||
2013-02-11 Anthony Green <green@moxielogic.com>
|
2013-02-11 Anthony Green <green@moxielogic.com>
|
||||||
|
|
||||||
* configure.ac: Update release number to 3.0.12.
|
* configure.ac: Update release number to 3.0.12.
|
||||||
|
|||||||
@@ -315,9 +315,7 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif)
|
|||||||
cif->bytes += 4 * sizeof(ffi_arg);
|
cif->bytes += 4 * sizeof(ffi_arg);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef X86_DARWIN
|
|
||||||
cif->bytes = (cif->bytes + 15) & ~0xF;
|
cif->bytes = (cif->bytes + 15) & ~0xF;
|
||||||
#endif
|
|
||||||
|
|
||||||
return FFI_OK;
|
return FFI_OK;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user