diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-09-23 15:28:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-09-23 15:28:07 +0100 |
| commit | eaff9c4367ac3f7ac44f6c6f4cb7bcd4daa89af5 (patch) | |
| tree | 1c9ac2b900ee4a373c81ac7c6f9b512cd5018c77 /linux-user/syscall_defs.h | |
| parent | c229472af095765cdbae95ad057b170d98f81e25 (diff) | |
| parent | fea55615b2f924128e115ceb2265069561b03ef8 (diff) | |
| download | qemu-eaff9c4367ac3f7ac44f6c6f4cb7bcd4daa89af5.zip qemu-eaff9c4367ac3f7ac44f6c6f4cb7bcd4daa89af5.tar.gz qemu-eaff9c4367ac3f7ac44f6c6f4cb7bcd4daa89af5.tar.bz2 | |
Merge remote-tracking branch 'remotes/lalrae/tags/mips-20160923' into staging
MIPS patches 2016-09-23
Changes:
* 24KEc CPU definition
* SYNC instructions make use of tcg memory barrier ops
* various MIPS linux-user bug fixes
# gpg: Signature made Fri 23 Sep 2016 08:09:08 BST
# gpg: using RSA key 0x52118E3C0B29DA6B
# gpg: Good signature from "Leon Alrae <leon.alrae@imgtec.com>"
# Primary key fingerprint: 8DD3 2F98 5495 9D66 35D4 4FC0 5211 8E3C 0B29 DA6B
* remotes/lalrae/tags/mips-20160923:
linux-user: Add missing Mips syscalls items in strace.list
linux-user: Add missing TARGET_EDQUOT error code for Mips
linux-user: Fix certain argument alignment cases for Mips64
linux-user: Fix structure target_semid64_ds definition for Mips
linux-user: Fix structure target_flock definition for Mips
linux-user: Fix TARGET_F_GETOWN definition for Mips
linux-user: Fix TARGET_SIOCATMARK definition for Mips
target-mips: generate fences
target-mips: add 24KEc CPU definition
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/syscall_defs.h')
| -rw-r--r-- | linux-user/syscall_defs.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h index 5c19c5c..9fdbe86 100644 --- a/linux-user/syscall_defs.h +++ b/linux-user/syscall_defs.h @@ -898,7 +898,11 @@ struct target_pollfd { #define TARGET_KDSETLED 0x4B32 /* set led state [lights, not flags] */ #define TARGET_KDSIGACCEPT 0x4B4E +#if defined(TARGET_ALPHA) || defined(TARGET_MIPS) || defined(TARGET_SH4) +#define TARGET_SIOCATMARK TARGET_IOR('s', 7, int) +#else #define TARGET_SIOCATMARK 0x8905 +#endif /* Networking ioctls */ #define TARGET_SIOCADDRT 0x890B /* add routing table entry */ @@ -2160,7 +2164,7 @@ struct target_statfs64 { #define TARGET_F_SETLK 6 #define TARGET_F_SETLKW 7 #define TARGET_F_SETOWN 24 /* for sockets. */ -#define TARGET_F_GETOWN 25 /* for sockets. */ +#define TARGET_F_GETOWN 23 /* for sockets. */ #else #define TARGET_F_GETLK 5 #define TARGET_F_SETLK 6 @@ -2329,7 +2333,13 @@ struct target_flock { short l_whence; abi_long l_start; abi_long l_len; +#if defined(TARGET_MIPS) + abi_long l_sysid; +#endif int l_pid; +#if defined(TARGET_MIPS) + abi_long pad[4]; +#endif }; struct target_flock64 { |