Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e955d5c4 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Fix compile with libelf without get_phdrnum 



Add a feature check for get_phdrnum() and implement a replacement if it
is not present.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1379080170-6608-1-git-send-email-adrian.hunter@intel.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5b6a42fc

tools/perf/config/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -180,6 +180,9 @@ FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS) 
ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y)

  CFLAGS += -DLIBELF_MMAP

endif

ifeq ($(call try-cc,$(SOURCE_ELF_GETPHDRNUM),$(FLAGS_LIBELF),-DHAVE_ELF_GETPHDRNUM),y)

  CFLAGS += -DHAVE_ELF_GETPHDRNUM

endif



# include ARCH specific config

-include $(src-perf)/arch/$(ARCH)/Makefile

tools/perf/config/feature-tests.mak

+9 −0
Original line number Diff line number Diff line
@@ -61,6 +61,15 @@ int main(void) 
}

endef



define SOURCE_ELF_GETPHDRNUM

#include <libelf.h>

int main(void)

{

	size_t dst;

	return elf_getphdrnum(0, &dst);

}

endef



ifndef NO_SLANG

define SOURCE_SLANG

#include <slang.h>

tools/perf/util/symbol-elf.c

+16 −0
Original line number Diff line number Diff line
@@ -8,6 +8,22 @@ 
#include "symbol.h"

#include "debug.h"



#ifndef HAVE_ELF_GETPHDRNUM

static int elf_getphdrnum(Elf *elf, size_t *dst)

{

	GElf_Ehdr gehdr;

	GElf_Ehdr *ehdr;



	ehdr = gelf_getehdr(elf, &gehdr);

	if (!ehdr)

		return -1;



	*dst = ehdr->e_phnum;



	return 0;

}

#endif



#ifndef NT_GNU_BUILD_ID

#define NT_GNU_BUILD_ID 3

#endif