diff options
| author | Peter Maydell | 2018-05-15 11:04:22 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-05-15 11:04:22 +0200 |
| commit | f39ddb3a08df2d2573d6aff062190f093912f9ef (patch) | |
| tree | 06ac1527235b1164670d873019b96782caafb86e /linux-user/sparc/target_syscall.h | |
| parent | Merge remote-tracking branch 'remotes/vivier/tags/m68k-for-2.13-pull-request'... (diff) | |
| parent | linux-user: correctly align types in thunking code (diff) | |
| download | qemu-f39ddb3a08df2d2573d6aff062190f093912f9ef.tar.gz qemu-f39ddb3a08df2d2573d6aff062190f093912f9ef.tar.xz qemu-f39ddb3a08df2d2573d6aff062190f093912f9ef.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-2.13-pull-request' into staging
# gpg: Signature made Mon 14 May 2018 19:15:02 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-2.13-pull-request:
linux-user: correctly align types in thunking code
linux-user: fix UNAME_MACHINE for sparc/sparc64
linux-user: add sparc/sparc64 specific errno
linux-user: fix conversion of flock/flock64 l_type field
linux-user: update sparc/syscall_nr.h to linux header 4.16
linux-user: fix flock/flock64 padding
linux-user: define correct fcntl() values for sparc
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/sparc/target_syscall.h')
| -rw-r--r-- | linux-user/sparc/target_syscall.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-user/sparc/target_syscall.h b/linux-user/sparc/target_syscall.h index 5f09abfe89..b9160a771b 100644 --- a/linux-user/sparc/target_syscall.h +++ b/linux-user/sparc/target_syscall.h @@ -1,6 +1,8 @@ #ifndef SPARC_TARGET_SYSCALL_H #define SPARC_TARGET_SYSCALL_H +#include "target_errno.h" + struct target_pt_regs { abi_ulong psr; abi_ulong pc; @@ -9,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 |