]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
libbpf: Fix Makefile' libbpf symbol mismatch diagnostic
authorAndrii Nakryiko <andriin@fb.com>
Wed, 27 Nov 2019 20:01:34 +0000 (12:01 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 17 Jan 2020 18:48:41 +0000 (19:48 +0100)
commit b568405856906ee4d9ba6284fd36f2928653a623 upstream.

Fix Makefile's diagnostic diff output when there is LIBBPF_API-versioned
symbols mismatch.

Fixes: 1bd63524593b ("libbpf: handle symbol versioning properly for libbpf.a")
Signed-off-by: Andrii Nakryiko <andriin@fb.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Yonghong Song <yhs@fb.com>
Link: https://lore.kernel.org/bpf/20191127200134.1360660-1-andriin@fb.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
tools/lib/bpf/Makefile

index 56ce6292071b1d3575c26aafaea7967004d5a4cc..33e2638ef7f0d5b4b8ae28a23b43521358e40575 100644 (file)
@@ -215,7 +215,7 @@ check_abi: $(OUTPUT)libbpf.so
                     "versioned symbols in $^ ($(VERSIONED_SYM_COUNT))." \
                     "Please make sure all LIBBPF_API symbols are"       \
                     "versioned in $(VERSION_SCRIPT)." >&2;              \
-               readelf -s --wide $(OUTPUT)libbpf-in.o |                 \
+               readelf -s --wide $(BPF_IN_SHARED) |                     \
                    cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' |   \
                    awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$8}'|   \
                    sort -u > $(OUTPUT)libbpf_global_syms.tmp;           \