diff options
| author | Peter Maydell | 2016-09-23 16:28:07 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-09-23 16:28:07 +0200 |
| commit | eaff9c4367ac3f7ac44f6c6f4cb7bcd4daa89af5 (patch) | |
| tree | 1c9ac2b900ee4a373c81ac7c6f9b512cd5018c77 /linux-user/syscall.c | |
| parent | Merge remote-tracking branch 'remotes/dgibson/tags/ppc-for-2.8-20160923' into... (diff) | |
| parent | linux-user: Add missing Mips syscalls items in strace.list (diff) | |
| download | qemu-eaff9c4367ac3f7ac44f6c6f4cb7bcd4daa89af5.tar.gz qemu-eaff9c4367ac3f7ac44f6c6f4cb7bcd4daa89af5.tar.xz qemu-eaff9c4367ac3f7ac44f6c6f4cb7bcd4daa89af5.zip | |
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.c')
| -rw-r--r-- | linux-user/syscall.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7aa2c1d720..0815f30965 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -658,7 +658,7 @@ static inline int next_free_host_timer(void) static inline int regpairs_aligned(void *cpu_env) { return ((((CPUARMState *)cpu_env)->eabi) == 1) ; } -#elif defined(TARGET_MIPS) +#elif defined(TARGET_MIPS) && (TARGET_ABI_BITS == 32) static inline int regpairs_aligned(void *cpu_env) { return 1; } #elif defined(TARGET_PPC) && !defined(TARGET_PPC64) /* SysV AVI for PPC32 expects 64bit parameters to be passed on odd/even pairs @@ -757,6 +757,7 @@ static uint16_t host_to_target_errno_table[ERRNO_TABLE_SIZE] = { [ENAVAIL] = TARGET_ENAVAIL, [EISNAM] = TARGET_EISNAM, [EREMOTEIO] = TARGET_EREMOTEIO, + [EDQUOT] = TARGET_EDQUOT, [ESHUTDOWN] = TARGET_ESHUTDOWN, [ETOOMANYREFS] = TARGET_ETOOMANYREFS, [ETIMEDOUT] = TARGET_ETIMEDOUT, |