From 0c6940d086f39bbf725d96104abe46da87429cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= <vilanova@ac.upc.edu>
Date: Mon, 1 Feb 2016 19:38:47 +0100
Subject: [PATCH] build: [bsd-user] Rename "syscall.h" to "target_syscall.h" in
 target directories
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This fixes double-definitions in bsd-user builds when using the UST
tracing backend (which indirectly includes the system's "syscall.h").

Signed-off-by: Lluís Vilanova <vilanova@ac.upc.edu>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
 bsd-user/i386/{syscall.h => target_syscall.h}    | 4 ++++
 bsd-user/qemu.h                                  | 2 +-
 bsd-user/sparc/{syscall.h => target_syscall.h}   | 5 +++++
 bsd-user/sparc64/{syscall.h => target_syscall.h} | 5 +++++
 bsd-user/x86_64/{syscall.h => target_syscall.h}  | 5 +++++
 5 files changed, 20 insertions(+), 1 deletion(-)
 rename bsd-user/i386/{syscall.h => target_syscall.h} (97%)
 rename bsd-user/sparc/{syscall.h => target_syscall.h} (62%)
 rename bsd-user/sparc64/{syscall.h => target_syscall.h} (66%)
 rename bsd-user/x86_64/{syscall.h => target_syscall.h} (97%)

diff --git a/bsd-user/i386/syscall.h b/bsd-user/i386/target_syscall.h
similarity index 97%
rename from bsd-user/i386/syscall.h
rename to bsd-user/i386/target_syscall.h
index 9b34c61bb0..82d1c58ca5 100644
--- a/bsd-user/i386/syscall.h
+++ b/bsd-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)
@@ -159,3 +162,4 @@ struct target_vm86plus_struct {
 
 #define UNAME_MACHINE "i386"
 
+#endif  /* TARGET_SYSCALL_H */
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index 1b5f9983d1..03b502ad37 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -35,7 +35,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/bsd-user/sparc/syscall.h b/bsd-user/sparc/target_syscall.h
similarity index 62%
rename from bsd-user/sparc/syscall.h
rename to bsd-user/sparc/target_syscall.h
index 5a9bb7e546..c7eec6ba60 100644
--- a/bsd-user/sparc/syscall.h
+++ b/bsd-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;
@@ -7,3 +10,5 @@ struct target_pt_regs {
 };
 
 #define UNAME_MACHINE "sun4"
+
+#endif  /* TARGET_SYSCALL_H */
diff --git a/bsd-user/sparc64/syscall.h b/bsd-user/sparc64/target_syscall.h
similarity index 66%
rename from bsd-user/sparc64/syscall.h
rename to bsd-user/sparc64/target_syscall.h
index 81a816de94..2f06100ae5 100644
--- a/bsd-user/sparc64/syscall.h
+++ b/bsd-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;
@@ -8,3 +11,5 @@ struct target_pt_regs {
 };
 
 #define UNAME_MACHINE "sun4u"
+
+#endif  /* TARGET_SYSCALL_H */
diff --git a/bsd-user/x86_64/syscall.h b/bsd-user/x86_64/target_syscall.h
similarity index 97%
rename from bsd-user/x86_64/syscall.h
rename to bsd-user/x86_64/target_syscall.h
index 630514a930..85a9766970 100644
--- a/bsd-user/x86_64/syscall.h
+++ b/bsd-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)
 
@@ -114,3 +117,5 @@ struct target_msqid64_ds {
 #define TARGET_ARCH_SET_FS 0x1002
 #define TARGET_ARCH_GET_FS 0x1003
 #define TARGET_ARCH_GET_GS 0x1004
+
+#endif  /* TARGET_SYSCALL_H */