Skip to content

Commit 49f4ac4

Browse files
captain5050namhyung
authored andcommitted
perf pmu-events: Make pmu-events a library
Make pmu-events into a library so it may be linked against things like the python module and not built from source. Signed-off-by: Ian Rogers <irogers@google.com> Reviewed-by: James Clark <james.clark@arm.com> Cc: Suzuki K Poulose <suzuki.poulose@arm.com> Cc: Kees Cook <keescook@chromium.org> Cc: Palmer Dabbelt <palmer@dabbelt.com> Cc: Albert Ou <aou@eecs.berkeley.edu> Cc: Nick Terrell <terrelln@fb.com> Cc: Gary Guo <gary@garyguo.net> Cc: Alex Gaynor <alex.gaynor@gmail.com> Cc: Boqun Feng <boqun.feng@gmail.com> Cc: Wedson Almeida Filho <wedsonaf@gmail.com> Cc: Ze Gao <zegao2021@gmail.com> Cc: Alice Ryhl <aliceryhl@google.com> Cc: Andrei Vagin <avagin@google.com> Cc: Yicong Yang <yangyicong@hisilicon.com> Cc: Jonathan Cameron <jonathan.cameron@huawei.com> Cc: Guo Ren <guoren@kernel.org> Cc: Miguel Ojeda <ojeda@kernel.org> Cc: Will Deacon <will@kernel.org> Cc: Mike Leach <mike.leach@linaro.org> Cc: Leo Yan <leo.yan@linux.dev> Cc: Oliver Upton <oliver.upton@linux.dev> Cc: John Garry <john.g.garry@oracle.com> Cc: Benno Lossin <benno.lossin@proton.me> Cc: Björn Roy Baron <bjorn3_gh@protonmail.com> Cc: Andreas Hindborg <a.hindborg@samsung.com> Cc: Paul Walmsley <paul.walmsley@sifive.com> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Link: https://lore.kernel.org/r/20240625214117.953777-4-irogers@google.com
1 parent 39f3ce5 commit 49f4ac4

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

tools/perf/Makefile.perf

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -428,11 +428,14 @@ export PERL_PATH
428428
LIBPERF_UI_IN := $(OUTPUT)perf-ui-in.o
429429
LIBPERF_UI := $(OUTPUT)libperf-ui.a
430430

431+
LIBPMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o
432+
LIBPMU_EVENTS := $(OUTPUT)libpmu-events.a
433+
431434
PERFLIBS = $(LIBAPI) $(LIBPERF) $(LIBSUBCMD) $(LIBSYMBOL)
432435
ifdef LIBBPF_STATIC
433436
PERFLIBS += $(LIBBPF)
434437
endif
435-
PERFLIBS += $(LIBPERF_UI)
438+
PERFLIBS += $(LIBPERF_UI) $(LIBPMU_EVENTS)
436439

437440
# We choose to avoid "if .. else if .. else .. endif endif"
438441
# because maintaining the nesting to match is a pain. If
@@ -721,27 +724,28 @@ strip: $(PROGRAMS) $(OUTPUT)perf
721724
$(STRIP) $(STRIP_OPTS) $(PROGRAMS) $(OUTPUT)perf
722725

723726
PERF_IN := $(OUTPUT)perf-in.o
724-
725-
PMU_EVENTS_IN := $(OUTPUT)pmu-events/pmu-events-in.o
726727
export NO_JEVENTS
727728

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

730731
$(PERF_IN): prepare FORCE
731732
$(Q)$(MAKE) $(build)=perf
732733

733-
$(PMU_EVENTS_IN): FORCE prepare
734+
$(LIBPMU_EVENTS_IN): FORCE prepare
734735
$(Q)$(MAKE) -f $(srctree)/tools/build/Makefile.build dir=pmu-events obj=pmu-events
735736

737+
$(LIBPMU_EVENTS): $(LIBPMU_EVENTS_IN)
738+
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $<
739+
736740
$(LIBPERF_UI_IN): FORCE prepare
737741
$(Q)$(MAKE) $(build)=perf-ui
738742

739743
$(LIBPERF_UI): $(LIBPERF_UI_IN)
740744
$(QUIET_AR)$(RM) $@ && $(AR) rcs $@ $<
741745

742-
$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN) $(PMU_EVENTS_IN)
746+
$(OUTPUT)perf: $(PERFLIBS) $(PERF_IN)
743747
$(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) \
744-
$(PERF_IN) $(PMU_EVENTS_IN) $(LIBS) -o $@
748+
$(PERF_IN) $(LIBS) -o $@
745749

746750
$(GTK_IN): FORCE prepare
747751
$(Q)$(MAKE) $(build)=gtk

0 commit comments

Comments
 (0)