diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-07-16 18:44:53 +0100 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2013-07-22 21:54:12 +0300 |
| commit | 442a59c8ddc55f327ec0219d810fe4580177716a (patch) | |
| tree | f681ea014c519954adf038c0f950160df473df7e | |
| parent | dfeab06c98f7bc37f8ad8a6a2f8f677e5a57a55d (diff) | |
| download | focaccia-qemu-442a59c8ddc55f327ec0219d810fe4580177716a.tar.gz focaccia-qemu-442a59c8ddc55f327ec0219d810fe4580177716a.zip | |
linux-user: Enable NPTL for OpenRISC
The OpenRISC kernel ignores CLONE_SETTLS in its copy_thread() implementation, so a cpu_set_tls() implementation is a no-op. cpu_clone_regs() was setting the syscall return value in the wrong register -- it is gpr[11], not gpr[2]. With these two things fixed, we can compile with NPTL enabled. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Jia Liu <proljc@gmail.com> Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | linux-user/openrisc/target_cpu.h | 9 |
2 files changed, 7 insertions, 3 deletions
diff --git a/configure b/configure index 0b19408458..bfad34e327 100755 --- a/configure +++ b/configure @@ -4236,7 +4236,6 @@ case "$target_name" in or32) TARGET_ARCH=openrisc TARGET_BASE_ARCH=openrisc - target_nptl="no" ;; ppc) gdb_xml_files="power-core.xml power-fpu.xml power-altivec.xml power-spe.xml" diff --git a/linux-user/openrisc/target_cpu.h b/linux-user/openrisc/target_cpu.h index 501fb81162..32a46ac840 100644 --- a/linux-user/openrisc/target_cpu.h +++ b/linux-user/openrisc/target_cpu.h @@ -25,9 +25,14 @@ static inline void cpu_clone_regs(CPUOpenRISCState *env, target_ulong newsp) if (newsp) { env->gpr[1] = newsp; } - env->gpr[2] = 0; + env->gpr[11] = 0; } -/* TODO: need to implement cpu_set_tls() */ +static inline void cpu_set_tls(CPUOpenRISCState *env, target_ulong newtls) +{ + /* Linux kernel 3.10 does not pay any attention to CLONE_SETTLS + * in copy_thread(), so QEMU need not do so either. + */ +} #endif |