2024-04-15 10:07:13

by cp0613

Subject: [PATCH] tools/perf: Fix compiling with libelf on rv32

From: Chen Pei <[email protected]>

When cross-compiling perf with libelf, the following error occurred:

In file included from tests/genelf.c:14:
tests/../util/genelf.h:50:2: error: #error "unsupported architecture"
50 | #error "unsupported architecture"
| ^~~~~
tests/../util/genelf.h:59:5: warning: "GEN_ELF_CLASS" is not defined, evaluates to 0 [-Wundef]
59 | #if GEN_ELF_CLASS == ELFCLASS64

Fix this by adding GEN-ELF-ARCH and GEN-ELF-CLASS definitions for rv32.

Signed-off-by: Chen Pei <[email protected]>
---
tools/perf/util/genelf.h | 3 +++
1 file changed, 3 insertions(+)

diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h
index 5f18d20ea903..4e2e4f40e134 100644
--- a/tools/perf/util/genelf.h
+++ b/tools/perf/util/genelf.h
@@ -43,6 +43,9 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
#elif defined(__riscv) && __riscv_xlen == 64
#define GEN_ELF_ARCH EM_RISCV
#define GEN_ELF_CLASS ELFCLASS64
+#elif defined(__riscv) && __riscv_xlen == 32
+#define GEN_ELF_ARCH EM_RISCV
+#define GEN_ELF_CLASS ELFCLASS32
#elif defined(__loongarch__)
#define GEN_ELF_ARCH EM_LOONGARCH
#define GEN_ELF_CLASS ELFCLASS64
--
2.25.1

2024-04-16 15:05:15

by Ian Rogers

Subject: Re: [PATCH] tools/perf: Fix compiling with libelf on rv32

On Mon, Apr 15, 2024 at 2:57 AM <[email protected]> wrote:
>
> From: Chen Pei <[email protected]>
>
> When cross-compiling perf with libelf, the following error occurred:
>
> In file included from tests/genelf.c:14:
> tests/../util/genelf.h:50:2: error: #error "unsupported architecture"
> 50 | #error "unsupported architecture"
> | ^~~~~
> tests/../util/genelf.h:59:5: warning: "GEN_ELF_CLASS" is not defined, evaluates to 0 [-Wundef]
> 59 | #if GEN_ELF_CLASS == ELFCLASS64
>
> Fix this by adding GEN-ELF-ARCH and GEN-ELF-CLASS definitions for rv32.
>
> Signed-off-by: Chen Pei <[email protected]>

Reviewed-by: Ian Rogers <[email protected]>

Thanks,
Ian

> ---
> tools/perf/util/genelf.h | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h
> index 5f18d20ea903..4e2e4f40e134 100644
> --- a/tools/perf/util/genelf.h
> +++ b/tools/perf/util/genelf.h
> @@ -43,6 +43,9 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent
> #elif defined(__riscv) && __riscv_xlen == 64
> #define GEN_ELF_ARCH EM_RISCV
> #define GEN_ELF_CLASS ELFCLASS64
> +#elif defined(__riscv) && __riscv_xlen == 32
> +#define GEN_ELF_ARCH EM_RISCV
> +#define GEN_ELF_CLASS ELFCLASS32
> #elif defined(__loongarch__)
> #define GEN_ELF_ARCH EM_LOONGARCH
> #define GEN_ELF_CLASS ELFCLASS64
> --
> 2.25.1
>
>

2024-04-17 15:59:30

by Arnaldo Carvalho de Melo

Subject: Re: [PATCH] tools/perf: Fix compiling with libelf on rv32

On Tue, Apr 16, 2024 at 08:04:55AM -0700, Ian Rogers wrote:
> On Mon, Apr 15, 2024 at 2:57 AM <[email protected]> wrote:
> >
> > From: Chen Pei <[email protected]>
> >
> > When cross-compiling perf with libelf, the following error occurred:
> >
> > In file included from tests/genelf.c:14:
> > tests/../util/genelf.h:50:2: error: #error "unsupported architecture"
> > 50 | #error "unsupported architecture"
> > | ^~~~~
> > tests/../util/genelf.h:59:5: warning: "GEN_ELF_CLASS" is not defined, evaluates to 0 [-Wundef]
> > 59 | #if GEN_ELF_CLASS == ELFCLASS64
> >
> > Fix this by adding GEN-ELF-ARCH and GEN-ELF-CLASS definitions for rv32.
> >
> > Signed-off-by: Chen Pei <[email protected]>
>
> Reviewed-by: Ian Rogers <[email protected]>

Thanks, applied to perf-tools-next,

- Arnaldo