On Thu, Jul 28, 2016 at 12:57:59PM +0100, Peter Maydell wrote: > 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.
Thanks, applied all your patches upto this patch to: https://git.linaro.org/people/riku.voipio/qemu.git/shortlog/refs/heads/for-next I take none of the patches are important enough to warrant including in 2.7? > Reported-by: Icenowy Zheng <icen...@aosc.xyz> > Signed-off-by: Peter Maydell <peter.mayd...@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 > -- > 1.9.1 >
