Commit 129bb23a authored by Leo Yan's avatar Leo Yan Committed by Arnaldo Carvalho de Melo
Browse files

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



This reverts:

commit 8988c4b9 ("perf tools: Fix in-source libperf build")
commit bfb713ea ("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: default avatarJames Clark <james.clark@linaro.org>
Signed-off-by: default avatarLeo 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 096b86ce

tools/lib/perf/Makefile

+2 −12
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ 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 \
@@ -100,16 +99,7 @@ $(LIBAPI)-clean: 
	$(call QUIET_CLEAN, libapi)

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



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

$(LIBPERF_IN): FORCE

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



$(LIBPERF_A): $(LIBPERF_IN)
@@ -130,7 +120,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) $(syscall-y)

                $(TESTS_STATIC) $(TESTS_SHARED)



TESTS_IN = tests-in.o

tools/perf/Makefile.config

+0 −1
Original line number Diff line number Diff line
@@ -64,7 +64,6 @@ 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)