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/rx/helper.h | 2 +- target/rx/op_helper.c | 2 +- target/rx/translate.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/rx/helper.h b/target/rx/helper.h index 8cc38b0cb71..e88782cf227 100644 --- a/target/rx/helper.h +++ b/target/rx/helper.h @@ -1,7 +1,7 @@ DEF_HELPER_1(raise_illegal_instruction, noreturn, env) DEF_HELPER_1(raise_access_fault, noreturn, env) DEF_HELPER_1(raise_privilege_violation, noreturn, env) -DEF_HELPER_1(wait, noreturn, env) +DEF_HELPER_1(rx_wait, noreturn, env) DEF_HELPER_2(rxint, noreturn, env, i32) DEF_HELPER_1(rxbrk, noreturn, env) DEF_HELPER_3(fadd, f32, env, f32, f32) diff --git a/target/rx/op_helper.c b/target/rx/op_helper.c index 36df7d377e5..4bd25bb7d00 100644 --- a/target/rx/op_helper.c +++ b/target/rx/op_helper.c @@ -445,7 +445,7 @@ G_NORETURN void helper_raise_illegal_instruction(CPURXState *env) raise_exception(env, 23, GETPC()); } -G_NORETURN void helper_wait(CPURXState *env) +G_NORETURN void helper_rx_wait(CPURXState *env) { CPUState *cs = env_cpu(env); diff --git a/target/rx/translate.c b/target/rx/translate.c index 132d495710c..b2e3d346147 100644 --- a/target/rx/translate.c +++ b/target/rx/translate.c @@ -2197,7 +2197,7 @@ static bool trans_WAIT(DisasContext *ctx, arg_WAIT *a) { if (is_privileged(ctx, 1)) { tcg_gen_movi_i32(cpu_pc, ctx->base.pc_next); - gen_helper_wait(tcg_env); + gen_helper_rx_wait(tcg_env); } return true; } -- 2.52.0.windows.1
