From: Greg Kroah-Hartman Date: Mon, 28 Sep 2020 11:28:40 +0000 (+0200) Subject: change comment in queue-5.8/tools-libbpf-avoid-counting-local-symbols-in-abi-che... X-Git-Tag: v4.4.238~38 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c50731aef6f59458e74acb521c5705a704fec16;p=thirdparty%2Fkernel%2Fstable-queue.git change comment in queue-5.8/tools-libbpf-avoid-counting-local-symbols-in-abi-che.patch quilt could not apply it with a diff in the changelog body :( --- diff --git a/queue-5.8/tools-libbpf-avoid-counting-local-symbols-in-abi-che.patch b/queue-5.8/tools-libbpf-avoid-counting-local-symbols-in-abi-che.patch index 94796b58252..07fa0d73212 100644 --- a/queue-5.8/tools-libbpf-avoid-counting-local-symbols-in-abi-che.patch +++ b/queue-5.8/tools-libbpf-avoid-counting-local-symbols-in-abi-che.patch @@ -13,8 +13,8 @@ with GCC 8.4.0 and binutils 2.34: (long paths shortened) Warning: Num of global symbols in sharedobjs/libbpf-in.o (234) does NOT match with num of versioned symbols in libbpf.so (236). Please make sure all LIBBPF_API symbols are versioned in libbpf.map. - --- libbpf_global_syms.tmp 2020-09-02 07:30:58.920084380 +0000 - +++ libbpf_versioned_syms.tmp 2020-09-02 07:30:58.924084388 +0000 +# --- libbpf_global_syms.tmp 2020-09-02 07:30:58.920084380 +0000 +# +++ libbpf_versioned_syms.tmp 2020-09-02 07:30:58.924084388 +0000 @@ -1,3 +1,5 @@ +_fini +_init @@ -48,14 +48,12 @@ Acked-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20200905214831.1565465-1-Tony.Ambardar@gmail.com Signed-off-by: Sasha Levin --- - tools/lib/bpf/Makefile | 2 ++ + tools/lib/bpf/Makefile | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/tools/lib/bpf/Makefile b/tools/lib/bpf/Makefile -index bf8ed134cb8a3..c820b0be9d637 100644 --- a/tools/lib/bpf/Makefile +++ b/tools/lib/bpf/Makefile -@@ -152,6 +152,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ +@@ -152,6 +152,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s -- awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ sort -u | wc -l) VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ @@ -71,6 +69,3 @@ index bf8ed134cb8a3..c820b0be9d637 100644 grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \ diff -u $(OUTPUT)libbpf_global_syms.tmp \ --- -2.25.1 -