From: Thomas Richter <tmricht@linux.ibm.com>
To: broonie@kernel.org, hca@linux.ibm.com, sfr@canb.auug.org.au,
liam.howlett@oracle.com, acme@redhat.com, ast@kernel.org,
bpf@vger.kernel.org, linux-next@vger.kernel.org,
quentin@isovalent.com
Cc: Thomas Richter <tmricht@linux.ibm.com>
Subject: [PATCH] bpftool: fix broken compile on s390 for linux-next repository
Date: Tue, 18 Apr 2023 10:55:16 +0200 [thread overview]
Message-ID: <20230418085516.1104514-1-tmricht@linux.ibm.com> (raw)
Commit 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
breaks the build of the perf tool on s390 in the linux-next repository.
Here is the make output:
make -C tools/perf
....
btf_dumper.c: In function 'dotlabel_puts':
DEBUG: btf_dumper.c:838:25: error: '__fallthrough' undeclared \
(first use in this function); did you mean 'fallthrough'?
DEBUG: 838 | __fallthrough;
DEBUG: | ^~~~~~~~~~~~~
DEBUG: | fallthrough
DEBUG: btf_dumper.c:838:25: note: each undeclared identifier is reported \
only once for each function it appears in
DEBUG: btf_dumper.c:837:25: warning: this statement may fall through \
[-Wimplicit-fallthrough=]
DEBUG: 837 | putchar('\\');
DEBUG: | ^~~~~~~~~~~~~
DEBUG: btf_dumper.c:839:17: note: here
DEBUG: 839 | default:
DEBUG: | ^~~~~~~
DEBUG: make[3]: *** [Makefile:247: /builddir/build/BUILD/kernel-6.2.fc37/\
linux-6.2/tools/perf/util/bpf_skel/ \
.tmp/bootstrap/btf_dumper.o] Error 1
The compile fails because symbol __fallthrough unknown, but symbol
fallthrough is known and works fine.
Fix this and replace __fallthrough by fallthrough.
With this change, the compile works.
Output after:
# make -C tools/perf
....
CC util/bpf-filter.o
CC util/bpf-filter-flex.o
LD util/perf-in.o
LD perf-in.o
LINK perf
make: Leaving directory '/root/mirror-linux-next/tools/perf'
#
Fixes: 9fd496848b1c ("bpftool: Support inline annotations when dumping the CFG of a program")
Signed-off-by: Thomas Richter <tmricht@linux.ibm.com>
---
tools/bpf/bpftool/btf_dumper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c
index 6c5e0e82da22..1b7f69714604 100644
--- a/tools/bpf/bpftool/btf_dumper.c
+++ b/tools/bpf/bpftool/btf_dumper.c
@@ -835,7 +835,7 @@ static void dotlabel_puts(const char *s)
case '|':
case ' ':
putchar('\\');
- __fallthrough;
+ fallthrough;
default:
putchar(*s);
}
--
2.39.2
next reply other threads:[~2023-04-18 8:55 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-18 8:55 Thomas Richter [this message]
2023-04-18 9:13 ` [PATCH] bpftool: fix broken compile on s390 for linux-next repository Quentin Monnet
2023-04-19 14:50 ` Daniel Borkmann
2023-04-20 0:39 ` Quentin Monnet
-- strict thread matches above, loose matches on Subject: below --
2023-04-12 12:36 Thomas Richter
2023-04-12 13:27 ` Quentin Monnet
2023-04-14 8:47 ` Heiko Carstens
2023-04-14 16:53 ` Mark Brown
2023-04-14 16:58 ` Quentin Monnet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230418085516.1104514-1-tmricht@linux.ibm.com \
--to=tmricht@linux.ibm.com \
--cc=acme@redhat.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=broonie@kernel.org \
--cc=hca@linux.ibm.com \
--cc=liam.howlett@oracle.com \
--cc=linux-next@vger.kernel.org \
--cc=quentin@isovalent.com \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox