Skip to contentSkip to conversation

tcg/riscv: Fix building on OpenBSD/riscv64

PATCH In review Brad Smith 2 participants 2 messages Jun 26, 2024 RISC-V

lore
Share & tools
lore

Brad Smith

author
#0 lore raw

PATCH 1/1 tcg/riscv: Fix building on OpenBSD/riscv64

tcg/riscv: Fix building on OpenBSD/riscv64

---
 tcg/riscv/tcg-target.c.inc | 5 +++++
 1 file changed, 5 insertions(+)
tcg/riscv/tcg-target.c.inc +5 -0
index 639363039b..aeae9a8ad8 100644
@@ -2116,7 +2116,12 @@ static void sigill_handler(int signo, siginfo_t *si, void *data)
 {
     /* Skip the faulty instruction */
     ucontext_t *uc = (ucontext_t *)data;
+
+#ifdef __OpenBSD__
+    uc->sc_sepc += 4;
+#else
     uc->uc_mcontext.__gregs[REG_PC] += 4;
+#endif
 
     got_sigill = 1;
 }
Signature · 1 line
2.45.2
#1 lore raw
Quoted 4 lines · Brad Smith

tcg/riscv: Fix building on OpenBSD/riscv64

---

Please add in the commit msg a short description on the problem you're facing in the OpenBSD build and how this change fixes it. We want to keep a history on this kind of OS specific changes. There's also the possibility that an alternative fix might apply.

Thanks,

Daniel

Quoted 20 lines
  tcg/riscv/tcg-target.c.inc | 5 +++++
  1 file changed, 5 insertions(+)
tcg/riscv/tcg-target.c.inc +5 -0
index 639363039b..aeae9a8ad8 100644
@@ -2116,7 +2116,12 @@ static void sigill_handler(int signo, siginfo_t *si, void *data)
  {
      /* Skip the faulty instruction */
      ucontext_t *uc = (ucontext_t *)data;
+
+#ifdef __OpenBSD__
+    uc->sc_sepc += 4;
+#else
      uc->uc_mcontext.__gregs[REG_PC] += 4;
+#endif
 
      got_sigill = 1;
  }