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: Adrian 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
5b6a42fcb3
commit
e955d5c434
tools/perf
@ -180,6 +180,9 @@ FLAGS_LIBELF=$(CFLAGS) $(LDFLAGS) $(EXTLIBS)
|
|||||||
ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y)
|
ifeq ($(call try-cc,$(SOURCE_ELF_MMAP),$(FLAGS_LIBELF),-DLIBELF_MMAP),y)
|
||||||
CFLAGS += -DLIBELF_MMAP
|
CFLAGS += -DLIBELF_MMAP
|
||||||
endif
|
endif
|
||||||
|
ifeq ($(call try-cc,$(SOURCE_ELF_GETPHDRNUM),$(FLAGS_LIBELF),-DHAVE_ELF_GETPHDRNUM),y)
|
||||||
|
CFLAGS += -DHAVE_ELF_GETPHDRNUM
|
||||||
|
endif
|
||||||
|
|
||||||
# include ARCH specific config
|
# include ARCH specific config
|
||||||
-include $(src-perf)/arch/$(ARCH)/Makefile
|
-include $(src-perf)/arch/$(ARCH)/Makefile
|
||||||
|
@ -61,6 +61,15 @@ int main(void)
|
|||||||
}
|
}
|
||||||
endef
|
endef
|
||||||
|
|
||||||
|
define SOURCE_ELF_GETPHDRNUM
|
||||||
|
#include <libelf.h>
|
||||||
|
int main(void)
|
||||||
|
{
|
||||||
|
size_t dst;
|
||||||
|
return elf_getphdrnum(0, &dst);
|
||||||
|
}
|
||||||
|
endef
|
||||||
|
|
||||||
ifndef NO_SLANG
|
ifndef NO_SLANG
|
||||||
define SOURCE_SLANG
|
define SOURCE_SLANG
|
||||||
#include <slang.h>
|
#include <slang.h>
|
||||||
|
@ -8,6 +8,22 @@
|
|||||||
#include "symbol.h"
|
#include "symbol.h"
|
||||||
#include "debug.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
|
#ifndef NT_GNU_BUILD_ID
|
||||||
#define NT_GNU_BUILD_ID 3
|
#define NT_GNU_BUILD_ID 3
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user