Skip to contentSkip to conversation

perf build: Add perf regs objects building

tip:perf/core tip-bot for Jiri Olsa 1 participant 1 message Feb 18, 2015 perf events

lore
Share & tools
lore

tip-bot for Jiri Olsa

author merge bot
#0 lore raw
Commit-ID:  3bc3374cc50ce533259b7efed261f3d68307113c
Gitweb:     http://git.kernel.org/tip/3bc3374cc50ce533259b7efed261f3d68307113c
Author:     Jiri Olsa <[email protected]>
AuthorDate: Tue, 30 Dec 2014 13:30:04 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 12 Feb 2015 11:50:34 -0300

perf build: Add perf regs objects building

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

---
 tools/perf/Makefile.perf   | 7 -------
 tools/perf/config/Makefile | 4 ++++
 tools/perf/util/Build      | 2 ++
 3 files changed, 6 insertions(+), 7 deletions(-)
tools/perf/Makefile.perf +0 -7
index 4705fa9..7daccac 100644
@@ -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
index e92d1a4..2fc4d56 100644
@@ -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
index b0a6542..f698432 100644
@@ -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))"