diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-08 17:27:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-09 09:09:50 +0000 |
commit | c56cafbc9b0bc53d5ebd49243c338c2a86a4a8a8 (patch) | |
tree | d9af0114c09f5a0840d8bffae4f6b4e2c0b448fc /meta/recipes-devtools/qemu/qemu/mmap2.patch | |
parent | d09b0030521410cbc0d36f18b5ca8b36b2c9ec19 (diff) | |
download | poky-c56cafbc9b0bc53d5ebd49243c338c2a86a4a8a8.tar.gz |
qemu: Add some user space mmap tweaks to address musl 32 bit build issues
(From OE-Core rev: 18a37fcd7c0a64a339d1eea88b16ba75c017c5d5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/mmap2.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/mmap2.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/mmap2.patch b/meta/recipes-devtools/qemu/qemu/mmap2.patch new file mode 100644 index 0000000000..9d40565938 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/mmap2.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an | ||
2 | infinite loop of mremap calls of ever decreasing/increasing addresses. | ||
3 | |||
4 | I suspect something in the musl memory allocation code loops indefinitely | ||
5 | if it only sees ENOMEM and only exits when it hits EFAULT. | ||
6 | |||
7 | According to the docs, trying to mremap outside the address space | ||
8 | can/should return EFAULT and changing this allows the build to succeed. | ||
9 | Whether this should be fixed in qemu and/or musl, not sure. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org | ||
13 | |||
14 | Index: qemu-5.2.0/linux-user/mmap.c | ||
15 | =================================================================== | ||
16 | --- qemu-5.2.0.orig/linux-user/mmap.c | ||
17 | +++ qemu-5.2.0/linux-user/mmap.c | ||
18 | @@ -727,7 +727,7 @@ abi_long target_mremap(abi_ulong old_add | ||
19 | !guest_range_valid(new_addr, new_size)) || | ||
20 | ((flags & MREMAP_MAYMOVE) == 0 && | ||
21 | !guest_range_valid(old_addr, new_size))) { | ||
22 | - errno = ENOMEM; | ||
23 | + errno = EFAULT; | ||
24 | return -1; | ||
25 | } | ||
26 | |||