diff options
| author | Peter Maydell | 2016-08-04 19:36:05 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-08-04 19:36:05 +0200 |
| commit | 42e0d60f1615ef63d16e41bb1668805560c37870 (patch) | |
| tree | ccfa578631f3779b49952e117b2ca65f414d9304 /include/exec | |
| parent | Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging (diff) | |
| parent | linux-user: Handle brk() attempts with very large sizes (diff) | |
| download | qemu-42e0d60f1615ef63d16e41bb1668805560c37870.tar.gz qemu-42e0d60f1615ef63d16e41bb1668805560c37870.tar.xz qemu-42e0d60f1615ef63d16e41bb1668805560c37870.zip | |
Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20160804' into staging
linux-user important fixes for 2.7
# gpg: Signature made Thu 04 Aug 2016 15:10:57 BST
# gpg: using RSA key 0xB44890DEDE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg: aka "Riku Voipio <riku.voipio@linaro.org>"
# Primary key fingerprint: FF82 03C8 C391 98AE 0581 41EF B448 90DE DE3C 9BC0
* remotes/riku/tags/pull-linux-user-20160804:
linux-user: Handle brk() attempts with very large sizes
linux-user: Fix target_semid_ds structure definition
linux-user: Don't write off end of new_utsname buffer
linux-user: Fix memchr() argument in open_self_cmdline()
linux-user: Use correct alignment for long long on i386 guests
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/exec')
| -rw-r--r-- | include/exec/user/abitypes.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h index a09d6c64ff..ba188608c2 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 |