diff options
| author | Lluís Vilanova <vilanova@ac.upc.edu> | 2016-02-01 19:38:47 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-25 16:41:08 +0000 |
| commit | 0c6940d086f39bbf725d96104abe46da87429cb6 (patch) | |
| tree | a5b9897eb57ca09f98f8bf23444b58616561f92f | |
| parent | 586fc27e6a2ade22e35089e8972bc678b113e1db (diff) | |
| download | qemu-0c6940d086f39bbf725d96104abe46da87429cb6.zip qemu-0c6940d086f39bbf725d96104abe46da87429cb6.tar.gz qemu-0c6940d086f39bbf725d96104abe46da87429cb6.tar.bz2 | |
build: [bsd-user] Rename "syscall.h" to "target_syscall.h" in target directories
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>
| -rw-r--r-- | bsd-user/i386/target_syscall.h (renamed from bsd-user/i386/syscall.h) | 4 | ||||
| -rw-r--r-- | bsd-user/qemu.h | 2 | ||||
| -rw-r--r-- | bsd-user/sparc/target_syscall.h (renamed from bsd-user/sparc/syscall.h) | 5 | ||||
| -rw-r--r-- | bsd-user/sparc64/target_syscall.h (renamed from bsd-user/sparc64/syscall.h) | 5 | ||||
| -rw-r--r-- | bsd-user/x86_64/target_syscall.h (renamed from bsd-user/x86_64/syscall.h) | 5 |
5 files changed, 20 insertions, 1 deletions
diff --git a/bsd-user/i386/syscall.h b/bsd-user/i386/target_syscall.h index 9b34c61..82d1c58 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 1b5f998..03b502a 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 index 5a9bb7e..c7eec6b 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 index 81a816d..2f06100 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 index 630514a..85a9766 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 */ |