lkml.org 
[lkml]   [2015]   [Jul]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 05/10] perf symbols: Fix mismatched declarations for elf_getphdrnum
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    When HAVE_ELF_GETPHDRNUM_SUPPORT is false we trip on this problem:

    CC /tmp/build/perf/util/symbol-elf.o
    util/symbol-elf.c:41:12: error: static declaration of ‘elf_getphdrnum’ follows non-static declaration
    static int elf_getphdrnum(Elf *elf, size_t *dst)
    ^
    In file included from util/symbol.h:19:0,
    from util/symbol-elf.c:8:
    /usr/include/libelf.h:206:12: note: previous declaration of ‘elf_getphdrnum’ was here
    extern int elf_getphdrnum (Elf *__elf, size_t *__dst);
    ^
    MKDIR /tmp/build/perf/bench/
    /home/git/linux/tools/build/Makefile.build:68: recipe for target '/tmp/build/perf/util/symbol-elf.o' failed
    make[3]: *** [/tmp/build/perf/util/symbol-elf.o] Error 1

    Fix it.

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Borislav Petkov <bp@suse.de>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/n/tip-qcmekyfedmov4sxr0wahcikr@git.kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/symbol-elf.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
    index 65f7e389ae09..b0ad810f04dd 100644
    --- a/tools/perf/util/symbol-elf.c
    +++ b/tools/perf/util/symbol-elf.c
    @@ -38,7 +38,7 @@ static inline char *bfd_demangle(void __maybe_unused *v,
    #endif

    #ifndef HAVE_ELF_GETPHDRNUM_SUPPORT
    -static int elf_getphdrnum(Elf *elf, size_t *dst)
    +int elf_getphdrnum(Elf *elf, size_t *dst)
    {
    GElf_Ehdr gehdr;
    GElf_Ehdr *ehdr;
    --
    2.1.0


    \
     
     \ /
      Last update: 2015-07-30 18:41    [W:2.532 / U:0.136 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site