perf build: Add dwarf unwind objects building (b2e45c32) · Commits · 戴 / test

Move the dwarf unwind objects building under build framework to be included in the libperf build object. Signed-off-by:

Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> Tested-by:

Will Deacon <will.deacon@arm.com> Cc: Alexis Berlemont <alexis.berlemont@gmail.com> Cc: Borislav Petkov <bp@alien8.de> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/n/tip-7f7dmhkhs0e7jnqiu9ibzqia@git.kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/Makefile.perf

+0 −9

Original line number	Diff line number	Diff line
		@@ -346,15 +346,6 @@ ifneq ($(OUTPUT),)
		CFLAGS += -I$(OUTPUT)
		endif

		ifndef NO_LIBDW_DWARF_UNWIND
		LIB_OBJS += $(OUTPUT)util/unwind-libdw.o
		LIB_H += util/unwind-libdw.h
		endif

		ifndef NO_LIBUNWIND
		LIB_OBJS += $(OUTPUT)util/unwind-libunwind.o
		endif

		ifndef NO_SLANG
		LIB_OBJS += $(OUTPUT)ui/browser.o
		LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o

tools/perf/config/Makefile

+2 −0

Original line number	Diff line number	Diff line
		@@ -420,9 +420,11 @@ ifdef NO_LIBUNWIND
		dwarf-post-unwind := 0
		else
		dwarf-post-unwind-text := libdw
		$(call detected,CONFIG_LIBDW_DWARF_UNWIND)
		endif
		else
		dwarf-post-unwind-text := libunwind
		$(call detected,CONFIG_LIBUNWIND)
		# Enable libunwind support by default.
		ifndef NO_LIBDW_DWARF_UNWIND
		NO_LIBDW_DWARF_UNWIND := 1

tools/perf/util/Build

+3 −0

Original line number	Diff line number	Diff line
		@@ -85,6 +85,9 @@ endif
		libperf-$(CONFIG_DWARF) += probe-finder.o
		libperf-$(CONFIG_DWARF) += dwarf-aux.o

		libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o
		libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o

		CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
		CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))"

Admin message