helper_wait is a global C symbol. Prefix it so one binary can keep that short name free for another target.
Signed-off-by: Yonggang Luo <[email protected]> --- target/mips/helper.h | 2 +- target/mips/tcg/exception.c | 2 +- target/mips/tcg/translate.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/mips/helper.h b/target/mips/helper.h index 779b87101db..f2091c78e26 100644 --- a/target/mips/helper.h +++ b/target/mips/helper.h @@ -250,7 +250,7 @@ DEF_HELPER_1(rdhwr_xnp, tl, env) DEF_HELPER_1(rdhwr_chord, tl, env) DEF_HELPER_1(rdhwr_cvmcount, tl, env) DEF_HELPER_2(pmon, void, env, int) -DEF_HELPER_1(wait, void, env) +DEF_HELPER_1(mips_wait, void, env) #ifdef TARGET_MIPS64 DEF_HELPER_FLAGS_2(lcsr_cpucfg, TCG_CALL_NO_RWG_SE, tl, env, tl) diff --git a/target/mips/tcg/exception.c b/target/mips/tcg/exception.c index 630b8b809fa..95fc922aa68 100644 --- a/target/mips/tcg/exception.c +++ b/target/mips/tcg/exception.c @@ -65,7 +65,7 @@ static void raise_exception(CPUMIPSState *env, uint32_t exception) do_raise_exception(env, exception, 0); } -void helper_wait(CPUMIPSState *env) +void helper_mips_wait(CPUMIPSState *env) { CPUState *cs = env_cpu(env); diff --git a/target/mips/tcg/translate.c b/target/mips/tcg/translate.c index e3467d15251..40ff71ffd00 100644 --- a/target/mips/tcg/translate.c +++ b/target/mips/tcg/translate.c @@ -8683,7 +8683,7 @@ static void gen_cp0(CPUMIPSState *env, DisasContext *ctx, uint32_t opc, ctx->base.pc_next += 4; save_cpu_state(ctx, 1); ctx->base.pc_next -= 4; - gen_helper_wait(tcg_env); + gen_helper_mips_wait(tcg_env); ctx->base.is_jmp = DISAS_NORETURN; break; default: -- 2.52.0.windows.1
