diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-29 16:58:45 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-04-29 17:00:14 +0200 |
| commit | 61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20 (patch) | |
| tree | 18280f2794e0bd731a92488c0ebf9ed77749f0ac /main/qemu/musl-F_SHLCK-and-F_EXLCK.patch | |
| parent | 7dc7dfaf5ee97c22fdb1ce15f6702fb9c8c324cd (diff) | |
| download | aports-61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20.tar.bz2 aports-61a7a1b77a868e3b940c0b25e6c2b2a6c32caf20.tar.xz | |
main/qemu: replace patches with the ones sent upstream
Patches sent upstream:
http://lists.nongnu.org/archive/html/qemu-devel/2014-04/msg04773.html
Diffstat (limited to 'main/qemu/musl-F_SHLCK-and-F_EXLCK.patch')
| -rw-r--r-- | main/qemu/musl-F_SHLCK-and-F_EXLCK.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch b/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch new file mode 100644 index 0000000000..92157a7764 --- /dev/null +++ b/main/qemu/musl-F_SHLCK-and-F_EXLCK.patch @@ -0,0 +1,21 @@ +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, + + #include "qemu.h" + ++#ifndef F_SHLCK ++#define F_SHLCK 8 ++#endif ++#ifndef F_EXLCK ++#define F_EXLCK 4 ++#endif ++ + #define CLONE_NPTL_FLAGS2 (CLONE_SETTLS | \ + CLONE_PARENT_SETTID | CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID) + |