aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-07-05 16:35:20 +0100
committerPeter Maydell <peter.maydell@linaro.org>2013-07-05 16:55:23 +0100
commitb5d215ada18fe903ebd2cb2f636bbf4e5e4c3980 (patch)
treec9a0dc48424f5e16d44e2a81d1393d2c865ed5a2
parentd5bea018507d1d67d5b787f99fea779f452eeebe (diff)
downloadqemu-arm-b5d215ada18fe903ebd2cb2f636bbf4e5e4c3980.tar.gz
linux-user: Enable NPTL for x86
This is bogus, but it will compile...
-rwxr-xr-xconfigure2
-rw-r--r--linux-user/i386/target_cpu.h5
2 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index 1e8fbd94ad..da681f4404 100755
--- a/configure
+++ b/configure
@@ -4156,11 +4156,9 @@ TARGET_ABI_DIR=""
case "$target_name" in
i386)
- target_nptl="no"
;;
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 abcac79d25..8425628f6e 100644
--- a/linux-user/i386/target_cpu.h
+++ b/linux-user/i386/target_cpu.h
@@ -28,6 +28,9 @@ static inline void cpu_clone_regs(CPUX86State *env, target_ulong newsp)
env->regs[R_EAX] = 0;
}
-/* TODO: need to implement cpu_set_tls() */
+static inline void cpu_set_tls(CPUX86State *env, target_ulong newtls)
+{
+ // FIXME actually implement!
+}
#endif