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

Commit 285ab8bf authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf build: Add builtin objects building 



Move the rest of builtin objects (bench and test are already in)
building under build framework.

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-mrh2d4kfyi4g1el4kmdcghl8@git.kernel.org


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

tools/perf/Build

+29 −0
Original line number Diff line number Diff line 
perf-y += builtin-bench.o

perf-y += builtin-annotate.o

perf-y += builtin-diff.o

perf-y += builtin-evlist.o

perf-y += builtin-help.o

perf-y += builtin-sched.o

perf-y += builtin-buildid-list.o

perf-y += builtin-buildid-cache.o

perf-y += builtin-list.o

perf-y += builtin-record.o

perf-y += builtin-report.o

perf-y += builtin-stat.o

perf-y += builtin-timechart.o

perf-y += builtin-top.o

perf-y += builtin-script.o

perf-y += builtin-kmem.o

perf-y += builtin-lock.o

perf-y += builtin-kvm.o

perf-y += builtin-inject.o

perf-y += builtin-mem.o



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



perf-y += bench/

perf-y += tests/



paths += -DPERF_HTML_PATH="BUILD_STR($(htmldir_SQ))"

paths += -DPERF_INFO_PATH="BUILD_STR($(infodir_SQ))"

paths += -DPERF_MAN_PATH="BUILD_STR($(mandir_SQ))"



CFLAGS_builtin-help.o      += $(paths)

CFLAGS_builtin-timechart.o += $(paths)

tools/perf/Makefile.perf

+1 −36
Original line number Diff line number Diff line
@@ -425,26 +425,7 @@ LIB_OBJS += $(OUTPUT)ui/stdio/hist.o 


LIB_OBJS += $(OUTPUT)arch/common.o



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

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

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

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

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

BUILTIN_OBJS += $(OUTPUT)builtin-buildid-list.o

BUILTIN_OBJS += $(OUTPUT)builtin-buildid-cache.o

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

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

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

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

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

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

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

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

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

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

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

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

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



PERFLIBS = $(LIB_FILE) $(LIBAPIKFS) $(LIBTRACEEVENT)
@@ -486,10 +467,6 @@ ifndef NO_LIBUNWIND 
  LIB_OBJS += $(OUTPUT)util/unwind-libunwind.o

endif



ifndef NO_LIBAUDIT

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

endif



ifndef NO_SLANG

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

  LIB_OBJS += $(OUTPUT)ui/browsers/annotate.o
@@ -573,7 +550,7 @@ PERF_IN := $(OUTPUT)perf-in.o 
export srctree OUTPUT RM CC LD AR CFLAGS V

build := -f $(srctree)/tools/build/Makefile.build dir=. obj



$(PERF_IN): FORCE

$(PERF_IN): $(OUTPUT)common-cmds.h FORCE

	@$(MAKE) $(build)=perf



$(OUTPUT)perf.o: perf.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS
@@ -591,18 +568,6 @@ $(GTK_OBJS): $(OUTPUT)%.o: %.c $(LIB_H) 
$(OUTPUT)libperf-gtk.so: $(GTK_OBJS) $(PERFLIBS)

	$(QUIET_LINK)$(CC) -o $@ -shared $(LDFLAGS) $(filter %.o,$^) $(GTK_LIBS)



$(OUTPUT)builtin-help.o: builtin-help.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \

		'-DPERF_HTML_PATH="$(htmldir_SQ)"' \

		'-DPERF_MAN_PATH="$(mandir_SQ)"' \

		'-DPERF_INFO_PATH="$(infodir_SQ)"' $<



$(OUTPUT)builtin-timechart.o: builtin-timechart.c $(OUTPUT)common-cmds.h $(OUTPUT)PERF-CFLAGS

	$(QUIET_CC)$(CC) -o $@ -c $(CFLAGS) \

		'-DPERF_HTML_PATH="$(htmldir_SQ)"' \

		'-DPERF_MAN_PATH="$(mandir_SQ)"' \

		'-DPERF_INFO_PATH="$(infodir_SQ)"' $<



$(OUTPUT)common-cmds.h: util/generate-cmdlist.sh command-list.txt



$(OUTPUT)common-cmds.h: $(wildcard Documentation/perf-*.txt)

tools/perf/config/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -456,6 +456,7 @@ ifndef NO_LIBAUDIT 
  else

    CFLAGS += -DHAVE_LIBAUDIT_SUPPORT

    EXTLIBS += -laudit

    $(call detected,CONFIG_AUDIT)

  endif

endif
@@ -831,3 +832,6 @@ $(call detected_var,PYTHON_WORD) 
ifneq ($(OUTPUT),)

$(call detected_var,OUTPUT)

endif

$(call detected_var,htmldir_SQ)

$(call detected_var,infodir_SQ)

$(call detected_var,mandir_SQ)