From bc22eb447c0552e2327f278fdc6bedccb14fc7a3 Mon Sep 17 00:00:00 2001 From: Alexander Graf Date: Tue, 16 Jul 2013 18:44:58 +0100 Subject: linux-user: Add i386 TLS setter We can easily set the TLS on i386. Add code to do so. Signed-off-by: Alexander Graf [PMM: also remove "target_nptl=no" line from configure, for consistency with other patches in this series] Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/i386/target_cpu.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'linux-user/i386/target_cpu.h') diff --git a/linux-user/i386/target_cpu.h b/linux-user/i386/target_cpu.h index abcac79d25..1170d84c41 100644 --- a/linux-user/i386/target_cpu.h +++ b/linux-user/i386/target_cpu.h @@ -28,6 +28,14 @@ static inline void cpu_clone_regs(CPUX86State *env, target_ulong newsp) env->regs[R_EAX] = 0; } -/* TODO: need to implement cpu_set_tls() */ +#if defined(TARGET_ABI32) +abi_long do_set_thread_area(CPUX86State *env, abi_ulong ptr); -#endif +static inline void cpu_set_tls(CPUX86State *env, target_ulong newtls) +{ + do_set_thread_area(env, newtls); + cpu_x86_load_seg(env, R_GS, env->segs[R_GS].selector); +} +#endif /* defined(TARGET_ABI32) */ + +#endif /* !defined(TARGET_CPU_H) */ -- cgit v1.2.1 From 2667e71c3d9262d756bea1473e2ea28eb2c9c070 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 16 Jul 2013 18:44:59 +0100 Subject: linux-user: Enable NPTL for x86-64 Add x86-64 implementation of cpu_set_tls() (like the kernel, we just have to call do_arch_prctl() to set FS); this allows us to enable NPTL. Signed-off-by: Peter Maydell Signed-off-by: Riku Voipio --- linux-user/i386/target_cpu.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'linux-user/i386/target_cpu.h') diff --git a/linux-user/i386/target_cpu.h b/linux-user/i386/target_cpu.h index 1170d84c41..58f86454d6 100644 --- a/linux-user/i386/target_cpu.h +++ b/linux-user/i386/target_cpu.h @@ -36,6 +36,13 @@ static inline void cpu_set_tls(CPUX86State *env, target_ulong newtls) do_set_thread_area(env, newtls); cpu_x86_load_seg(env, R_GS, env->segs[R_GS].selector); } +#else +abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr); + +static inline void cpu_set_tls(CPUX86State *env, target_ulong newtls) +{ + do_arch_prctl(env, TARGET_ARCH_SET_FS, newtls); +} #endif /* defined(TARGET_ABI32) */ #endif /* !defined(TARGET_CPU_H) */ -- cgit v1.2.1