Commit f24061e40d for qemu.org

commit f24061e40d2978a51bf15d7c6fcd7576c709c099
Author: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Date:   Wed Sep 30 02:01:07 2026 +0000

    target/or1k: prefix symbols conflicting with other arch

    Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
    Link: https://lore.kernel.org/qemu-devel/20260930020108.217892-21-pierrick.bouvier@oss.qualcomm.com
    Signed-off-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>

diff --git a/target/or1k/exception.c b/target/or1k/exception.c
index 0479a06959..785181ef2e 100644
--- a/target/or1k/exception.c
+++ b/target/or1k/exception.c
@@ -22,7 +22,7 @@
 #include "cpu.h"
 #include "exception.h"

-G_NORETURN void raise_exception(OpenRISCCPU *cpu, uint32_t excp)
+G_NORETURN void or1k_raise_exception(OpenRISCCPU *cpu, uint32_t excp)
 {
     CPUState *cs = CPU(cpu);

diff --git a/target/or1k/exception.h b/target/or1k/exception.h
index f62fc314c1..ff42f91d2a 100644
--- a/target/or1k/exception.h
+++ b/target/or1k/exception.h
@@ -22,6 +22,6 @@

 #include "cpu.h"

-G_NORETURN void raise_exception(OpenRISCCPU *cpu, uint32_t excp);
+G_NORETURN void or1k_raise_exception(OpenRISCCPU *cpu, uint32_t excp);

 #endif /* TARGET_OPENRISC_EXCEPTION_H */
diff --git a/target/or1k/exception_helper.c b/target/or1k/exception_helper.c
index 3bd82b2971..a5c21d1b65 100644
--- a/target/or1k/exception_helper.c
+++ b/target/or1k/exception_helper.c
@@ -27,7 +27,7 @@ void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp)
 {
     OpenRISCCPU *cpu = env_archcpu(env);

-    raise_exception(cpu, excp);
+    or1k_raise_exception(cpu, excp);
 }

 static G_NORETURN
diff --git a/target/or1k/helper.h b/target/or1k/helper.h
index e0a8d40227..9f74bed93a 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(rfe, 0, void, env)
+DEF_HELPER_FLAGS_1(or1k_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 1553ebc71b..91dd222744 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(rfe)(CPUOpenRISCState *env)
+void HELPER(or1k_rfe)(CPUOpenRISCState *env)
 {
     env->pc = env->epcr;
     env->lock_addr = -1;
diff --git a/target/or1k/sys_helper.c b/target/or1k/sys_helper.c
index 8ffa31b84f..ee0cc43467 100644
--- a/target/or1k/sys_helper.c
+++ b/target/or1k/sys_helper.c
@@ -58,7 +58,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, uint32_t spr, uint32_t rb)
     }

     if (is_user(env)) {
-        raise_exception(cpu, EXCP_ILLEGAL);
+        or1k_raise_exception(cpu, EXCP_ILLEGAL);
     }

 #ifndef CONFIG_USER_ONLY
@@ -157,7 +157,7 @@ void HELPER(mtspr)(CPUOpenRISCState *env, uint32_t spr, uint32_t rb)
             cpu_restore_state(cs, GETPC());
             env->pc += 4;
             cs->halted = 1;
-            raise_exception(cpu, EXCP_HALTED);
+            or1k_raise_exception(cpu, EXCP_HALTED);
         }
         break;
     case TO_SPR(9, 0):  /* PICMR */
@@ -231,7 +231,7 @@ uint32_t HELPER(mfspr)(CPUOpenRISCState *env, uint32_t rd, uint32_t spr)
     }

     if (is_user(env)) {
-        raise_exception(cpu, EXCP_ILLEGAL);
+        or1k_raise_exception(cpu, EXCP_ILLEGAL);
     }

 #ifndef CONFIG_USER_ONLY
diff --git a/target/or1k/translate.c b/target/or1k/translate.c
index e00ef45b9b..6972dc7d63 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_rfe(tcg_env);
+        gen_helper_or1k_rfe(tcg_env);
         dc->base.is_jmp = DISAS_EXIT;
     }
     return true;