commit adc028428a6da5ea8d6a688085966a33be4c97c7
author Richard Henderson <richard.henderson@linaro.org> Thu Jun 27 15:13:31 2024 +0000
committer Richard Henderson <richard.henderson@linaro.org> Wed Jul 03 10:24:12 2024 -0700
tree befe52abd9854bb70274ad8310e2bcb0b93436e0
parent b86c6ba689662256ea32f3e27927524ccb13f81d

util/cpuinfo-riscv: Support OpenBSD signal frame

Reported-by: Brad Smith <brad@comstyle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Acked-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

util/cpuinfo-riscv.c

diff --git a/util/cpuinfo-riscv.c b/util/cpuinfo-riscv.c
index 1236ee5..7dcfbee 100644
--- a/util/cpuinfo-riscv.c
+++ b/util/cpuinfo-riscv.c
@@ -13,7 +13,14 @@
 {
     /* Skip the faulty instruction */
     ucontext_t *uc = (ucontext_t *)data;
+
+#ifdef __linux__
     uc->uc_mcontext.__gregs[REG_PC] += 4;
+#elif defined(__OpenBSD__)
+    uc->sc_sepc += 4;
+#else
+# error Unsupported OS
+#endif
 
     got_sigill = 1;
 }