Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'perf-tools-fixes-for-v6.15-2025-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools
Pull perf tools fixes from Namhyung Kim:
"Just a couple of build fixes on arm64"
* tag 'perf-tools-fixes-for-v6.15-2025-05-04' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools:
perf tools: Fix in-source libperf build
perf tools: Fix arm64 build by generating unistd_64.h
+13
-2
+12
-2
tools/lib/perf/Makefile
+12
-2
tools/lib/perf/Makefile
···
42
42
TEST_ARGS := $(if $(V),-v)
43
43
44
44
INCLUDES = \
45
+
-I$(OUTPUT)arch/$(SRCARCH)/include/generated/uapi \
45
46
-I$(srctree)/tools/lib/perf/include \
46
47
-I$(srctree)/tools/lib/ \
47
48
-I$(srctree)/tools/include \
···
100
99
$(call QUIET_CLEAN, libapi)
101
100
$(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null
102
101
103
-
$(LIBPERF_IN): FORCE
102
+
uapi-asm := $(OUTPUT)arch/$(SRCARCH)/include/generated/uapi/asm
103
+
ifeq ($(SRCARCH),arm64)
104
+
syscall-y := $(uapi-asm)/unistd_64.h
105
+
endif
106
+
uapi-asm-generic:
107
+
$(if $(syscall-y),\
108
+
$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-headers obj=$(uapi-asm) \
109
+
generic=include/uapi/asm-generic $(syscall-y),)
110
+
111
+
$(LIBPERF_IN): uapi-asm-generic FORCE
104
112
$(Q)$(MAKE) $(build)=libperf
105
113
106
114
$(LIBPERF_A): $(LIBPERF_IN)
···
130
120
clean: $(LIBAPI)-clean
131
121
$(call QUIET_CLEAN, libperf) $(RM) $(LIBPERF_A) \
132
122
*.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBPERF_VERSION) .*.d .*.cmd tests/*.o LIBPERF-CFLAGS $(LIBPERF_PC) \
133
-
$(TESTS_STATIC) $(TESTS_SHARED)
123
+
$(TESTS_STATIC) $(TESTS_SHARED) $(syscall-y)
134
124
135
125
TESTS_IN = tests-in.o
136
126