mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-13 22:25:03 +00:00
7822a8913f
The bison and flex generate C files from the source (.y and .l)
files. When O= option is used, they are saved in a separate directory
but the default build rule assumes the .C files are in the source
directory. So it might read invalid file if there are generated files
from an old version. The same is true for the pmu-events files.
For example, the following command would cause a build failure:
$ git checkout v6.3
$ make -C tools/perf # build in the same directory
$ git checkout v6.5-rc2
$ mkdir build # create a build directory
$ make -C tools/perf O=build # build in a different directory but it
# refers files in the source directory
Let's update the build rule to specify those cases explicitly to depend
on the files in the output directory.
Note that it's not a complete fix and it needs the next patch for the
include path too.
Fixes: 80eeb67fe5 ("perf jevents: Program to convert JSON file")
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Anup Sharma <anupnewsmail@gmail.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230728022447.1323563-1-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
43 lines
1.4 KiB
Text
43 lines
1.4 KiB
Text
pmu-events-y += pmu-events.o
|
|
JDIR = pmu-events/arch/$(SRCARCH)
|
|
JSON = $(shell [ -d $(JDIR) ] && \
|
|
find $(JDIR) -name '*.json' -o -name 'mapfile.csv')
|
|
JDIR_TEST = pmu-events/arch/test
|
|
JSON_TEST = $(shell [ -d $(JDIR_TEST) ] && \
|
|
find $(JDIR_TEST) -name '*.json')
|
|
JEVENTS_PY = pmu-events/jevents.py
|
|
METRIC_PY = pmu-events/metric.py
|
|
METRIC_TEST_PY = pmu-events/metric_test.py
|
|
EMPTY_PMU_EVENTS_C = pmu-events/empty-pmu-events.c
|
|
PMU_EVENTS_C = $(OUTPUT)pmu-events/pmu-events.c
|
|
METRIC_TEST_LOG = $(OUTPUT)pmu-events/metric_test.log
|
|
|
|
ifeq ($(JEVENTS_ARCH),)
|
|
JEVENTS_ARCH=$(SRCARCH)
|
|
endif
|
|
JEVENTS_MODEL ?= all
|
|
|
|
#
|
|
# Locate/process JSON files in pmu-events/arch/
|
|
# directory and create tables in pmu-events.c.
|
|
#
|
|
|
|
ifeq ($(NO_JEVENTS),1)
|
|
$(PMU_EVENTS_C): $(EMPTY_PMU_EVENTS_C)
|
|
$(call rule_mkdir)
|
|
$(Q)$(call echo-cmd,gen)cp $< $@
|
|
else
|
|
$(METRIC_TEST_LOG): $(METRIC_TEST_PY) $(METRIC_PY)
|
|
$(call rule_mkdir)
|
|
$(Q)$(call echo-cmd,test)$(PYTHON) $< 2> $@ || (cat $@ && false)
|
|
|
|
$(PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG)
|
|
$(call rule_mkdir)
|
|
$(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS_MODEL) pmu-events/arch $@
|
|
endif
|
|
|
|
# pmu-events.c file is generated in the OUTPUT directory so it needs a
|
|
# separate rule to depend on it properly
|
|
$(OUTPUT)pmu-events/pmu-events.o: $(PMU_EVENTS_C)
|
|
$(call rule_mkdir)
|
|
$(call if_changed_dep,cc_o_c)
|