aboutsummaryrefslogtreecommitdiffstats
path: root/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-12-21 14:30:41 +0100
committerNatanael Copa <ncopa@alpinelinux.org>2016-12-21 14:33:51 +0100
commit2bb133986e8fa90e2e76d53369f03861a87a74ef (patch)
treee59b1b1b8c8257711783eb6a3fd1bc1866876bf7 /main/qemu/musl-F_SHLCK-and-F_EXLCK.patch
parentb41b6740e2bf0aa63d1c2389df349d58f749dd72 (diff)
downloadaports-2bb133986e8fa90e2e76d53369f03861a87a74ef.tar.bz2
aports-2bb133986e8fa90e2e76d53369f03861a87a74ef.tar.xz
main/qemu: upgrade to 2.8.0
Diffstat (limited to 'main/qemu/musl-F_SHLCK-and-F_EXLCK.patch')
-rw-r--r--main/qemu/musl-F_SHLCK-and-F_EXLCK.patch14
1 files changed, 6 insertions, 8 deletions
diff --git a/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch b/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch
index 92157a7764..316819afab 100644
--- a/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch
+++ b/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch
@@ -1,11 +1,9 @@
This patch was not upstreamed to qemu as those should probably be
defined in musl libc.
-diff --git a/linux-user/syscall.c b/linux-user/syscall.c
-index c8989b6..00ed747 100644
---- a/linux-user/syscall.c
-+++ b/linux-user/syscall.c
-@@ -114,6 +114,13 @@ int __clone2(int (*fn)(void *), void *child_stack_base,
+--- ./linux-user/syscall.c.orig
++++ ./linux-user/syscall.c
+@@ -114,6 +114,13 @@
#include "qemu.h"
@@ -16,6 +14,6 @@ index c8989b6..00ed747 100644
+#define F_EXLCK 4
+#endif
+
- #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \
- CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID)
-
+ #ifndef CLONE_IO
+ #define CLONE_IO 0x80000000 /* Clone io context */
+ #endif