From 460c579f3ddc71bcf34128d4b3d1e1debdd93f73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Vilanova?= Date: Mon, 1 Feb 2016 19:38:42 +0100 Subject: build: [linux-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 linux-user builds when using the UST tracing backend (which indirectly includes the system's "syscall.h"). Signed-off-by: Lluís Vilanova Reviewed-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/sh4/syscall.h | 17 ----------------- linux-user/sh4/target_syscall.h | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 17 deletions(-) delete mode 100644 linux-user/sh4/syscall.h create mode 100644 linux-user/sh4/target_syscall.h (limited to 'linux-user/sh4') diff --git a/linux-user/sh4/syscall.h b/linux-user/sh4/syscall.h deleted file mode 100644 index 7aa4f23..0000000 --- a/linux-user/sh4/syscall.h +++ /dev/null @@ -1,17 +0,0 @@ -struct target_pt_regs { - unsigned long regs[16]; - unsigned long pc; - unsigned long pr; - unsigned long sr; - unsigned long gbr; - unsigned long mach; - unsigned long macl; - long tra; -}; - -#define UNAME_MACHINE "sh4" -#define UNAME_MINIMUM_RELEASE "2.6.32" - -#define TARGET_MINSIGSTKSZ 2048 -#define TARGET_MLOCKALL_MCL_CURRENT 1 -#define TARGET_MLOCKALL_MCL_FUTURE 2 diff --git a/linux-user/sh4/target_syscall.h b/linux-user/sh4/target_syscall.h new file mode 100644 index 0000000..9f3381b --- /dev/null +++ b/linux-user/sh4/target_syscall.h @@ -0,0 +1,22 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + +struct target_pt_regs { + unsigned long regs[16]; + unsigned long pc; + unsigned long pr; + unsigned long sr; + unsigned long gbr; + unsigned long mach; + unsigned long macl; + long tra; +}; + +#define UNAME_MACHINE "sh4" +#define UNAME_MINIMUM_RELEASE "2.6.32" + +#define TARGET_MINSIGSTKSZ 2048 +#define TARGET_MLOCKALL_MCL_CURRENT 1 +#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */ -- cgit v1.1