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

Commit c50f6245 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-20160704' of... 

Merge tag 'perf-core-for-mingo-20160704' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

Documentation changes:

 - Update android build documentation (Chris Phlipot)

Infrastructure changes:

 - Respect WERROR=0 in libapi and libsubcmd, to allow building on Android (Chris Phlipot)

 - Prep work to support SDT events in probe cache (Masami Hiramatsu)

 - ELF support for SDT (Hemant Kumar)

 - Add feature detection for libelf's elf_getshdrstrndx function (Arnaldo Carvalho de Melo)

 - Fix hist accumulation test (Jiri Olsa)

 - Unwind callchain fixes (Jiri Olsa)

 - Change internal representation of numa nodes obtained from
   perf.data header (Jiri Olsa)

 - Sync copy of syscall_64.tbl with the kernel (Arnaldo Carvalho de Melo)

 - Add LGPL 2.1 license header to libbpf source files (Wang Nan)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents dc29bb47 f3d082ce

tools/build/Makefile.feature

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

	libbfd				\

	libelf				\

	libelf				\

	libelf-getphdrnum		\

	libelf-getphdrnum		\

	libelf-getshdrstrndx		\

	libelf-mmap			\

	libelf-mmap			\

	libnuma				\

	libnuma				\

	numa_num_possible_cpus		\

	numa_num_possible_cpus		\

tools/build/feature/Makefile

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

	test-cplus-demangle.bin		\

	test-libelf.bin			\

	test-libelf.bin			\

	test-libelf-getphdrnum.bin	\

	test-libelf-getphdrnum.bin	\

	test-libelf-getshdrstrndx.bin	\

	test-libelf-mmap.bin		\

	test-libelf-mmap.bin		\

	test-libnuma.bin		\

	test-libnuma.bin		\

	test-numa_num_possible_cpus.bin	\

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

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

	$(BUILD) -lelf

	$(BUILD) -lelf





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

	$(BUILD) -lelf



$(OUTPUT)test-libnuma.bin:

$(OUTPUT)test-libnuma.bin:

	$(BUILD) -lnuma

	$(BUILD) -lnuma

tools/build/feature/test-all.c

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

# include "test-libelf-getphdrnum.c"

#undef main

#undef main





#define main main_test_libelf_getshdrstrndx

# include "test-libelf-getshdrstrndx.c"

#undef main



#define main main_test_libunwind

#define main main_test_libunwind

# include "test-libunwind.c"

# include "test-libunwind.c"

#undef main

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

	main_test_dwarf();

	main_test_dwarf_getlocations();

	main_test_dwarf_getlocations();

	main_test_libelf_getphdrnum();

	main_test_libelf_getphdrnum();

	main_test_libelf_getshdrstrndx();

	main_test_libunwind();

	main_test_libunwind();

	main_test_libaudit();

	main_test_libaudit();

	main_test_libslang();

	main_test_libslang();

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

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



int main(void)

{

	size_t dst;



	return elf_getshdrstrndx(0, &dst);

}

tools/lib/api/Makefile

+7 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,13 @@ MAKEFLAGS += --no-print-directory 
LIBFILE = $(OUTPUT)libapi.a

LIBFILE = $(OUTPUT)libapi.a





CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

CFLAGS := $(EXTRA_WARNINGS) $(EXTRA_CFLAGS)

CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -Werror -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC

CFLAGS += -ggdb3 -Wall -Wextra -std=gnu99 -O6 -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -fPIC



# Treat warnings as errors unless directed not to

ifneq ($(WERROR),0)

  CFLAGS += -Werror

endif



CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

CFLAGS += -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

CFLAGS += -I$(srctree)/tools/lib/api

CFLAGS += -I$(srctree)/tools/lib/api