diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-07-16 18:44:59 +0100 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2013-07-22 21:54:46 +0300 |
| commit | 2667e71c3d9262d756bea1473e2ea28eb2c9c070 (patch) | |
| tree | 3741de9edf902f34c0d79ced3a03aaf338abcada | |
| parent | bc22eb447c0552e2327f278fdc6bedccb14fc7a3 (diff) | |
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 <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | linux-user/i386/target_cpu.h | 7 | ||||
| -rw-r--r-- | linux-user/syscall.c | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -4193,7 +4193,6 @@ case "$target_name" in ;; x86_64) TARGET_BASE_ARCH=i386 - target_nptl="no" ;; alpha) ;; 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) */ diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 452b89df8d..d3b3590e8d 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -4189,7 +4189,7 @@ static abi_long do_get_thread_area(CPUX86State *env, abi_ulong ptr) #endif /* TARGET_I386 && TARGET_ABI32 */ #ifndef TARGET_ABI32 -static abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr) +abi_long do_arch_prctl(CPUX86State *env, int code, abi_ulong addr) { abi_long ret = 0; abi_ulong val; |