mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: [bsd-user] Rename "syscall.h" to "target_syscall.h" in target directories

Browse Source 
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>
This commit is contained in:
Lluís Vilanova 2016-02-01 19:38:47 +01:00 committed by Peter Maydell
parent 586fc27e6a
commit 0c6940d086
5 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bsd-user/i386/syscall.h → bsd-user/i386/target_syscall.h
View File

@ -1,3 +1,6 @@
#ifndef TARGET_SYSCALL_H
#define TARGET_SYSCALL_H
/* default linux values for the selectors */ /* default linux values for the selectors */
#define __USER_CS (0x23) #define __USER_CS (0x23)
#define __USER_DS (0x2B) #define __USER_DS (0x2B)
@ -159,3 +162,4 @@ struct target_vm86plus_struct {
#define UNAME_MACHINE "i386" #define UNAME_MACHINE "i386"
#endif /* TARGET_SYSCALL_H */

2
bsd-user/qemu.h
View File

@ -35,7 +35,7 @@ enum BSDType {
extern enum BSDType bsd_type; extern enum BSDType bsd_type;
#include "syscall_defs.h" #include "syscall_defs.h"
#include "syscall.h" #include "target_syscall.h"
#include "target_signal.h" #include "target_signal.h"
#include "exec/gdbstub.h" #include "exec/gdbstub.h"

5
bsd-user/sparc/syscall.h → bsd-user/sparc/target_syscall.h
View File

@ -1,3 +1,6 @@
#ifndef TARGET_SYSCALL_H
#define TARGET_SYSCALL_H
struct target_pt_regs { struct target_pt_regs {
abi_ulong psr; abi_ulong psr;
abi_ulong pc; abi_ulong pc;
@ -7,3 +10,5 @@ struct target_pt_regs {
}; };
#define UNAME_MACHINE "sun4" #define UNAME_MACHINE "sun4"
#endif /* TARGET_SYSCALL_H */

5
bsd-user/sparc64/syscall.h → bsd-user/sparc64/target_syscall.h
View File

@ -1,3 +1,6 @@
#ifndef TARGET_SYSCALL_H
#define TARGET_SYSCALL_H
struct target_pt_regs { struct target_pt_regs {
abi_ulong u_regs[16]; abi_ulong u_regs[16];
abi_ulong tstate; abi_ulong tstate;
@ -8,3 +11,5 @@ struct target_pt_regs {
}; };
#define UNAME_MACHINE "sun4u" #define UNAME_MACHINE "sun4u"
#endif /* TARGET_SYSCALL_H */

5
bsd-user/x86_64/syscall.h → bsd-user/x86_64/target_syscall.h
View File

@ -1,3 +1,6 @@
#ifndef TARGET_SYSCALL_H
#define TARGET_SYSCALL_H
#define __USER_CS (0x33) #define __USER_CS (0x33)
#define __USER_DS (0x2B) #define __USER_DS (0x2B)
@ -114,3 +117,5 @@ struct target_msqid64_ds {
#define TARGET_ARCH_SET_FS 0x1002 #define TARGET_ARCH_SET_FS 0x1002
#define TARGET_ARCH_GET_FS 0x1003 #define TARGET_ARCH_GET_FS 0x1003
#define TARGET_ARCH_GET_GS 0x1004 #define TARGET_ARCH_GET_GS 0x1004
#endif /* TARGET_SYSCALL_H */