[lkml]   [2022]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Subject[PATCH v1 0/3] tools: fix compilation failure caused by init_disassemble_info API changes
binutils changed the signature of init_disassemble_info(), which now causes
compilation failures for tools/{perf,bpf} on e.g. debian unstable. Relevant
binutils commit:;a=commit;h=60a3da00bd5407f07

I first fixed this without introducing the compat header, as suggested by
Quentin, but I thought the amount of repeated boilerplate was a bit too
much. So instead I introduced a compat header to wrap the API changes. Even
tools/bpf/bpftool/jit_disasm.c, which needs its own callbacks for json, imo
looks nicer this way.

I'm not regular contributor, so it very well might be my procedures are a
bit off...

I wasn't sure whether the split of the commits conforms with the kernel
habits should the changes to tools/bpf and tools/perf be split into
separate commits?

Nor was I sure if I the right [number of] people to CC?

WRT the feature test: Not sure what the point of the -DPACKAGE='"perf"' is,
nor why tools/perf/Makefile.config sets some LDFLAGS/CFLAGS that are also
in feature/Makefile and why -ldl isn't needed in the other places. But...

Andres Freund (3):
tools build: add feature test for init_disassemble_info API changes
tools: add dis-asm-compat.h to centralize handling of version
tools: Use tools/dis-asm-compat.h to fix compilation errors with new

Cc: Quentin Monnet <>
Cc: Alexei Starovoitov <>
Cc: Arnaldo Carvalho de Melo <>
Cc: Jiri Olsa <>

tools/bpf/Makefile | 7 ++-
tools/bpf/bpf_jit_disasm.c | 5 +-
tools/bpf/bpftool/Makefile | 7 ++-
tools/bpf/bpftool/jit_disasm.c | 40 +++++++++++---
tools/build/Makefile.feature | 4 +-
tools/build/feature/Makefile | 4 ++
tools/build/feature/test-all.c | 4 ++
.../feature/test-disassembler-init-styled.c | 13 +++++
tools/include/tools/dis-asm-compat.h | 53 +++++++++++++++++++
tools/perf/Makefile.config | 8 +++
tools/perf/util/annotate.c | 7 +--
11 files changed, 135 insertions(+), 17 deletions(-)
create mode 100644 tools/build/feature/test-disassembler-init-styled.c
create mode 100644 tools/include/tools/dis-asm-compat.h


 \ /
  Last update: 2022-07-03 06:53    [W:0.200 / U:3.592 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site