| Message ID | YJaspEh0qZr4LYOc@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 67e7ec0bd4535fc6e6d3f5d174f80e10a8a80c6e |
| Delegated to: | BPF |
| Headers | show |
| Series | [1/1] libbpf: Provide GELF_ST_VISIBILITY() define for older libelf | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
Hello: This patch was applied to bpf/bpf.git (refs/heads/master): On Sat, 8 May 2021 12:22:12 -0300 you wrote: > Where that macro isn't available. > > Cc: Alexei Starovoitov <ast@kernel.org> > Cc: Andrii Nakryiko <andrii@kernel.org> > Cc: Jiri Olsa <jolsa@kernel.org> > Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> > > [...] Here is the summary with links: - [1/1] libbpf: Provide GELF_ST_VISIBILITY() define for older libelf https://git.kernel.org/bpf/bpf/c/67e7ec0bd453 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/tools/lib/bpf/libbpf_internal.h b/tools/lib/bpf/libbpf_internal.h index ee426226928f1283..acbcf6c7bdf82cf2 100644 --- a/tools/lib/bpf/libbpf_internal.h +++ b/tools/lib/bpf/libbpf_internal.h @@ -41,6 +41,11 @@ #define ELF_C_READ_MMAP ELF_C_READ #endif +/* Older libelf all end up in this expression, for both 32 and 64 bit */ +#ifndef GELF_ST_VISIBILITY +#define GELF_ST_VISIBILITY(o) ((o) & 0x03) +#endif + #define BTF_INFO_ENC(kind, kind_flag, vlen) \ ((!!(kind_flag) << 31) | ((kind) << 24) | ((vlen) & BTF_MAX_VLEN)) #define BTF_TYPE_ENC(name, info, size_or_type) (name), (info), (size_or_type)
Where that macro isn't available. Cc: Alexei Starovoitov <ast@kernel.org> Cc: Andrii Nakryiko <andrii@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/lib/bpf/libbpf_internal.h | 5 +++++ 1 file changed, 5 insertions(+)