diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch index 4072d9455f..7e273eeced 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Fix-webkitgtk-builds.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From b633b9a1813fcd715dce44659a89293f1c64ae8c Mon Sep 17 00:00:00 2001 | 1 | From 613166007e3b852c99caf2cd34a972e2c8460737 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <martin.jansa@lge.com> | 2 | From: Martin Jansa <martin.jansa@lge.com> |
3 | Date: Fri, 1 Jun 2018 08:41:07 +0000 | 3 | Date: Fri, 1 Jun 2018 08:41:07 +0000 |
4 | Subject: [PATCH] Fix webkitgtk builds | 4 | Subject: [PATCH] Fix webkitgtk builds |
@@ -18,6 +18,7 @@ This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. | |||
18 | 18 | ||
19 | Upstream-Status: Pending | 19 | Upstream-Status: Pending |
20 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | 20 | Signed-off-by: Alistair Francis <alistair.francis@wdc.com> |
21 | |||
21 | --- | 22 | --- |
22 | include/exec/cpu-all.h | 6 +----- | 23 | include/exec/cpu-all.h | 6 +----- |
23 | include/exec/cpu_ldst.h | 5 ++++- | 24 | include/exec/cpu_ldst.h | 5 ++++- |
@@ -26,7 +27,7 @@ Signed-off-by: Alistair Francis <alistair.francis@wdc.com> | |||
26 | 4 files changed, 10 insertions(+), 23 deletions(-) | 27 | 4 files changed, 10 insertions(+), 23 deletions(-) |
27 | 28 | ||
28 | diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h | 29 | diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h |
29 | index 536ea58f81..4c63a6a2e4 100644 | 30 | index e96781a4..a369f81a 100644 |
30 | --- a/include/exec/cpu-all.h | 31 | --- a/include/exec/cpu-all.h |
31 | +++ b/include/exec/cpu-all.h | 32 | +++ b/include/exec/cpu-all.h |
32 | @@ -162,12 +162,8 @@ extern unsigned long guest_base; | 33 | @@ -162,12 +162,8 @@ extern unsigned long guest_base; |
@@ -44,7 +45,7 @@ index 536ea58f81..4c63a6a2e4 100644 | |||
44 | 45 | ||
45 | #include "exec/hwaddr.h" | 46 | #include "exec/hwaddr.h" |
46 | diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h | 47 | diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h |
47 | index 9151fdb042..cb2b8f329f 100644 | 48 | index fd499f7e..30575f60 100644 |
48 | --- a/include/exec/cpu_ldst.h | 49 | --- a/include/exec/cpu_ldst.h |
49 | +++ b/include/exec/cpu_ldst.h | 50 | +++ b/include/exec/cpu_ldst.h |
50 | @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; | 51 | @@ -65,7 +65,10 @@ typedef uint64_t abi_ptr; |
@@ -60,7 +61,7 @@ index 9151fdb042..cb2b8f329f 100644 | |||
60 | #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) | 61 | #define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) |
61 | 62 | ||
62 | diff --git a/linux-user/mmap.c b/linux-user/mmap.c | 63 | diff --git a/linux-user/mmap.c b/linux-user/mmap.c |
63 | index 46a6e3a761..7735465462 100644 | 64 | index 46a6e3a7..77354654 100644 |
64 | --- a/linux-user/mmap.c | 65 | --- a/linux-user/mmap.c |
65 | +++ b/linux-user/mmap.c | 66 | +++ b/linux-user/mmap.c |
66 | @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) | 67 | @@ -78,7 +78,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) |
@@ -110,10 +111,10 @@ index 46a6e3a761..7735465462 100644 | |||
110 | 111 | ||
111 | if (flags & MREMAP_FIXED) { | 112 | if (flags & MREMAP_FIXED) { |
112 | diff --git a/linux-user/syscall.c b/linux-user/syscall.c | 113 | diff --git a/linux-user/syscall.c b/linux-user/syscall.c |
113 | index 8b41a03901..bc5d85de02 100644 | 114 | index 171c0cae..fc18f244 100644 |
114 | --- a/linux-user/syscall.c | 115 | --- a/linux-user/syscall.c |
115 | +++ b/linux-user/syscall.c | 116 | +++ b/linux-user/syscall.c |
116 | @@ -4031,9 +4031,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, | 117 | @@ -4138,9 +4138,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, |
117 | return -TARGET_EINVAL; | 118 | return -TARGET_EINVAL; |
118 | } | 119 | } |
119 | } | 120 | } |
@@ -123,7 +124,7 @@ index 8b41a03901..bc5d85de02 100644 | |||
123 | 124 | ||
124 | mmap_lock(); | 125 | mmap_lock(); |
125 | 126 | ||
126 | @@ -6881,7 +6878,7 @@ static int open_self_maps(void *cpu_env, int fd) | 127 | @@ -6990,7 +6987,7 @@ static int open_self_maps(void *cpu_env, int fd) |
127 | } | 128 | } |
128 | if (h2g_valid(min)) { | 129 | if (h2g_valid(min)) { |
129 | int flags = page_get_flags(h2g(min)); | 130 | int flags = page_get_flags(h2g(min)); |
@@ -132,6 +133,3 @@ index 8b41a03901..bc5d85de02 100644 | |||
132 | if (page_check_range(h2g(min), max - min, flags) == -1) { | 133 | if (page_check_range(h2g(min), max - min, flags) == -1) { |
133 | continue; | 134 | continue; |
134 | } | 135 | } |
135 | -- | ||
136 | 2.22.0 | ||
137 | |||