From: Richard Henderson Date: Fri, 8 Jul 2022 15:15:28 +0000 (+0530) Subject: linux-user/aarch64: Clear tpidr2_el0 if CLONE_SETTLS X-Git-Tag: v7.1.0-rc0~30^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95aa4fdd58c50ba1d800bb106d73ef8a656e016e;p=thirdparty%2Fqemu.git linux-user/aarch64: Clear tpidr2_el0 if CLONE_SETTLS Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20220708151540.18136-34-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- diff --git a/linux-user/aarch64/target_cpu.h b/linux-user/aarch64/target_cpu.h index 97a477bd3e9..f90359faf20 100644 --- a/linux-user/aarch64/target_cpu.h +++ b/linux-user/aarch64/target_cpu.h @@ -34,10 +34,13 @@ static inline void cpu_clone_regs_parent(CPUARMState *env, unsigned flags) static inline void cpu_set_tls(CPUARMState *env, target_ulong newtls) { - /* Note that AArch64 Linux keeps the TLS pointer in TPIDR; this is + /* + * Note that AArch64 Linux keeps the TLS pointer in TPIDR; this is * different from AArch32 Linux, which uses TPIDRRO. */ env->cp15.tpidr_el[0] = newtls; + /* TPIDR2_EL0 is cleared with CLONE_SETTLS. */ + env->cp15.tpidr2_el0 = 0; } static inline abi_ulong get_sp_from_cpustate(CPUARMState *state)