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

Commit 709e6791 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf build: Add probe objects building 



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

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: default avatarWill 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-p39iitiu2ltgmtbn48bsh7nz@git.kernel.org


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

tools/perf/Build

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ perf-y += builtin-inject.o 
perf-y += builtin-mem.o



perf-$(CONFIG_AUDIT) += builtin-trace.o

perf-$(CONFIG_LIBELF) += builtin-probe.o



perf-y += bench/

perf-y += tests/

tools/perf/Makefile.perf

+1 −18
Original line number Diff line number Diff line
@@ -327,9 +327,6 @@ LIB_H += util/data.h 
LIB_H += util/kvm-stat.h

LIB_H += util/thread-stack.h



LIB_OBJS += $(OUTPUT)util/symbol-elf.o

LIB_OBJS += $(OUTPUT)util/probe-event.o



LIB_OBJS += $(OUTPUT)ui/setup.o

LIB_OBJS += $(OUTPUT)ui/helpline.o

LIB_OBJS += $(OUTPUT)ui/progress.o
@@ -337,8 +334,6 @@ LIB_OBJS += $(OUTPUT)ui/util.o 
LIB_OBJS += $(OUTPUT)ui/hist.o

LIB_OBJS += $(OUTPUT)ui/stdio/hist.o



BUILTIN_OBJS += $(OUTPUT)builtin-probe.o



PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT)



# We choose to avoid "if .. else if .. else .. endif endif"
@@ -351,19 +346,7 @@ ifneq ($(OUTPUT),) 
  CFLAGS += -I$(OUTPUT)

endif



ifdef NO_LIBELF

# Remove ELF/DWARF dependent codes

LIB_OBJS := $(filter-out $(OUTPUT)util/symbol-elf.o,$(LIB_OBJS))

LIB_OBJS := $(filter-out $(OUTPUT)util/dwarf-aux.o,$(LIB_OBJS))

LIB_OBJS := $(filter-out $(OUTPUT)util/probe-event.o,$(LIB_OBJS))

LIB_OBJS := $(filter-out $(OUTPUT)util/probe-finder.o,$(LIB_OBJS))



BUILTIN_OBJS := $(filter-out $(OUTPUT)builtin-probe.o,$(BUILTIN_OBJS))



# Use minimal symbol handling

LIB_OBJS += $(OUTPUT)util/symbol-minimal.o



else # NO_LIBELF

ifndef NO_LIBELF

ifndef NO_DWARF

  LIB_OBJS += $(OUTPUT)util/probe-finder.o

  LIB_OBJS += $(OUTPUT)util/dwarf-aux.o

tools/perf/config/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ endif # NO_LIBELF 
ifndef NO_LIBELF

  CFLAGS += -DHAVE_LIBELF_SUPPORT

  EXTLIBS += -lelf

  $(call detected,CONFIG_LIBELF)



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

    CFLAGS += -DHAVE_LIBELF_MMAP_SUPPORT

tools/perf/util/Build

+7 −0
Original line number Diff line number Diff line
@@ -75,6 +75,13 @@ libperf-y += tsc.o 
libperf-y += cloexec.o

libperf-y += thread-stack.o



libperf-$(CONFIG_LIBELF) += symbol-elf.o

libperf-$(CONFIG_LIBELF) += probe-event.o



ifndef CONFIG_LIBELF

libperf-y += symbol-minimal.o

endif



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))"