diff options
| author | Richard Henderson <rth@twiddle.net> | 2010-04-12 16:17:22 -0700 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-04-27 05:50:41 +0200 |
| commit | a4b388ff51c2feb5eca563feae9bfc5fc1c5c85c (patch) | |
| tree | e3259c085a82ae416ab3603cb12834d5652aa8b0 | |
| parent | 49563a727494197ad87936bfd07841878878b650 (diff) | |
target-alpha: Enable NPTL.
Signed-off-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | linux-user/syscall.c | 2 | ||||
| -rw-r--r-- | target-alpha/cpu.h | 29 |
3 files changed, 20 insertions, 12 deletions
@@ -2432,6 +2432,7 @@ case "$target_arch2" in ;; alpha) target_phys_bits=64 + target_nptl="yes" ;; arm|armeb) TARGET_ARCH=arm diff --git a/linux-user/syscall.c b/linux-user/syscall.c index eb77ade9e7..17599eb254 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -5768,7 +5768,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, ret = get_errno(fsync(arg1)); break; case TARGET_NR_clone: -#if defined(TARGET_SH4) +#if defined(TARGET_SH4) || defined(TARGET_ALPHA) ret = get_errno(do_fork(cpu_env, arg1, arg2, arg3, arg5, arg4)); #elif defined(TARGET_CRIS) ret = get_errno(do_fork(cpu_env, arg2, arg1, arg3, arg4, arg5)); diff --git a/target-alpha/cpu.h b/target-alpha/cpu.h index 8afe16db27..c3979300f1 100644 --- a/target-alpha/cpu.h +++ b/target-alpha/cpu.h @@ -411,15 +411,6 @@ static inline int cpu_mmu_index (CPUState *env) return (env->ps >> 3) & 3; } -#if defined(CONFIG_USER_ONLY) -static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) -{ - if (newsp) - env->ir[30] = newsp; - /* FIXME: Zero syscall return value. */ -} -#endif - #include "cpu-all.h" #include "exec-all.h" @@ -477,7 +468,7 @@ enum { IR_S4 = 13, IR_S5 = 14, IR_S6 = 15, -#define IR_FP IR_S6 + IR_FP = IR_S6, IR_A0 = 16, IR_A1 = 17, IR_A2 = 18, @@ -490,7 +481,7 @@ enum { IR_T11 = 25, IR_RA = 26, IR_T12 = 27, -#define IR_PV IR_T12 + IR_PV = IR_T12, IR_AT = 28, IR_GP = 29, IR_SP = 30, @@ -531,4 +522,20 @@ static inline void cpu_get_tb_cpu_state(CPUState *env, target_ulong *pc, *flags = env->ps; } +#if defined(CONFIG_USER_ONLY) +static inline void cpu_clone_regs(CPUState *env, target_ulong newsp) +{ + if (newsp) { + env->ir[IR_SP] = newsp; + } + env->ir[IR_V0] = 0; + env->ir[IR_A3] = 0; +} + +static inline void cpu_set_tls(CPUState *env, target_ulong newtls) +{ + env->unique = newtls; +} +#endif + #endif /* !defined (__CPU_ALPHA_H__) */ |