From: Yongbok Kim Date: Mon, 20 Apr 2015 15:15:20 +0000 (+0100) Subject: linux-user: Use abi_ulong for TARGET_ELF_PAGESTART X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=79cb1f1d698da5e1e183863aa3c8a91b2e750664;p=qemu.git linux-user: Use abi_ulong for TARGET_ELF_PAGESTART TARGET_ELF_PAGESTART is required to use abi_ulong to correctly handle addresses for different target bits width. This patch fixes a problem when running a 64-bit user mode application on 32-bit host machines. Signed-off-by: Yongbok Kim Reviewed-by: Peter Maydell Signed-off-by: Riku Voipio --- 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