diff mbox series

[bpf] samples: bpf: fix build error

Message ID 20200511113234.80722-1-mcroce@redhat.com
State Accepted
Delegated to: BPF Maintainers
Headers show
Series [bpf] samples: bpf: fix build error | expand

Commit Message

Matteo Croce May 11, 2020, 11:32 a.m. UTC
GCC 10 is very strict about symbol clash, and lwt_len_hist_user contains
a symbol which clashes with libbpf:

/usr/bin/ld: samples/bpf/lwt_len_hist_user.o:(.bss+0x0): multiple definition of `bpf_log_buf'; samples/bpf/bpf_load.o:(.bss+0x8c0): first defined here
collect2: error: ld returned 1 exit status

bpf_log_buf here seems to be a leftover, so removing it.

Signed-off-by: Matteo Croce <mcroce@redhat.com>
---
 samples/bpf/lwt_len_hist_user.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Yonghong Song May 11, 2020, 8:32 p.m. UTC | #1
On 5/11/20 4:32 AM, Matteo Croce wrote:
> GCC 10 is very strict about symbol clash, and lwt_len_hist_user contains
> a symbol which clashes with libbpf:
> 
> /usr/bin/ld: samples/bpf/lwt_len_hist_user.o:(.bss+0x0): multiple definition of `bpf_log_buf'; samples/bpf/bpf_load.o:(.bss+0x8c0): first defined here
> collect2: error: ld returned 1 exit status
> 
> bpf_log_buf here seems to be a leftover, so removing it.
> 
> Signed-off-by: Matteo Croce <mcroce@redhat.com>

Acked-by: Yonghong Song <yhs@fb.com>
Alexei Starovoitov May 14, 2020, 7:39 p.m. UTC | #2
On Mon, May 11, 2020 at 1:32 PM Yonghong Song <yhs@fb.com> wrote:
>
>
>
> On 5/11/20 4:32 AM, Matteo Croce wrote:
> > GCC 10 is very strict about symbol clash, and lwt_len_hist_user contains
> > a symbol which clashes with libbpf:
> >
> > /usr/bin/ld: samples/bpf/lwt_len_hist_user.o:(.bss+0x0): multiple definition of `bpf_log_buf'; samples/bpf/bpf_load.o:(.bss+0x8c0): first defined here
> > collect2: error: ld returned 1 exit status
> >
> > bpf_log_buf here seems to be a leftover, so removing it.
> >
> > Signed-off-by: Matteo Croce <mcroce@redhat.com>
>
> Acked-by: Yonghong Song <yhs@fb.com>

Applied to bpf tree. Thanks
diff mbox series

Patch

diff --git a/samples/bpf/lwt_len_hist_user.c b/samples/bpf/lwt_len_hist_user.c
index 587b68b1f8dd..430a4b7e353e 100644
--- a/samples/bpf/lwt_len_hist_user.c
+++ b/samples/bpf/lwt_len_hist_user.c
@@ -15,8 +15,6 @@ 
 #define MAX_INDEX 64
 #define MAX_STARS 38
 
-char bpf_log_buf[BPF_LOG_BUF_SIZE];
-
 static void stars(char *str, long val, long max, int width)
 {
 	int i;