[kernel] r22317 - in dists/sid/linux-tools/debian: . build/tools/perf patches templates

[Ben Hutchings]

Author: benh
Date: Sat Jan 31 16:21:27 2015
New Revision: 22317

Log:
[arm64] Enable building linux-tools, thanks to Steve Capper

Added:
   dists/sid/linux-tools/debian/patches/perf-tools-fix-arm64-build-error.patch
Modified:
   dists/sid/linux-tools/debian/build/tools/perf/Makefile
   dists/sid/linux-tools/debian/changelog
   dists/sid/linux-tools/debian/patches/series
   dists/sid/linux-tools/debian/rules.real
   dists/sid/linux-tools/debian/templates/control.main.in
   dists/sid/linux-tools/debian/templates/control.source.in

Modified: dists/sid/linux-tools/debian/build/tools/perf/Makefile
==============================================================================
--- dists/sid/linux-tools/debian/build/tools/perf/Makefile	Sat Jan 31 15:25:52 2015	(r22316)
+++ dists/sid/linux-tools/debian/build/tools/perf/Makefile	Sat Jan 31 16:21:27 2015	(r22317)
@@ -10,6 +10,8 @@
   KERNEL_ARCH_PERF = x86_64
 else ifeq ($(DEB_HOST_ARCH_CPU),arm)
   KERNEL_ARCH_PERF = arm
+else ifeq ($(DEB_HOST_ARCH_CPU),arm64)
+  KERNEL_ARCH_PERF = arm64
 else ifeq ($(DEB_HOST_ARCH_CPU),hppa)
   KERNEL_ARCH_PERF = parisc
 else ifeq ($(DEB_HOST_ARCH_CPU),i386)

Modified: dists/sid/linux-tools/debian/changelog
==============================================================================
--- dists/sid/linux-tools/debian/changelog	Sat Jan 31 15:25:52 2015	(r22316)
+++ dists/sid/linux-tools/debian/changelog	Sat Jan 31 16:21:27 2015	(r22317)
@@ -4,6 +4,7 @@
     (Closes: #763002)
   * linux-tools: Add a check that perf is not linked with libbfd
   * [armel,armhf] linux-tools: Enable use of libunwind
+  * [arm64] Enable building linux-tools, thanks to Steve Capper
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 27 Sep 2014 02:39:21 +0100
 

Added: dists/sid/linux-tools/debian/patches/perf-tools-fix-arm64-build-error.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-tools/debian/patches/perf-tools-fix-arm64-build-error.patch	Sat Jan 31 16:21:27 2015	(r22317)
@@ -0,0 +1,39 @@
+From: Mark Salter <msalter at redhat.com>
+Date: Fri, 25 Jul 2014 18:02:46 -0400
+Subject: perf tools: Fix arm64 build error
+Origin: https://git.kernel.org/linus/7d885749b6de2c9a1168d566e2380207b9177108
+
+I'm seeing the following build error on arm64:
+
+  In file included from util/event.c:3:0:
+  util/event.h:95:17: error: 'PERF_REGS_MAX' undeclared here (not in a function)
+    u64 cache_regs[PERF_REGS_MAX];
+                 ^
+
+This patch adds a PERF_REGS_MAX definition for arm64.
+
+Signed-off-by: Mark Salter <msalter at redhat.com>
+Acked-by: Jean Pihet <jean.pihet at linaro.org>
+Cc: Ingo Molnar <mingo at redhat.com>
+Cc: Jean Pihet <jean.pihet at linaro.org>
+Cc: Paul Mackerras <paulus at samba.org>
+Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
+Link: http://lkml.kernel.org/r/1406325766-8085-1-git-send-email-msalter@redhat.com
+Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
+---
+ tools/perf/arch/arm64/include/perf_regs.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tools/perf/arch/arm64/include/perf_regs.h b/tools/perf/arch/arm64/include/perf_regs.h
+index e9441b9..1d3f39c 100644
+--- a/tools/perf/arch/arm64/include/perf_regs.h
++++ b/tools/perf/arch/arm64/include/perf_regs.h
+@@ -6,6 +6,8 @@
+ #include <asm/perf_regs.h>
+ 
+ #define PERF_REGS_MASK	((1ULL << PERF_REG_ARM64_MAX) - 1)
++#define PERF_REGS_MAX	PERF_REG_ARM64_MAX
++
+ #define PERF_REG_IP	PERF_REG_ARM64_PC
+ #define PERF_REG_SP	PERF_REG_ARM64_SP
+ 

Modified: dists/sid/linux-tools/debian/patches/series
==============================================================================
--- dists/sid/linux-tools/debian/patches/series	Sat Jan 31 15:25:52 2015	(r22316)
+++ dists/sid/linux-tools/debian/patches/series	Sat Jan 31 16:21:27 2015	(r22317)
@@ -3,3 +3,4 @@
 tools-perf-install.patch
 usbip-document-tcp-wrappers.patch
 kbuild-fix-recordmcount-dependency.patch
+perf-tools-fix-arm64-build-error.patch

Modified: dists/sid/linux-tools/debian/rules.real
==============================================================================
--- dists/sid/linux-tools/debian/rules.real	Sat Jan 31 15:25:52 2015	(r22316)
+++ dists/sid/linux-tools/debian/rules.real	Sat Jan 31 16:21:27 2015	(r22317)
@@ -9,7 +9,7 @@
 VERSION_DEBIAN_FULL := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
 
 binary-arch: install-kbuild install-usbip
-ifneq ($(filter alpha amd64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
+ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),)
   binary-arch: install-tools
 endif
 

Modified: dists/sid/linux-tools/debian/templates/control.main.in
==============================================================================
--- dists/sid/linux-tools/debian/templates/control.main.in	Sat Jan 31 15:25:52 2015	(r22316)
+++ dists/sid/linux-tools/debian/templates/control.main.in	Sat Jan 31 16:21:27 2015	(r22317)
@@ -7,7 +7,7 @@
 
 Package: linux-tools- at version@
 Section: devel
-Architecture: alpha amd64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64
+Architecture: alpha amd64 arm64 armel armhf hppa i386 powerpc ppc64 ppc64el s390 s390x sh4 sparc sparc64
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python:Depends}
 Recommends: linux-base (>= 3.4~)
 Suggests: linux-doc- at version@

Modified: dists/sid/linux-tools/debian/templates/control.source.in
==============================================================================
--- dists/sid/linux-tools/debian/templates/control.source.in	Sat Jan 31 15:25:52 2015	(r22316)
+++ dists/sid/linux-tools/debian/templates/control.source.in	Sat Jan 31 16:21:27 2015	(r22317)
@@ -6,7 +6,7 @@
 Standards-Version: 3.9.4
 Build-Depends:
  debhelper (>> 7), python,
- asciidoc, bison, flex, libaudit-dev, libc-bin, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 i386 powerpc ppc64 ppc64el], libperl-dev, libunwind8-dev [amd64 i386], python-dev, xmlto,
+ asciidoc, bison, flex, libaudit-dev, libc-bin, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 arm64 i386 powerpc ppc64 ppc64el], libperl-dev, libunwind8-dev [amd64 arm64 i386], python-dev, xmlto,
  autoconf, automake, libtool, libglib2.0-dev, libudev-dev, libwrap0-dev
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
 Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/