31 lines
1.1 KiB
Diff
31 lines
1.1 KiB
Diff
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)
|
|
{
|
|
ucontext_t *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) {
|