From 2c4ed4565a5bc1cc785dc95d36df2414c06c709b Mon Sep 17 00:00:00 2001 From: Hosaka Yuji Date: Tue, 2 Dec 2003 05:39:06 +0000 Subject: [PATCH] re PR libffi/13221 (libffi's closure couldn't pass sequence of char and/or short arguments.) 2003-12-02 Hosaka Yuji PR other/13221 * src/x86/ffi.c (ffi_prep_args, ffi_prep_incoming_args_SYSV): Align arguments to 32 bits. From-SVN: r74161 --- libffi/ChangeLog | 6 ++++++ libffi/src/x86/ffi.c | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 8d0fa81dc63..557cf7fde36 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,9 @@ +2003-12-02 Hosaka Yuji + + PR other/13221 + * src/x86/ffi.c (ffi_prep_args, ffi_prep_incoming_args_SYSV): + Align arguments to 32 bits. + 2003-12-01 Andreas Tobler PR other/13221 diff --git a/libffi/src/x86/ffi.c b/libffi/src/x86/ffi.c index bd0874f771a..14b0295e1e1 100644 --- a/libffi/src/x86/ffi.c +++ b/libffi/src/x86/ffi.c @@ -62,8 +62,8 @@ void ffi_prep_args(char *stack, extended_cif *ecif) size_t z; /* Align if necessary */ - if (((*p_arg)->alignment - 1) & (unsigned) argp) - argp = (char *) ALIGN(argp, (*p_arg)->alignment); + if ((sizeof(int) - 1) & (unsigned) argp) + argp = (char *) ALIGN(argp, sizeof(int)); z = (*p_arg)->size; if (z < sizeof(int)) @@ -301,8 +301,8 @@ ffi_prep_incoming_args_SYSV(char *stack, void **rvalue, size_t z; /* Align if necessary */ - if (((*p_arg)->alignment - 1) & (unsigned) argp) { - argp = (char *) ALIGN(argp, (*p_arg)->alignment); + if ((sizeof(int) - 1) & (unsigned) argp) { + argp = (char *) ALIGN(argp, sizeof(int)); } z = (*p_arg)->size; -- 2.30.2