From patchwork Thu Dec 15 11:04:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Natanael Copa X-Patchwork-Id: 706036 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tfVxr2fHDz9sDG for ; Thu, 15 Dec 2016 22:06:40 +1100 (AEDT) Received: from localhost ([::1]:53657 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHTry-00044G-CL for incoming@patchwork.ozlabs.org; Thu, 15 Dec 2016 06:06:38 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHTrE-0002Ij-6Q for qemu-devel@nongnu.org; Thu, 15 Dec 2016 06:05:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cHTrA-0007dj-BH for qemu-devel@nongnu.org; Thu, 15 Dec 2016 06:05:52 -0500 Received: from nmsh4.e.nsc.no ([193.213.121.75]:35108) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cHTr4-0007RI-Pm; Thu, 15 Dec 2016 06:05:43 -0500 Received: from ncopa-desktop.copa.dup.pw (15.63.200.37.customer.cdi.no [37.200.63.15]) by nmsh4.nsc.no (8.14.7/8.14.7) with ESMTP id uBFB5PUq001603; Thu, 15 Dec 2016 12:05:28 +0100 (MET) From: Natanael Copa To: qemu-devel@nongnu.org Date: Thu, 15 Dec 2016 12:04:59 +0100 Message-Id: <20161215110459.27985-1-ncopa@alpinelinux.org> X-Mailer: git-send-email 2.11.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 193.213.121.75 Subject: [Qemu-devel] [PATCH] linux-user: fix build with musl on aarch64 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Natanael Copa , Riku Voipio Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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 --- 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) {