[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 1/1] linux-user: Fix webkitgtk hangs on 32-bi
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v1 1/1] linux-user: Fix webkitgtk hangs on 32-bit x86 target |
Date: |
Wed, 17 Jan 2018 17:54:34 -0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.2 |
On 01/17/2018 05:39 PM, Alistair Francis wrote:
> Since commit "linux-user: Tidy and enforce reserved_va initialization"
> (18e80c55bb6ec17c05ec0ba717ec83933c2bfc07) the Yocto webkitgtk build
> hangs when cross compiling for 32-bit x86 on a 64-bit x86 machine using
> musl.
>
> To fix the issue reduce the MAX_RESERVED_VA macro to be a closer match
> to what it was before the problematic commit.
>
> Signed-off-by: Alistair Francis <address@hidden>
> ---
>
> linux-user/main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/linux-user/main.c b/linux-user/main.c
> index 450eb3ce65..c7cc0a184e 100644
> --- a/linux-user/main.c
> +++ b/linux-user/main.c
> @@ -77,7 +77,7 @@ do {
> \
> (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32))
> /* There are a number of places where we assign reserved_va to a variable
> of type abi_ulong and expect it to fit. Avoid the last page. */
If this is only for MUSL shouldn't we think of smth like: ?
#if defined(__GLIBC__) || defined(__UCLIBC__)
> -# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK)
#else /* __MUSL__ */
> +# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK)
#endif
> # else
> # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS)
> # endif
>