diff options
| author | Peter Maydell | 2015-06-16 10:07:22 +0200 |
|---|---|---|
| committer | Peter Maydell | 2015-06-16 10:07:22 +0200 |
| commit | 4316536bf424d2e7f9cfa7d0dd561adb0986cc81 (patch) | |
| tree | 70027a5d4058407cc2fca8921b634446d0f0f695 /linux-user/elfload.c | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150615'... (diff) | |
| parent | linux-user: ioctl() command type is int (diff) | |
| download | qemu-4316536bf424d2e7f9cfa7d0dd561adb0986cc81.tar.gz qemu-4316536bf424d2e7f9cfa7d0dd561adb0986cc81.tar.xz qemu-4316536bf424d2e7f9cfa7d0dd561adb0986cc81.zip | |
Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20150616' into staging
linux-user patches for 2.4 softfreeze
second spin with ioctl patch refreshed
# gpg: Signature made Tue Jun 16 08:03:14 2015 BST using RSA key ID DE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg: aka "Riku Voipio <riku.voipio@linaro.org>"
* remotes/riku/tags/pull-linux-user-20150616:
linux-user: ioctl() command type is int
linux-user: fix the breakpoint inheritance in spawned threads
linux-user: use __get_user and __put_user in cmsg conversions
linux-user: Fix length handling in host_to_target_cmsg
linux-user: Use abi_ulong for TARGET_ELF_PAGESTART
linux-user: Allocate thunk size dynamically
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/elfload.c')
| -rw-r--r-- | linux-user/elfload.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/elfload.c b/linux-user/elfload.c index b71e866973..17883686f0 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -1256,7 +1256,8 @@ struct exec /* Necessary parameters */ #define TARGET_ELF_EXEC_PAGESIZE TARGET_PAGE_SIZE -#define TARGET_ELF_PAGESTART(_v) ((_v) & ~(unsigned long)(TARGET_ELF_EXEC_PAGESIZE-1)) +#define TARGET_ELF_PAGESTART(_v) ((_v) & \ + ~(abi_ulong)(TARGET_ELF_EXEC_PAGESIZE-1)) #define TARGET_ELF_PAGEOFFSET(_v) ((_v) & (TARGET_ELF_EXEC_PAGESIZE-1)) #define DLINFO_ITEMS 14 |