diff options
author | Alistair Francis <alistair.francis@wdc.com> | 2019-08-20 13:59:15 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-08-21 15:29:02 +0100 |
commit | 5a308c55a60282b475545f3c7346e5e8053aba3f (patch) | |
tree | 9d1e064e90031380751df842681594c18e18dd14 /meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | |
parent | 8102c55bc1851233d3c5632e47e0adfddc4b23f8 (diff) | |
download | poky-5a308c55a60282b475545f3c7346e5e8053aba3f.tar.gz |
qemu: Upgrade to version 4.1
(From OE-Core rev: 50a7dec95618080962e56fd347f505e691b7ad6f)
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch new file mode 100644 index 0000000000..e562f25bec --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0008-linux-user-Fix-webkitgtk-hangs-on-32-bit-x86-target.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 25a064f91f73630e5dff2a6aeb23d953c469cea6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alistair Francis <alistair.francis@xilinx.com> | ||
3 | Date: Wed, 17 Jan 2018 10:51:49 -0800 | ||
4 | Subject: [PATCH] linux-user: Fix webkitgtk hangs on 32-bit x86 target | ||
5 | |||
6 | Since commit "linux-user: Tidy and enforce reserved_va initialization" | ||
7 | (18e80c55bb6ec17c05ec0ba717ec83933c2bfc07) the Yocto webkitgtk build | ||
8 | hangs when cross compiling for 32-bit x86 on a 64-bit x86 machine using | ||
9 | musl. | ||
10 | |||
11 | To fix the issue reduce the MAX_RESERVED_VA macro to be a closer match | ||
12 | to what it was before the problematic commit. | ||
13 | |||
14 | Upstream-Status: Submitted http://lists.gnu.org/archive/html/qemu-devel/2018-01/msg04185.html | ||
15 | Signed-off-by: Alistair Francis <alistair.francis@xilinx.com> | ||
16 | |||
17 | --- | ||
18 | linux-user/main.c | 2 +- | ||
19 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
20 | |||
21 | diff --git a/linux-user/main.c b/linux-user/main.c | ||
22 | index 8ffc5251..4067e739 100644 | ||
23 | --- a/linux-user/main.c | ||
24 | +++ b/linux-user/main.c | ||
25 | @@ -77,7 +77,7 @@ int have_guest_base; | ||
26 | (TARGET_LONG_BITS == 32 || defined(TARGET_ABI32)) | ||
27 | /* There are a number of places where we assign reserved_va to a variable | ||
28 | of type abi_ulong and expect it to fit. Avoid the last page. */ | ||
29 | -# define MAX_RESERVED_VA (0xfffffffful & TARGET_PAGE_MASK) | ||
30 | +# define MAX_RESERVED_VA (0x7ffffffful & TARGET_PAGE_MASK) | ||
31 | # else | ||
32 | # define MAX_RESERVED_VA (1ul << TARGET_VIRT_ADDR_SPACE_BITS) | ||
33 | # endif | ||