From patchwork Fri Jan 29 18:53:00 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: 8166531 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 7529BBEEE5 for ; Fri, 29 Jan 2016 18:53:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 228B620389 for ; Fri, 29 Jan 2016 18:53:31 +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 6224620383 for ; Fri, 29 Jan 2016 18:53:29 +0000 (UTC) Received: from localhost ([::1]:36188 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPEAi-0001MO-LE for patchwork-qemu-devel@patchwork.kernel.org; Fri, 29 Jan 2016 13:53:28 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPEAZ-0001M3-Us for qemu-devel@nongnu.org; Fri, 29 Jan 2016 13:53:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPEAW-0002c6-NY for qemu-devel@nongnu.org; Fri, 29 Jan 2016 13:53:19 -0500 Received: from roura.ac.upc.es ([147.83.33.10]:53055) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPEAW-0002ac-1X for qemu-devel@nongnu.org; Fri, 29 Jan 2016 13:53:16 -0500 Received: from gw-2.ac.upc.es (gw-2.ac.upc.es [147.83.30.8]) by roura.ac.upc.es (8.13.8/8.13.8) with ESMTP id u0TIr1Ae028903; Fri, 29 Jan 2016 19:53:01 +0100 Received: from localhost (unknown [84.88.51.85]) by gw-2.ac.upc.es (Postfix) with ESMTPSA id 3D08275B; Fri, 29 Jan 2016 19:53:01 +0100 (CET) From: =?utf-8?b?TGx1w61z?= Vilanova To: qemu-devel@nongnu.org Date: Fri, 29 Jan 2016 19:53:00 +0100 Message-Id: <145409357935.2637.1991225753195816483.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 u0TIr1Ae028903 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 147.83.33.10 Cc: Blue Swirl , Peter Maydell , Riku Voipio , "Edgar E. Iglesias" Subject: [Qemu-devel] [PATCH] build: Rename all "syscall.h" in target directories to "target_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 This fixes double-definitions in *-user builds when using the UST tracing backend (which indirectly includes the system's "syscall.h"). Signed-off-by: Lluís Vilanova --- bsd-user/qemu.h | 2 +- linux-user/aarch64/target_syscall.h | 5 +++++ linux-user/alpha/target_syscall.h | 5 +++++ linux-user/arm/target_syscall.h | 4 ++++ linux-user/cris/target_syscall.h | 0 linux-user/i386/target_syscall.h | 5 +++++ linux-user/m68k/target_syscall.h | 4 ++++ linux-user/mips/target_syscall.h | 4 ++++ linux-user/mips64/target_syscall.h | 4 ++++ linux-user/openrisc/target_syscall.h | 5 +++++ linux-user/ppc/target_syscall.h | 5 +++++ linux-user/qemu.h | 2 +- linux-user/s390x/target_syscall.h | 5 +++++ linux-user/sh4/target_syscall.h | 5 +++++ linux-user/sparc/target_syscall.h | 5 +++++ linux-user/sparc64/target_syscall.h | 5 +++++ linux-user/unicore32/target_syscall.h | 0 linux-user/x86_64/target_syscall.h | 5 +++++ target-microblaze/target_syscall.h | 1 + target-tilegx/target_syscall.h | 1 + 20 files changed, 70 insertions(+), 2 deletions(-) rename linux-user/aarch64/{syscall.h => target_syscall.h} (80%) rename linux-user/alpha/{syscall.h => target_syscall.h} (98%) rename linux-user/arm/{syscall.h => target_syscall.h} (93%) rename linux-user/cris/{syscall.h => target_syscall.h} (100%) rename linux-user/i386/{syscall.h => target_syscall.h} (97%) rename linux-user/m68k/{syscall.h => target_syscall.h} (87%) rename linux-user/mips/{syscall.h => target_syscall.h} (99%) rename linux-user/mips64/{syscall.h => target_syscall.h} (99%) rename linux-user/openrisc/{syscall.h => target_syscall.h} (90%) rename linux-user/ppc/{syscall.h => target_syscall.h} (96%) rename linux-user/s390x/{syscall.h => target_syscall.h} (89%) rename linux-user/sh4/{syscall.h => target_syscall.h} (83%) rename linux-user/sparc/{syscall.h => target_syscall.h} (87%) rename linux-user/sparc64/{syscall.h => target_syscall.h} (87%) rename linux-user/unicore32/{syscall.h => target_syscall.h} (100%) rename linux-user/x86_64/{syscall.h => target_syscall.h} (96%) create mode 100644 target-microblaze/target_syscall.h create mode 100644 target-tilegx/target_syscall.h diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h index 735cb40..1a361df 100644 --- a/bsd-user/qemu.h +++ b/bsd-user/qemu.h @@ -38,7 +38,7 @@ enum BSDType { extern enum BSDType bsd_type; #include "syscall_defs.h" -#include "syscall.h" +#include "target_syscall.h" #include "target_signal.h" #include "exec/gdbstub.h" diff --git a/linux-user/aarch64/syscall.h b/linux-user/aarch64/target_syscall.h similarity index 80% rename from linux-user/aarch64/syscall.h rename to linux-user/aarch64/target_syscall.h index dc72a15..f458018 100644 --- a/linux-user/aarch64/syscall.h +++ b/linux-user/aarch64/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/alpha/syscall.h b/linux-user/alpha/target_syscall.h similarity index 98% rename from linux-user/alpha/syscall.h rename to linux-user/alpha/target_syscall.h index 245cff2..3db4b16 100644 --- a/linux-user/alpha/syscall.h +++ b/linux-user/alpha/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/arm/syscall.h b/linux-user/arm/target_syscall.h similarity index 93% rename from linux-user/arm/syscall.h rename to linux-user/arm/target_syscall.h index 3844a96..ea863db 100644 --- a/linux-user/arm/syscall.h +++ b/linux-user/arm/target_syscall.h @@ -1,3 +1,5 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/cris/syscall.h b/linux-user/cris/target_syscall.h similarity index 100% rename from linux-user/cris/syscall.h rename to linux-user/cris/target_syscall.h diff --git a/linux-user/i386/syscall.h b/linux-user/i386/target_syscall.h similarity index 97% rename from linux-user/i386/syscall.h rename to linux-user/i386/target_syscall.h index 906aaac..0ac84dc 100644 --- a/linux-user/i386/syscall.h +++ b/linux-user/i386/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/m68k/syscall.h b/linux-user/m68k/target_syscall.h similarity index 87% rename from linux-user/m68k/syscall.h rename to linux-user/m68k/target_syscall.h index 9218493..97a4cc0 100644 --- a/linux-user/m68k/syscall.h +++ b/linux-user/m68k/target_syscall.h @@ -1,3 +1,5 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/mips/syscall.h b/linux-user/mips/target_syscall.h similarity index 99% rename from linux-user/mips/syscall.h rename to linux-user/mips/target_syscall.h index 35ca23b..68db160 100644 --- a/linux-user/mips/syscall.h +++ b/linux-user/mips/target_syscall.h @@ -1,3 +1,5 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/mips64/syscall.h b/linux-user/mips64/target_syscall.h similarity index 99% rename from linux-user/mips64/syscall.h rename to linux-user/mips64/target_syscall.h index 6733107..0e0c2d2 100644 --- a/linux-user/mips64/syscall.h +++ b/linux-user/mips64/target_syscall.h @@ -1,3 +1,5 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/openrisc/syscall.h b/linux-user/openrisc/target_syscall.h similarity index 90% rename from linux-user/openrisc/syscall.h rename to linux-user/openrisc/target_syscall.h index 8ac0365..19aeffc 100644 --- a/linux-user/openrisc/syscall.h +++ b/linux-user/openrisc/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/ppc/syscall.h b/linux-user/ppc/target_syscall.h similarity index 96% rename from linux-user/ppc/syscall.h rename to linux-user/ppc/target_syscall.h index 0daf5cd..35cab59 100644 --- a/linux-user/ppc/syscall.h +++ b/linux-user/ppc/target_syscall.h @@ -17,6 +17,9 @@ * License along with this library; if not, see . */ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/qemu.h b/linux-user/qemu.h index bd90cc3..1be04e2 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -16,7 +16,7 @@ #include "exec/user/thunk.h" #include "syscall_defs.h" -#include "syscall.h" +#include "target_syscall.h" #include "exec/gdbstub.h" #include "qemu/queue.h" diff --git a/linux-user/s390x/syscall.h b/linux-user/s390x/target_syscall.h similarity index 89% rename from linux-user/s390x/syscall.h rename to linux-user/s390x/target_syscall.h index 35f170a..02061ef 100644 --- a/linux-user/s390x/syscall.h +++ b/linux-user/s390x/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/sh4/syscall.h b/linux-user/sh4/target_syscall.h similarity index 83% rename from linux-user/sh4/syscall.h rename to linux-user/sh4/target_syscall.h index 7aa4f23..9f3381b 100644 --- a/linux-user/sh4/syscall.h +++ b/linux-user/sh4/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/sparc/syscall.h b/linux-user/sparc/target_syscall.h similarity index 87% rename from linux-user/sparc/syscall.h rename to linux-user/sparc/target_syscall.h index 58573b9..a73fa6d 100644 --- a/linux-user/sparc/syscall.h +++ b/linux-user/sparc/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/sparc64/syscall.h b/linux-user/sparc64/target_syscall.h similarity index 87% rename from linux-user/sparc64/syscall.h rename to linux-user/sparc64/target_syscall.h index 8398d3f..eb827fc 100644 --- a/linux-user/sparc64/syscall.h +++ b/linux-user/sparc64/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/linux-user/unicore32/syscall.h b/linux-user/unicore32/target_syscall.h similarity index 100% rename from linux-user/unicore32/syscall.h rename to linux-user/unicore32/target_syscall.h diff --git a/linux-user/x86_64/syscall.h b/linux-user/x86_64/target_syscall.h similarity index 96% rename from linux-user/x86_64/syscall.h rename to linux-user/x86_64/target_syscall.h index 88b3c3f..feecd32 100644 --- a/linux-user/x86_64/syscall.h +++ b/linux-user/x86_64/target_syscall.h @@ -1,3 +1,6 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_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 /* TARGET_SYSCALL_H */ diff --git a/target-microblaze/target_syscall.h b/target-microblaze/target_syscall.h new file mode 100644 index 0000000..27ba378 --- /dev/null +++ b/target-microblaze/target_syscall.h @@ -0,0 +1 @@ +#include diff --git a/target-tilegx/target_syscall.h b/target-tilegx/target_syscall.h new file mode 100644 index 0000000..27ba378 --- /dev/null +++ b/target-tilegx/target_syscall.h @@ -0,0 +1 @@ +#include