From 0562384910bb304b6c811ecac0ad95e699a4c368 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Thu, 10 May 2018 01:11:22 +0200 Subject: linux-user: add sparc/sparc64 specific errno Copied from linux/arch/sparc/include/uapi/asm/errno.h Signed-off-by: Laurent Vivier Reviewed-by: Max Filippov Message-Id: <20180509231123.20864-6-laurent@vivier.eu> --- linux-user/sparc64/target_syscall.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'linux-user/sparc64/target_syscall.h') diff --git a/linux-user/sparc64/target_syscall.h b/linux-user/sparc64/target_syscall.h index 2cbbaaed1b..34f49df4a1 100644 --- a/linux-user/sparc64/target_syscall.h +++ b/linux-user/sparc64/target_syscall.h @@ -1,6 +1,8 @@ #ifndef SPARC64_TARGET_SYSCALL_H #define SPARC64_TARGET_SYSCALL_H +#include "../sparc/target_errno.h" + struct target_pt_regs { abi_ulong u_regs[16]; abi_ulong tstate; @@ -29,5 +31,4 @@ static inline abi_ulong target_shmlba(CPUSPARCState *env) { return MAX(TARGET_PAGE_SIZE, 16 * 1024); } - #endif /* SPARC64_TARGET_SYSCALL_H */ -- cgit v1.2.3-55-g7522 From 9a93c152fcdb4ab2cd85094487b33578fd693915 Mon Sep 17 00:00:00 2001 From: Laurent Vivier Date: Thu, 10 May 2018 01:11:23 +0200 Subject: linux-user: fix UNAME_MACHINE for sparc/sparc64 "sun4" is not recognized by config.guess. linux defines sparc and sparc64 in arch/sparc/Makefile. Signed-off-by: Laurent Vivier Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Max Filippov Message-Id: <20180509231123.20864-7-laurent@vivier.eu> --- linux-user/sparc/target_syscall.h | 2 +- linux-user/sparc64/target_syscall.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'linux-user/sparc64/target_syscall.h') diff --git a/linux-user/sparc/target_syscall.h b/linux-user/sparc/target_syscall.h index 3725875fcf..b9160a771b 100644 --- a/linux-user/sparc/target_syscall.h +++ b/linux-user/sparc/target_syscall.h @@ -11,7 +11,7 @@ struct target_pt_regs { abi_ulong u_regs[16]; }; -#define UNAME_MACHINE "sun4" +#define UNAME_MACHINE "sparc" #define UNAME_MINIMUM_RELEASE "2.6.32" /* SPARC kernels don't define this in their Kconfig, but they have the diff --git a/linux-user/sparc64/target_syscall.h b/linux-user/sparc64/target_syscall.h index 34f49df4a1..3073a23e03 100644 --- a/linux-user/sparc64/target_syscall.h +++ b/linux-user/sparc64/target_syscall.h @@ -12,7 +12,7 @@ struct target_pt_regs { abi_ulong fprs; }; -#define UNAME_MACHINE "sun4u" +#define UNAME_MACHINE "sparc64" #define UNAME_MINIMUM_RELEASE "2.6.32" /* SPARC kernels don't define this in their Kconfig, but they have the -- cgit v1.2.3-55-g7522