Commit 14c55b7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v6.15-2025-05-04' of... 

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
parents 59c9ab3e 8988c4b9

tools/lib/perf/Makefile

+12 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ libdir_relative_SQ = $(subst ','\'',$(libdir_relative)) 
TEST_ARGS := $(if $(V),-v)



INCLUDES = \

-I$(OUTPUT)arch/$(SRCARCH)/include/generated/uapi \

-I$(srctree)/tools/lib/perf/include \

-I$(srctree)/tools/lib/ \

-I$(srctree)/tools/include \
@@ -99,7 +100,16 @@ $(LIBAPI)-clean: 
	$(call QUIET_CLEAN, libapi)

	$(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null



$(LIBPERF_IN): FORCE

uapi-asm := $(OUTPUT)arch/$(SRCARCH)/include/generated/uapi/asm

ifeq ($(SRCARCH),arm64)

	syscall-y := $(uapi-asm)/unistd_64.h

endif

uapi-asm-generic:

	$(if $(syscall-y),\

		$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-headers obj=$(uapi-asm) \

		generic=include/uapi/asm-generic $(syscall-y),)



$(LIBPERF_IN): uapi-asm-generic FORCE

	$(Q)$(MAKE) $(build)=libperf



$(LIBPERF_A): $(LIBPERF_IN)
@@ -120,7 +130,7 @@ all: fixdep 
clean: $(LIBAPI)-clean

	$(call QUIET_CLEAN, libperf) $(RM) $(LIBPERF_A) \

                *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBPERF_VERSION) .*.d .*.cmd tests/*.o LIBPERF-CFLAGS $(LIBPERF_PC) \

                $(TESTS_STATIC) $(TESTS_SHARED)

                $(TESTS_STATIC) $(TESTS_SHARED) $(syscall-y)



TESTS_IN = tests-in.o

tools/perf/Makefile.config

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ include $(srctree)/tools/scripts/Makefile.arch 
$(call detected_var,SRCARCH)



CFLAGS += -I$(OUTPUT)arch/$(SRCARCH)/include/generated

CFLAGS += -I$(OUTPUT)libperf/arch/$(SRCARCH)/include/generated/uapi



# Additional ARCH settings for ppc

ifeq ($(SRCARCH),powerpc)