| From aa915931ac3e53ccf371308e6750da510e3591dd Mon Sep 17 00:00:00 2001 |
| From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> |
| Date: Fri, 13 Dec 2019 07:11:14 -0300 |
| Subject: libbpf: Fix readelf output parsing for Fedora |
| |
| From: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> |
| |
| commit aa915931ac3e53ccf371308e6750da510e3591dd upstream. |
| |
| Fedora binutils has been patched to show "other info" for a symbol at the |
| end of the line. This was done in order to support unmaintained scripts |
| that would break with the extra info. [1] |
| |
| [1] https://src.fedoraproject.org/rpms/binutils/c/b8265c46f7ddae23a792ee8306fbaaeacba83bf8 |
| |
| This in turn has been done to fix the build of ruby, because of checksec. |
| [2] Thanks Michael Ellerman for the pointer. |
| |
| [2] https://bugzilla.redhat.com/show_bug.cgi?id=1479302 |
| |
| As libbpf Makefile is not unmaintained, we can simply deal with either |
| output format, by just removing the "other info" field, as it always comes |
| inside brackets. |
| |
| Fixes: 3464afdf11f9 (libbpf: Fix readelf output parsing on powerpc with recent binutils) |
| Reported-by: Justin Forbes <jmforbes@linuxtx.org> |
| Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> |
| Signed-off-by: Alexei Starovoitov <ast@kernel.org> |
| Acked-by: Andrii Nakryiko <andriin@fb.com> |
| Cc: Aurelien Jarno <aurelien@aurel32.net> |
| Link: https://lore.kernel.org/bpf/20191213101114.GA3986@calabresa |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/lib/bpf/Makefile | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/tools/lib/bpf/Makefile |
| +++ b/tools/lib/bpf/Makefile |
| @@ -148,6 +148,7 @@ TAGS_PROG := $(if $(shell which etags 2> |
| |
| GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ |
| cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ |
| + sed 's/\[.*\]//' | \ |
| awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ |
| sort -u | wc -l) |
| VERSIONED_SYM_COUNT = $(shell readelf -s --wide $(OUTPUT)libbpf.so | \ |
| @@ -214,6 +215,7 @@ check_abi: $(OUTPUT)libbpf.so |
| "versioned in $(VERSION_SCRIPT)." >&2; \ |
| readelf -s --wide $(BPF_IN_SHARED) | \ |
| cut -d "@" -f1 | sed 's/_v[0-9]_[0-9]_[0-9].*//' | \ |
| + sed 's/\[.*\]//' | \ |
| awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ |
| sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ |
| readelf -s --wide $(OUTPUT)libbpf.so | \ |