lkml.org 
[lkml]   [2020]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 36/95] samples: bpf: Fix build error
    Date
    From: Matteo Croce <mcroce@redhat.com>

    [ Upstream commit 23ad04669f81f958e9a4121b0266228d2eb3c357 ]

    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>
    Signed-off-by: Alexei Starovoitov <ast@kernel.org>
    Acked-by: Yonghong Song <yhs@fb.com>
    Link: https://lore.kernel.org/bpf/20200511113234.80722-1-mcroce@redhat.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    samples/bpf/lwt_len_hist_user.c | 2 --
    1 file changed, 2 deletions(-)

    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;
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-01 20:05    [W:4.068 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site