diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-07-16 18:44:55 +0100 |
|---|---|---|
| committer | Riku Voipio <riku.voipio@linaro.org> | 2013-07-22 21:54:20 +0300 |
| commit | 1ccd9374af22ec4ed5f864d4935a9cfad01f1204 (patch) | |
| tree | b59e0ae070d155576af28d10c299650948e4585f | |
| parent | f5147c93d0e7f91df0215598017a4d9d6a48f0ee (diff) | |
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>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | linux-user/m68k/target_cpu.h | 6 | ||||
| -rw-r--r-- | linux-user/qemu.h | 1 | ||||
| -rw-r--r-- | linux-user/syscall.c | 12 |
4 files changed, 18 insertions, 2 deletions
@@ -4210,7 +4210,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 8c420da5c7..1ff0fa8b12 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 00a0390ea9..9619656d3c 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -8558,6 +8558,12 @@ 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; + break; + } #else goto unimplemented_nowarn; #endif @@ -8566,6 +8572,12 @@ 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; + ret = ts->tp_value; + break; + } #else goto unimplemented_nowarn; #endif |