Commit 2492c465 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf build: Add feature detection for libelf's elf_getshdrstrndx() 

That appeared after 0.140, and will be used in the SDT code, so, to
avoid bisection break on older systems, add a feature detection and
provide a stub with a pr_debug() to keep it building.

Cc: Ananth N Mavinakayanahalli <ananth@linux.vnet.ibm.com>
Cc: Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/n/tip-80y0eldgweorqnwha9rvfxjr@git.kernel.org


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

tools/build/Makefile.feature

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ FEATURE_TESTS_BASIC := \ 
	libbfd				\

	libelf				\

	libelf-getphdrnum		\

	libelf-getshdrstrndx		\

	libelf-mmap			\

	libnuma				\

	numa_num_possible_cpus		\

tools/build/feature/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ FILES= \ 
	test-cplus-demangle.bin		\

	test-libelf.bin			\

	test-libelf-getphdrnum.bin	\

	test-libelf-getshdrstrndx.bin	\

	test-libelf-mmap.bin		\

	test-libnuma.bin		\

	test-numa_num_possible_cpus.bin	\
@@ -98,6 +99,9 @@ $(OUTPUT)test-libelf-mmap.bin: 
$(OUTPUT)test-libelf-getphdrnum.bin:

	$(BUILD) -lelf



$(OUTPUT)test-libelf-getshdrstrndx.bin:

	$(BUILD) -lelf



$(OUTPUT)test-libnuma.bin:

	$(BUILD) -lnuma

tools/build/feature/test-all.c

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ 
# include "test-libelf-getphdrnum.c"

#undef main



#define main main_test_libelf_getshdrstrndx

# include "test-libelf-getshdrstrndx.c"

#undef main



#define main main_test_libunwind

# include "test-libunwind.c"

#undef main
@@ -149,6 +153,7 @@ int main(int argc, char *argv[]) 
	main_test_dwarf();

	main_test_dwarf_getlocations();

	main_test_libelf_getphdrnum();

	main_test_libelf_getshdrstrndx();

	main_test_libunwind();

	main_test_libaudit();

	main_test_libslang();

tools/build/feature/test-libelf-getshdrstrndx.c

0 → 100644
+8 −0
Original line number Diff line number Diff line 
#include <libelf.h>



int main(void)

{

	size_t dst;



	return elf_getshdrstrndx(0, &dst);

}

tools/perf/config/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -309,6 +309,10 @@ ifndef NO_LIBELF 
    CFLAGS += -DHAVE_ELF_GETPHDRNUM_SUPPORT

  endif



  ifeq ($(feature-libelf-getshdrstrndx), 1)

    CFLAGS += -DHAVE_ELF_GETSHDRSTRNDX_SUPPORT

  endif



  ifndef NO_DWARF

    ifeq ($(origin PERF_HAVE_DWARF_REGS), undefined)

      msg := $(warning DWARF register mappings have not been defined for architecture $(ARCH), DWARF support disabled);

CRA Git | Maintained and supported by SUSTech CRA and CCSE