tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Revert "perf tools: Fix arm64 build by generating unistd_64.h"

This reverts:

commit 8988c4b91945173a ("perf tools: Fix in-source libperf build")
commit bfb713ea53c746b0 ("perf tools: Fix arm64 build by generating unistd_64.h")

Since we now have a static unistd_64.h for the arm64 build, there is no
need to generate unistd_64.h in libperf. Revert all patches related to
generating unistd_64.h.

Reviewed-by: James Clark <james.clark@linaro.org>
Signed-off-by: Leo Yan <leo.yan@arm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Leo Yan and committed by
Arnaldo Carvalho de Melo 129bb23a 096b86ce

+2 -13
+2 -12
tools/lib/perf/Makefile
··· 42 42 TEST_ARGS := $(if $(V),-v) 43 43 44 44 INCLUDES = \ 45 - -I$(OUTPUT)arch/$(SRCARCH)/include/generated/uapi \ 46 45 -I$(srctree)/tools/lib/perf/include \ 47 46 -I$(srctree)/tools/lib/ \ 48 47 -I$(srctree)/tools/include \ ··· 99 100 $(call QUIET_CLEAN, libapi) 100 101 $(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null 101 102 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 103 + $(LIBPERF_IN): FORCE 112 104 $(Q)$(MAKE) $(build)=libperf 113 105 114 106 $(LIBPERF_A): $(LIBPERF_IN) ··· 120 130 clean: $(LIBAPI)-clean 121 131 $(call QUIET_CLEAN, libperf) $(RM) $(LIBPERF_A) \ 122 132 *.o *~ *.a *.so *.so.$(VERSION) *.so.$(LIBPERF_VERSION) .*.d .*.cmd tests/*.o LIBPERF-CFLAGS $(LIBPERF_PC) \ 123 - $(TESTS_STATIC) $(TESTS_SHARED) $(syscall-y) 133 + $(TESTS_STATIC) $(TESTS_SHARED) 124 134 125 135 TESTS_IN = tests-in.o 126 136
-1
tools/perf/Makefile.config
··· 64 64 $(call detected_var,SRCARCH) 65 65 66 66 CFLAGS += -I$(OUTPUT)arch/$(SRCARCH)/include/generated 67 - CFLAGS += -I$(OUTPUT)libperf/arch/$(SRCARCH)/include/generated/uapi 68 67 69 68 # Additional ARCH settings for ppc 70 69 ifeq ($(SRCARCH),powerpc)