* [PATCH v2] perf build: Fix compiler errors with old capstone
@ 2026-07-06 23:48 Namhyung Kim
2026-07-20 4:44 ` Namhyung Kim
0 siblings, 1 reply; 2+ messages in thread
From: Namhyung Kim @ 2026-07-06 23:48 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo
Cc: Ian Rogers, Jiri Olsa, Adrian Hunter, James Clark,
Peter Zijlstra, Ingo Molnar, LKML, linux-perf-users
It seems RISCV was added in capstone version 5 (released Jul 2023).
Unfortunately they are enum constants so cannot check with #ifdef but
anyway we can define the symbols. Let's do it using the version
number to avoid build errors. It'll fail at runtime though.
util/capstone.c: In function 'e_machine_to_capstone':
util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function);
did you mean 'CS_ARCH_SYSZ'?
186 | *arch = CS_ARCH_RISCV;
| ^~~~~~~~~~~~~
| CS_ARCH_SYSZ
util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
util/capstone.c:187:34: error: 'CS_MODE_RISCV64' undeclared (first use in this function);
did you mean 'CS_MODE_MIPS64'?
187 | *mode |= (is64 ? CS_MODE_RISCV64 : CS_MODE_RISCV32) | CS_MODE_RISCVC;
| ^~~~~~~~~~~~~~~
| CS_MODE_MIPS64
Also note that capstone renamed CS_MODE_RISCVC to CS_MODE_RISCV_C which
would cause a different build failure on latest versions. It's reported
in https://github.com/capstone-engine/capstone/issues/2977 so I think
they will add compatibility layer to prevent the error.
Fixes: 12c4737f55f2 ("perf capstone: Determine architecture from e_machine")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
v2 changes)
* use the actual constant for CS_ARCH_RISCV (Sashiko)
tools/perf/util/capstone.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/perf/util/capstone.c b/tools/perf/util/capstone.c
index 5ad537fea4360e31..0247142a77ba3c25 100644
--- a/tools/perf/util/capstone.c
+++ b/tools/perf/util/capstone.c
@@ -24,6 +24,13 @@
#include "symbol.h"
#include "thread.h"
+#if CS_VERSION_MAJOR < 5
+#define CS_ARCH_RISCV 15
+#define CS_MODE_RISCV32 1
+#define CS_MODE_RISCV64 2
+#define CS_MODE_RISCVC 4
+#endif
+
#ifdef LIBCAPSTONE_DLOPEN
static void *perf_cs_dll_handle(void)
{
--
2.55.0.rc2.803.g1fd1e6609c-goog
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH v2] perf build: Fix compiler errors with old capstone
2026-07-06 23:48 [PATCH v2] perf build: Fix compiler errors with old capstone Namhyung Kim
@ 2026-07-20 4:44 ` Namhyung Kim
0 siblings, 0 replies; 2+ messages in thread
From: Namhyung Kim @ 2026-07-20 4:44 UTC (permalink / raw)
To: Arnaldo Carvalho de Melo, Namhyung Kim
Cc: Ian Rogers, Jiri Olsa, Adrian Hunter, James Clark,
Peter Zijlstra, Ingo Molnar, LKML, linux-perf-users
On Mon, 06 Jul 2026 16:48:35 -0700, Namhyung Kim wrote:
> It seems RISCV was added in capstone version 5 (released Jul 2023).
> Unfortunately they are enum constants so cannot check with #ifdef but
> anyway we can define the symbols. Let's do it using the version
> number to avoid build errors. It'll fail at runtime though.
>
> util/capstone.c: In function 'e_machine_to_capstone':
> util/capstone.c:186:25: error: 'CS_ARCH_RISCV' undeclared (first use in this function);
> did you mean 'CS_ARCH_SYSZ'?
> 186 | *arch = CS_ARCH_RISCV;
> | ^~~~~~~~~~~~~
> | CS_ARCH_SYSZ
> util/capstone.c:186:25: note: each undeclared identifier is reported only once for each function it appears in
>
> [...]
Applied to perf-tools-next, thanks!
Best regards,
Namhyung
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-07-20 4:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-06 23:48 [PATCH v2] perf build: Fix compiler errors with old capstone Namhyung Kim
2026-07-20 4:44 ` Namhyung Kim
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®