| Message ID | 20191127200134.1360660-1-andriin@fb.com |
|---|---|
| State | Accepted |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | [bpf] libbpf: fix Makefile' libbpf symbol mismatch diagnostic | expand |
On 11/27/19 12:01 PM, Andrii Nakryiko wrote: > 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> Thanks for the fix! Acked-by: Yonghong Song <yhs@fb.com>
On 11/27/19 9:01 PM, Andrii Nakryiko wrote: > 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> Applied, thanks!
diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile index 99425d0be6ff..1470303b1922 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile @@ -214,7 +214,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; \
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> --- tools/lib/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)