From: Peter Maydell <peter.mayd...@linaro.org> For i386, the ABI specifies that 'long long' (8 byte values) need only be 4 aligned, but we were requiring them to be 8-aligned. This meant we were laying out the target_epoll_event structure wrongly. Add a suitable ifdef to abitypes.h to specify the i386-specific alignment requirement.
Reported-by: Icenowy Zheng <icen...@aosc.xyz> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org> Reviewed-by: Laurent Vivier <laur...@vivier.eu> Signed-off-by: Riku Voipio <riku.voi...@linaro.org> --- include/exec/user/abitypes.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h index a09d6c6..ba18860 100644 --- a/include/exec/user/abitypes.h +++ b/include/exec/user/abitypes.h @@ -15,6 +15,10 @@ #define ABI_LLONG_ALIGNMENT 2 #endif +#if defined(TARGET_I386) && !defined(TARGET_X86_64) +#define ABI_LLONG_ALIGNMENT 4 +#endif + #ifndef ABI_SHORT_ALIGNMENT #define ABI_SHORT_ALIGNMENT 2 #endif -- 2.1.4
