[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/21] linux-user: Enable NPTL for x86-64
From: |
riku . voipio |
Subject: |
[Qemu-devel] [PULL 12/21] linux-user: Enable NPTL for x86-64 |
Date: |
Tue, 23 Jul 2013 18:49:02 +0300 |
From: Peter Maydell <address@hidden>
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 <address@hidden>
Signed-off-by: Riku Voipio <address@hidden>
---
configure | 1 -
linux-user/i386/target_cpu.h | 7 +++++++
linux-user/syscall.c | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 547297b..999b2ce 100755
--- a/configure
+++ b/configure
@@ -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 1170d84..58f8645 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 452b89d..d3b3590 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;
--
1.8.1.2
- [Qemu-devel] [PULL 00/21] Linux-user updates, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 02/21] configure: Don't say target_nptl="no" if there is no linux-user target, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 06/21] linux-user: Enable NPTL for OpenRISC, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 03/21] configure: Enable threading on all ppc and mips linux-user targets, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 04/21] configure: Enable threading for unicore32-linux-user, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 12/21] linux-user: Enable NPTL for x86-64,
riku . voipio <=
- [Qemu-devel] [PULL 01/21] configure: Flip default of target_nptl, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 15/21] linux-user: Fix target_stat and target_stat64 for OpenRISC, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 17/21] linux-user: fix segmentation fault passing with h2g(x) != x, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 05/21] linux-user: Move includes of target-specific headers to end of qemu.h, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 08/21] linux-user: Enable NPTL for m68k, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 09/21] linux-user: Add missing 'break' in i386 get_thread_area syscall, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 18/21] linux-user: Fix epoll on ARM hosts, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 07/21] linux-user: Enable NPTL for SPARC targets, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 10/21] linux-user: Clean up handling of clone() argument order, riku . voipio, 2013/07/23
- [Qemu-devel] [PULL 14/21] linux-user: Avoid conditional cpu_reset(), riku . voipio, 2013/07/23