diff options
| author |   Stanislav Fomichev <sdf@google.com> | 2018-11-12 13:44:10 -0800 |
|---|---|---|
| committer |   Alexei Starovoitov <ast@kernel.org> | 2018-11-16 20:45:01 -0800 |
| commit | 29a9c10e4110e368443f0b606d71557edee7f2cc (patch) | |
| tree | 0c3025388dcfa6221044a9ad532775ff30bf077b /tools/bpf/bpftool/prog.c | |
| parent | Merge branch 'socket-lookup-cg_sock' (diff) | |
| download | linux-dev-29a9c10e4110e368443f0b606d71557edee7f2cc.tar.xz linux-dev-29a9c10e4110e368443f0b606d71557edee7f2cc.zip | |
bpftool: make libbfd optional
Make it possible to build bpftool without libbfd. libbfd and libopcodes are
typically provided in dev/dbg packages (binutils-dev in debian) which we
usually don't have installed on the fleet machines and we'd like a way to have
bpftool version that works without installing any additional packages.
This excludes support for disassembling jit-ted code and prints an error if
the user tries to use these features.
Tested by:
cat > FEATURES_DUMP.bpftool <<EOF
feature-libbfd=0
feature-disassembler-four-args=1
feature-reallocarray=0
feature-libelf=1
feature-libelf-mmap=1
feature-bpf=1
EOF
FEATURES_DUMP=$PWD/FEATURES_DUMP.bpftool make
ldd bpftool | grep libbfd
Signed-off-by: Stanislav Fomichev <sdf@google.com>
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Diffstat (limited to 'tools/bpf/bpftool/prog.c')
| -rw-r--r-- | tools/bpf/bpftool/prog.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c index 5ff5544596e7..c176e1aa66fe 100644 --- a/tools/bpf/bpftool/prog.c +++ b/tools/bpf/bpftool/prog.c @@ -467,6 +467,9 @@ static int do_dump(int argc, char **argv) int fd; if (is_prefix(*argv, "jited")) { + if (disasm_init()) + return -1; + member_len = &info.jited_prog_len; member_ptr = &info.jited_prog_insns; } else if (is_prefix(*argv, "xlated")) { |