aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2013-07-05 16:10:50 +0100
committerPeter Maydell <peter.maydell@linaro.org>2013-07-05 16:55:23 +0100
commitd5bea018507d1d67d5b787f99fea779f452eeebe (patch)
treef19ee20d7fd7cf08242e5bf5b88708a4deaae624
parent0d1c33b1fef4fece6ab074f5cd0f7978b241ebd8 (diff)
downloadqemu-arm-d5bea018507d1d67d5b787f99fea779f452eeebe.tar.gz
linux-user: Enable NPTL for m68k
For m68k, per-thread data is a purely kernel construct with no CPU level support. Implement it via a field in the TaskState structure, used by cpu_set_tls() and the set_thread_area/get_thread_area syscalls. This allows us to enable compilation with NPTL. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rwxr-xr-xconfigure1
-rw-r--r--linux-user/m68k/target_cpu.h6
-rw-r--r--linux-user/qemu.h1
-rw-r--r--linux-user/syscall.c10
4 files changed, 16 insertions, 2 deletions
diff --git a/configure b/configure
index 23fa686575..1e8fbd94ad 100755
--- a/configure
+++ b/configure
@@ -4176,7 +4176,6 @@ case "$target_name" in
m68k)
bflt="yes"
gdb_xml_files="cf-core.xml cf-fp.xml"
- target_nptl="no"
;;
microblaze|microblazeel)
TARGET_ARCH=microblaze
diff --git a/linux-user/m68k/target_cpu.h b/linux-user/m68k/target_cpu.h
index 8a2a305a0b..cad9c90dd0 100644
--- a/linux-user/m68k/target_cpu.h
+++ b/linux-user/m68k/target_cpu.h
@@ -29,6 +29,10 @@ static inline void cpu_clone_regs(CPUM68KState *env, target_ulong newsp)
env->dregs[0] = 0;
}
-/* TODO: need to implement cpu_set_tls() */
+static inline void cpu_set_tls(CPUM68KState *env, target_ulong newtls)
+{
+ TaskState *ts = env->opaque;
+ ts->tp_value = newtls;
+}
#endif
diff --git a/linux-user/qemu.h b/linux-user/qemu.h
index b64f1528ed..832bd6e872 100644
--- a/linux-user/qemu.h
+++ b/linux-user/qemu.h
@@ -121,6 +121,7 @@ typedef struct TaskState {
#endif
#ifdef TARGET_M68K
int sim_syscalls;
+ abi_ulong tp_value;
#endif
#if defined(TARGET_ARM) || defined(TARGET_M68K) || defined(TARGET_UNICORE32)
/* Extra fields for semihosted binaries. */
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index cdd0c28fff..256f00d462 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -8448,6 +8448,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
#elif defined(TARGET_I386) && defined(TARGET_ABI32)
ret = do_set_thread_area(cpu_env, arg1);
break;
+#elif defined(TARGET_M68K)
+ {
+ TaskState *ts = ((CPUArchState *)cpu_env)->opaque;
+ ts->tp_value = arg1;
+ }
#else
goto unimplemented_nowarn;
#endif
@@ -8456,6 +8461,11 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
case TARGET_NR_get_thread_area:
#if defined(TARGET_I386) && defined(TARGET_ABI32)
ret = do_get_thread_area(cpu_env, arg1);
+#elif defined(TARGET_M68K)
+ {
+ TaskState *ts = ((CPUArchState *)cpu_env)->opaque;
+ ts->tp_value = arg1;
+ }
#else
goto unimplemented_nowarn;
#endif