From patchwork Thu Jan 28 20:36:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Llu=C3=ADs_Vilanova?= X-Patchwork-Id: 8153831 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 305B7BEEE5 for ; Thu, 28 Jan 2016 20:37:22 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0EEDC20221 for ; Thu, 28 Jan 2016 20:37:21 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B99852021B for ; Thu, 28 Jan 2016 20:37:19 +0000 (UTC) Received: from localhost ([::1]:58491 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOtJf-0001N7-4e for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Jan 2016 15:37:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50716) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOtJV-0001Ka-Fi for qemu-devel@nongnu.org; Thu, 28 Jan 2016 15:37:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aOtJR-0006xe-Dn for qemu-devel@nongnu.org; Thu, 28 Jan 2016 15:37:09 -0500 Received: from roura.ac.upc.edu ([147.83.33.10]:50945 helo=roura.ac.upc.es) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aOtJQ-0006wH-U1 for qemu-devel@nongnu.org; Thu, 28 Jan 2016 15:37:05 -0500 Received: from gw-3.ac.upc.es (gw-3.ac.upc.es [147.83.30.9]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id u0SKasG6018359; Thu, 28 Jan 2016 21:36:54 +0100 Received: from localhost (unknown [84.88.51.85]) by gw-3.ac.upc.es (Postfix) with ESMTPSA id C013416D; Thu, 28 Jan 2016 21:36:54 +0100 (CET) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Thu, 28 Jan 2016 21:36:54 +0100 Message-Id: <145401341105.13283.6918542543924796946.stgit@localhost> X-Mailer: git-send-email 2.7.0.rc3 User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by roura.ac.upc.es id u0SKasG6018359 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 147.83.33.10 Cc: Riku Voipio Subject: [Qemu-devel] [PATCH] build: Add include check on syscall.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The LTTng tracing backend includes the system's "syscall.h", but QEMU replaces it with its own for linux-user builds. This results in a double include on some targets (when LTTng is enabled). Signed-off-by: Lluís Vilanova --- linux-user/aarch64/syscall.h | 5 +++++ linux-user/alpha/syscall.h | 5 +++++ linux-user/arm/syscall.h | 4 ++++ linux-user/i386/syscall.h | 5 +++++ linux-user/m68k/syscall.h | 4 ++++ linux-user/mips/syscall.h | 4 ++++ linux-user/mips64/syscall.h | 4 ++++ linux-user/openrisc/syscall.h | 5 +++++ linux-user/ppc/syscall.h | 5 +++++ linux-user/s390x/syscall.h | 5 +++++ linux-user/sh4/syscall.h | 5 +++++ linux-user/sparc/syscall.h | 5 +++++ linux-user/sparc64/syscall.h | 5 +++++ linux-user/x86_64/syscall.h | 5 +++++ 14 files changed, 66 insertions(+) diff --git a/linux-user/aarch64/syscall.h b/linux-user/aarch64/syscall.h index dc72a15..b2e63c0 100644 --- a/linux-user/aarch64/syscall.h +++ b/linux-user/aarch64/syscall.h @@ -1,3 +1,6 @@ +#ifndef SYSCALL_H +#define SYSCALL_H + struct target_pt_regs { uint64_t regs[31]; uint64_t sp; @@ -11,3 +14,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* SYSCALL_H */ diff --git a/linux-user/alpha/syscall.h b/linux-user/alpha/syscall.h index 245cff2..f3f7ee8 100644 --- a/linux-user/alpha/syscall.h +++ b/linux-user/alpha/syscall.h @@ -1,3 +1,6 @@ +#ifndef SYSCALL_H +#define SYSCALL_H + /* default linux values for the selectors */ #define __USER_DS (1) @@ -255,3 +258,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 4096 #define TARGET_MLOCKALL_MCL_CURRENT 0x2000 #define TARGET_MLOCKALL_MCL_FUTURE 0x4000 + +#endif /* SYSCALL_H */ diff --git a/linux-user/arm/syscall.h b/linux-user/arm/syscall.h index 3844a96..795b99e 100644 --- a/linux-user/arm/syscall.h +++ b/linux-user/arm/syscall.h @@ -1,3 +1,5 @@ +#ifndef SYSCALL_H +#define SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */ @@ -48,3 +50,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* SYSCALL_H */ diff --git a/linux-user/i386/syscall.h b/linux-user/i386/syscall.h index 906aaac..527789b 100644 --- a/linux-user/i386/syscall.h +++ b/linux-user/i386/syscall.h @@ -1,3 +1,6 @@ +#ifndef SYSCALL_H +#define SYSCALL_H + /* default linux values for the selectors */ #define __USER_CS (0x23) #define __USER_DS (0x2B) @@ -150,3 +153,5 @@ struct target_vm86plus_struct { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* SYSCALL_H */ diff --git a/linux-user/m68k/syscall.h b/linux-user/m68k/syscall.h index 9218493..16db513 100644 --- a/linux-user/m68k/syscall.h +++ b/linux-user/m68k/syscall.h @@ -1,3 +1,5 @@ +#ifndef SYSCALL_H +#define SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */ @@ -23,3 +25,5 @@ struct target_pt_regs { #define TARGET_MLOCKALL_MCL_FUTURE 2 void do_m68k_simcall(CPUM68KState *, int); + +#endif /* SYSCALL_H */ diff --git a/linux-user/mips/syscall.h b/linux-user/mips/syscall.h index 35ca23b..3d66419 100644 --- a/linux-user/mips/syscall.h +++ b/linux-user/mips/syscall.h @@ -1,3 +1,5 @@ +#ifndef SYSCALL_H +#define SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */ @@ -231,3 +233,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* SYSCALL_H */ diff --git a/linux-user/mips64/syscall.h b/linux-user/mips64/syscall.h index 6733107..850900b 100644 --- a/linux-user/mips64/syscall.h +++ b/linux-user/mips64/syscall.h @@ -1,3 +1,5 @@ +#ifndef SYSCALL_H +#define SYSCALL_H /* this struct defines the way the registers are stored on the stack during a system call. */ @@ -228,3 +230,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* SYSCALL_H */ diff --git a/linux-user/openrisc/syscall.h b/linux-user/openrisc/syscall.h index 8ac0365..dedec50 100644 --- a/linux-user/openrisc/syscall.h +++ b/linux-user/openrisc/syscall.h @@ -1,3 +1,6 @@ +#ifndef SYSCALL_H +#define SYSCALL_H + struct target_pt_regs { union { struct { @@ -27,3 +30,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* SYSCALL_H */ diff --git a/linux-user/ppc/syscall.h b/linux-user/ppc/syscall.h index 0daf5cd..eec5a5f 100644 --- a/linux-user/ppc/syscall.h +++ b/linux-user/ppc/syscall.h @@ -17,6 +17,9 @@ * License along with this library; if not, see . */ +#ifndef SYSCALL_H +#define SYSCALL_H + /* XXX: ABSOLUTELY BUGGY: * for now, this is quite just a cut-and-paste from i386 target... */ @@ -73,3 +76,5 @@ struct target_revectored_struct { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 0x2000 #define TARGET_MLOCKALL_MCL_FUTURE 0x4000 + +#endif /* SYSCALL_H */ diff --git a/linux-user/s390x/syscall.h b/linux-user/s390x/syscall.h index 35f170a..5dfb4eb 100644 --- a/linux-user/s390x/syscall.h +++ b/linux-user/s390x/syscall.h @@ -1,3 +1,6 @@ +#ifndef SYSCALL_H +#define SYSCALL_H + /* this typedef defines how a Program Status Word looks like */ typedef struct { abi_ulong mask; @@ -27,3 +30,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* SYSCALL_H */ diff --git a/linux-user/sh4/syscall.h b/linux-user/sh4/syscall.h index 7aa4f23..3079965 100644 --- a/linux-user/sh4/syscall.h +++ b/linux-user/sh4/syscall.h @@ -1,3 +1,6 @@ +#ifndef SYSCALL_H +#define SYSCALL_H + struct target_pt_regs { unsigned long regs[16]; unsigned long pc; @@ -15,3 +18,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* SYSCALL_H */ diff --git a/linux-user/sparc/syscall.h b/linux-user/sparc/syscall.h index 58573b9..1dea395 100644 --- a/linux-user/sparc/syscall.h +++ b/linux-user/sparc/syscall.h @@ -1,3 +1,6 @@ +#ifndef SYSCALL_H +#define SYSCALL_H + struct target_pt_regs { abi_ulong psr; abi_ulong pc; @@ -18,3 +21,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 4096 #define TARGET_MLOCKALL_MCL_CURRENT 0x2000 #define TARGET_MLOCKALL_MCL_FUTURE 0x4000 + +#endif /* SYSCALL_H */ diff --git a/linux-user/sparc64/syscall.h b/linux-user/sparc64/syscall.h index 8398d3f..6b52c72 100644 --- a/linux-user/sparc64/syscall.h +++ b/linux-user/sparc64/syscall.h @@ -1,3 +1,6 @@ +#ifndef SYSCALL_H +#define SYSCALL_H + struct target_pt_regs { abi_ulong u_regs[16]; abi_ulong tstate; @@ -19,3 +22,5 @@ struct target_pt_regs { #define TARGET_MINSIGSTKSZ 4096 #define TARGET_MLOCKALL_MCL_CURRENT 0x2000 #define TARGET_MLOCKALL_MCL_FUTURE 0x4000 + +#endif /* SYSCALL_H */ diff --git a/linux-user/x86_64/syscall.h b/linux-user/x86_64/syscall.h index 88b3c3f..7e6b83b 100644 --- a/linux-user/x86_64/syscall.h +++ b/linux-user/x86_64/syscall.h @@ -1,3 +1,6 @@ +#ifndef SYSCALL_H +#define SYSCALL_H + #define __USER_CS (0x33) #define __USER_DS (0x2B) @@ -100,3 +103,5 @@ struct target_msqid64_ds { #define TARGET_MINSIGSTKSZ 2048 #define TARGET_MLOCKALL_MCL_CURRENT 1 #define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* SYSCALL_H */