diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-15 11:06:16 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-12-15 11:06:45 +0000 |
| commit | 49a4d9d83fca66b27bcdfacb1bfac43f9b8d3028 (patch) | |
| tree | de510975fb7732e16eebb1477cbb08ca65c45a71 /main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch | |
| parent | 2da3ca85659652620b6914291326f18e4b0f8079 (diff) | |
| download | aports-49a4d9d83fca66b27bcdfacb1bfac43f9b8d3028.tar.bz2 aports-49a4d9d83fca66b27bcdfacb1bfac43f9b8d3028.tar.xz | |
main/qemu: fix build on aarch64
Diffstat (limited to 'main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch')
| -rw-r--r-- | main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch b/main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch new file mode 100644 index 0000000000..9bb534cebe --- /dev/null +++ b/main/qemu/0001-linux-user-fix-build-with-musl-on-aarch64.patch @@ -0,0 +1,34 @@ +From 806cb2ed28a16cf2894fabef034347f426f1d04e Mon Sep 17 00:00:00 2001 +From: Natanael Copa <ncopa@alpinelinux.org> +Date: Thu, 15 Dec 2016 11:53:07 +0100 +Subject: [PATCH] linux-user: fix build with musl on aarch64 + +Use the standard uint64_t instead of internal __u64. + +This fixes compiler error with musl libc on aarch64: +.../qemu-2.7.0/linux-user/host/aarch64/hostdep.h:28:5: +error: unknown type name '__u64' + __u64 *pcreg = &uc->uc_mcontext.pc; + ^~~~~ + +Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> +--- + linux-user/host/aarch64/hostdep.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/linux-user/host/aarch64/hostdep.h b/linux-user/host/aarch64/hostdep.h +index 64f75cef49..6fd6e36b2a 100644 +--- a/linux-user/host/aarch64/hostdep.h ++++ b/linux-user/host/aarch64/hostdep.h +@@ -25,7 +25,7 @@ extern char safe_syscall_end[]; + static inline void rewind_if_in_safe_syscall(void *puc) + { + struct ucontext *uc = puc; +- __u64 *pcreg = &uc->uc_mcontext.pc; ++ uint64_t *pcreg = &uc->uc_mcontext.pc; + + if (*pcreg > (uintptr_t)safe_syscall_start + && *pcreg < (uintptr_t)safe_syscall_end) { +-- +2.11.0 + |