Commit 3bc3374c authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf build: Add perf regs objects building 



Move the regs objects building under build framework to be included in
the libperf build object.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Tested-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: Alexis Berlemont <alexis.berlemont@gmail.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-hgny792g5x5iaklc34aa57uh@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c7355f84

tools/perf/Makefile.perf

+0 −7
Original line number Diff line number Diff line
@@ -349,13 +349,6 @@ install-gtk: $(OUTPUT)libperf-gtk.so 
		$(INSTALL) $(OUTPUT)libperf-gtk.so '$(DESTDIR_SQ)$(libdir_SQ)'

endif



ifeq ($(NO_PERF_REGS),0)

  ifeq ($(ARCH),x86)

    LIB_H += arch/x86/include/perf_regs.h

  endif

  LIB_OBJS += $(OUTPUT)util/perf_regs.o

endif



ifndef NO_ZLIB

  LIB_OBJS += $(OUTPUT)util/zlib.o

endif

tools/perf/config/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ ifeq ($(ARCH),arm64) 
  LIBUNWIND_LIBS = -lunwind -lunwind-aarch64

endif



ifeq ($(NO_PERF_REGS),0)

  $(call detected,CONFIG_PERF_REGS)

endif



# So far there's only x86 and arm libdw unwind support merged in perf.

# Disable it on all other architectures in case libdw unwind

# support is detected in system. Add supported architectures

tools/perf/util/Build

+2 −0
Original line number Diff line number Diff line
@@ -90,6 +90,8 @@ libperf-$(CONFIG_LIBUNWIND) += unwind-libunwind.o 


libperf-y += scripting-engines/



libperf-$(CONFIG_PERF_REGS) += perf_regs.o



CFLAGS_config.o   += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"

CFLAGS_exec_cmd.o += -DPERF_EXEC_PATH="BUILD_STR($(perfexecdir_SQ))" -DPREFIX="BUILD_STR($(prefix_SQ))"

CRA Git | Maintained and supported by SUSTech CRA and CCSE