Now that we have a generic mechanism to prefix all helpers, we can undo the recent changes that fixed conflicts between targets in multi-target set.
This reverts commit f24061e40d2978a51bf15d7c6fcd7576c709c099 "target/or1k: prefix symbols conflicting with other arch" Signed-off-by: Pierrick Bouvier <[email protected]> --- target/or1k/helper.h | 2 +- target/or1k/interrupt_helper.c | 2 +- target/or1k/translate.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/or1k/helper.h b/target/or1k/helper.h index 9f74bed93af..e0a8d402271 100644 --- a/target/or1k/helper.h +++ b/target/or1k/helper.h @@ -59,7 +59,7 @@ FOP_CMP(ult) #undef FOP_CMP /* interrupt */ -DEF_HELPER_FLAGS_1(or1k_rfe, 0, void, env) +DEF_HELPER_FLAGS_1(rfe, 0, void, env) /* sys */ DEF_HELPER_FLAGS_3(mtspr, 0, void, env, i32, i32) diff --git a/target/or1k/interrupt_helper.c b/target/or1k/interrupt_helper.c index 91dd2227442..1553ebc71b0 100644 --- a/target/or1k/interrupt_helper.c +++ b/target/or1k/interrupt_helper.c @@ -22,7 +22,7 @@ #include "cpu.h" #include "exec/helper-proto.h" -void HELPER(or1k_rfe)(CPUOpenRISCState *env) +void HELPER(rfe)(CPUOpenRISCState *env) { env->pc = env->epcr; env->lock_addr = -1; diff --git a/target/or1k/translate.c b/target/or1k/translate.c index 6972dc7d630..e00ef45b9b7 100644 --- a/target/or1k/translate.c +++ b/target/or1k/translate.c @@ -1110,7 +1110,7 @@ static bool trans_l_rfe(DisasContext *dc, arg_l_rfe *a) if (is_user(dc)) { gen_illegal_exception(dc); } else { - gen_helper_or1k_rfe(tcg_env); + gen_helper_rfe(tcg_env); dc->base.is_jmp = DISAS_EXIT; } return true; -- 2.43.0
