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/aarch64/syscall.h | 13 ------------- linux-user/aarch64/target_syscall.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 13 deletions(-) delete mode 100644 linux-user/aarch64/syscall.h create mode 100644 linux-user/aarch64/target_syscall.h (limited to 'linux-user/aarch64') diff --git a/linux-user/aarch64/syscall.h b/linux-user/aarch64/syscall.h deleted file mode 100644 index dc72a15c5e..0000000000 --- a/linux-user/aarch64/syscall.h +++ /dev/null @@ -1,13 +0,0 @@ -struct target_pt_regs { - uint64_t regs[31]; - uint64_t sp; - uint64_t pc; - uint64_t pstate; -}; - -#define UNAME_MACHINE "aarch64" -#define UNAME_MINIMUM_RELEASE "3.8.0" -#define TARGET_CLONE_BACKWARDS -#define TARGET_MINSIGSTKSZ 2048 -#define TARGET_MLOCKALL_MCL_CURRENT 1 -#define TARGET_MLOCKALL_MCL_FUTURE 2 diff --git a/linux-user/aarch64/target_syscall.h b/linux-user/aarch64/target_syscall.h new file mode 100644 index 0000000000..f458018048 --- /dev/null +++ b/linux-user/aarch64/target_syscall.h @@ -0,0 +1,18 @@ +#ifndef TARGET_SYSCALL_H +#define TARGET_SYSCALL_H + +struct target_pt_regs { + uint64_t regs[31]; + uint64_t sp; + uint64_t pc; + uint64_t pstate; +}; + +#define UNAME_MACHINE "aarch64" +#define UNAME_MINIMUM_RELEASE "3.8.0" +#define TARGET_CLONE_BACKWARDS +#define TARGET_MINSIGSTKSZ 2048 +#define TARGET_MLOCKALL_MCL_CURRENT 1 +#define TARGET_MLOCKALL_MCL_FUTURE 2 + +#endif /* TARGET_SYSCALL_H */ -- cgit v1.2.3