Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf build: Add dwarf unwind objects building

Move the dwarf unwind objects building under build framework to be
included in the libperf build object.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-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>

authored by

Jiri Olsa and committed by
Arnaldo Carvalho de Melo
b2e45c32 8379fce4

+5 -9
-9
tools/perf/Makefile.perf
··· 346 346 CFLAGS += -I$(OUTPUT) 347 347 endif 348 348 349 - ifndef NO_LIBDW_DWARF_UNWIND 350 - LIB_OBJS += $(OUTPUT)util/unwind-libdw.o 351 - LIB_H += util/unwind-libdw.h 352 - endif 353 - 354 - ifndef NO_LIBUNWIND 355 - LIB_OBJS += $(OUTPUT)util/unwind-libunwind.o 356 - endif 357 - 358 349 ifndef NO_SLANG 359 350 LIB_OBJS += $(OUTPUT)ui/browser.o 360 351 LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o
+2
tools/perf/config/Makefile
··· 420 420 dwarf-post-unwind := 0 421 421 else 422 422 dwarf-post-unwind-text := libdw 423 + $(call detected,CONFIG_LIBDW_DWARF_UNWIND) 423 424 endif 424 425 else 425 426 dwarf-post-unwind-text := libunwind 427 + $(call detected,CONFIG_LIBUNWIND) 426 428 # Enable libunwind support by default. 427 429 ifndef NO_LIBDW_DWARF_UNWIND 428 430 NO_LIBDW_DWARF_UNWIND := 1
+3
tools/perf/util/Build
··· 85 85 libperf-$(CONFIG_DWARF) += probe-finder.o 86 86 libperf-$(CONFIG_DWARF) += dwarf-aux.o 87 87 88 + libperf-$(CONFIG_LIBDW_DWARF_UNWIND) += unwind-libdw.o 89 + libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o 90 + 88 91 CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))" 89 92 CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))" 90 93