lkml.org 
[lkml]   [2009]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] perf tools: add compatibility with libelf 0.8 and autodetect
    Date
    The Makefile now automatically defines LIBELF_NO_MMAP when libelf 0.8 is
    detected. libelf 0.8 is still maintained and some distributions such as
    Arch Linux use it instead of elfutils.

    Signed-off-by: Marti Raudsepp <marti@juffo.org>
    ---
    tools/perf/Makefile | 6 +++++-
    tools/perf/util/symbol.c | 12 ++++++++++++
    2 files changed, 17 insertions(+), 1 deletions(-)

    diff --git a/tools/perf/Makefile b/tools/perf/Makefile
    index 742a32e..46e877b 100644
    --- a/tools/perf/Makefile
    +++ b/tools/perf/Makefile
    @@ -422,7 +422,11 @@ ifeq ($(uname_S),Darwin)
    PTHREAD_LIBS =
    endif

    -ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ_MMAP, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y)
    +ifeq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y)
    + ifneq ($(shell sh -c "(echo '\#include <libelf.h>'; echo 'int main(void) { Elf * elf = elf_begin(0, ELF_C_READ_MMAP, 0); return (long)elf; }') | $(CC) -x c - $(ALL_CFLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -o /dev/null $(ALL_LDFLAGS) > /dev/null 2>&1 && echo y"), y)
    + BASIC_CFLAGS += -DLIBELF_NO_MMAP
    + endif
    +else
    msg := $(error No libelf.h/libelf found, please install libelf-dev/elfutils-libelf-devel and glibc-dev[el]);
    endif

    diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
    index 47ea060..8d1df1e 100644
    --- a/tools/perf/util/symbol.c
    +++ b/tools/perf/util/symbol.c
    @@ -413,7 +413,11 @@ static int dso__synthesize_plt_symbols(struct dso *self, int v)
    if (fd < 0)
    goto out;

    +#ifdef LIBELF_NO_MMAP
    + elf = elf_begin(fd, ELF_C_READ, NULL);
    +#else
    elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
    +#endif
    if (elf == NULL)
    goto out_close;

    @@ -533,7 +537,11 @@ static int dso__load_sym(struct dso *self, int fd, const char *name,
    Elf *elf;
    int nr = 0, kernel = !strcmp("[kernel]", self->name);

    +#ifdef LIBELF_NO_MMAP
    + elf = elf_begin(fd, ELF_C_READ, NULL);
    +#else
    elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
    +#endif
    if (elf == NULL) {
    if (v)
    fprintf(stderr, "%s: cannot read %s ELF file.\n",
    @@ -675,7 +683,11 @@ static char *dso__read_build_id(struct dso *self, int v)
    if (fd < 0)
    goto out;

    +#ifdef LIBELF_NO_MMAP
    + elf = elf_begin(fd, ELF_C_READ, NULL);
    +#else
    elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
    +#endif
    if (elf == NULL) {
    if (v)
    fprintf(stderr, "%s: cannot read %s ELF file.\n",
    --
    1.6.5.1


    \
     
     \ /
      Last update: 2009-10-23 22:51    [W:0.032 / U:30.644 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site