diff options
| author | Namhyung Kim <namhyung@kernel.org> | 2024-11-03 23:16:30 -0800 |
|---|---|---|
| committer | Namhyung Kim <namhyung@kernel.org> | 2024-11-03 23:18:20 -0800 |
| commit | aa5c90601b531323f82ceb02b41a66974153b76f (patch) | |
| tree | 80ca2bed534b3b356bffa60eab11980c3f9a3400 /tools/perf/Makefile.config | |
| parent | d36e5b36a2928b30e09ff59ce5ce2d5df935176e (diff) | |
| parent | 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 (diff) | |
Merge 'origin/master' into perf-tools-next
To get the fixes in the perf-tools branch. Resolved a conflict due to
RISC-V's syscall table change.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Diffstat (limited to 'tools/perf/Makefile.config')
| -rw-r--r-- | tools/perf/Makefile.config | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 854f84e80256..8da6d91b7ad5 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -691,8 +691,8 @@ ifeq ($(BUILD_BPF_SKEL),1) BUILD_BPF_SKEL := 0 else CLANG_VERSION := $(shell $(CLANG) --version | head -1 | sed 's/.*clang version \([[:digit:]]\+.[[:digit:]]\+.[[:digit:]]\+\).*/\1/g') - ifeq ($(call version-lt3,$(CLANG_VERSION),16.0.6),1) - $(warning Warning: Disabled BPF skeletons as at least $(CLANG) version 16.0.6 is reported to be a working setup with the current of BPF based perf features) + ifeq ($(call version-lt3,$(CLANG_VERSION),12.0.1),1) + $(warning Warning: Disabled BPF skeletons as reliable BTF generation needs at least $(CLANG) version 12.0.1) BUILD_BPF_SKEL := 0 endif endif |