diff options
| author | Peter Maydell | 2017-11-21 11:44:44 +0100 |
|---|---|---|
| committer | Peter Maydell | 2017-11-21 11:44:44 +0100 |
| commit | 1b4e6e8cf8d8ff6ba3fd71eb41051ac2621ace7e (patch) | |
| tree | 70c2412a1fa690704940af86d2c71d19ee626b63 /linux-user/hppa/target_cpu.h | |
| parent | Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20171120'... (diff) | |
| parent | linux-user: Fix calculation of auxv length (diff) | |
| download | qemu-1b4e6e8cf8d8ff6ba3fd71eb41051ac2621ace7e.tar.gz qemu-1b4e6e8cf8d8ff6ba3fd71eb41051ac2621ace7e.tar.xz qemu-1b4e6e8cf8d8ff6ba3fd71eb41051ac2621ace7e.zip | |
Merge remote-tracking branch 'remotes/riku/tags/pull-linux-user-20171120' into staging
late linux-user fixes for Qemu 2.11
# gpg: Signature made Mon 20 Nov 2017 21:19:00 GMT
# gpg: using RSA key 0xB44890DEDE3C9BC0
# gpg: Good signature from "Riku Voipio <riku.voipio@iki.fi>"
# gpg: aka "Riku Voipio <riku.voipio@linaro.org>"
# Primary key fingerprint: FF82 03C8 C391 98AE 0581 41EF B448 90DE DE3C 9BC0
* remotes/riku/tags/pull-linux-user-20171120:
linux-user: Fix calculation of auxv length
linux-user: Handle rt_sigaction correctly for SPARC
linux-user/sparc: Put address for data faults where linux-user expects it
linux-user/ppc: Report correct fault address for data faults
linux-user/s390x: Mask si_addr for SIGSEGV
linux-user: return EINVAL from prctl(PR_*_SECCOMP)
linux-user: fix 'finshed' typo in comment
linux-user/syscall.c: Handle SH4's exceptional alignment for p{read, write}64
linux-user: Handle TARGET_MAP_STACK and TARGET_MAP_HUGETLB
linux-user/hppa: Fix TARGET_F_RDLCK, TARGET_F_WRLCK, TARGET_F_UNLCK
linux-user/hppa: Fix TARGET_MAP_TYPE
linux-user/hppa: Fix typo for TARGET_NR_epoll_wait
linux-user/hppa: Fix cpu_clone_regs
linux-user/hppa: Fix TARGET_SA_* defines
linux-user: Restrict usage of sa_restorer
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/hppa/target_cpu.h')
| -rw-r--r-- | linux-user/hppa/target_cpu.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/linux-user/hppa/target_cpu.h b/linux-user/hppa/target_cpu.h index 1a5cecad3c..e50522eae9 100644 --- a/linux-user/hppa/target_cpu.h +++ b/linux-user/hppa/target_cpu.h @@ -24,7 +24,11 @@ static inline void cpu_clone_regs(CPUHPPAState *env, target_ulong newsp) if (newsp) { env->gr[30] = newsp; } + /* Indicate child in return value. */ env->gr[28] = 0; + /* Return from the syscall. */ + env->iaoq_f = env->gr[31]; + env->iaoq_b = env->gr[31] + 4; } static inline void cpu_set_tls(CPUHPPAState *env, target_ulong newtls) |