diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile index 53da47e77..d21a33d29 100644 --- a/debian/build/tools/perf/Makefile +++ b/debian/build/tools/perf/Makefile @@ -10,6 +10,8 @@ else ifeq ($(DEB_HOST_ARCH_CPU),amd64) 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) diff --git a/debian/changelog b/debian/changelog index 2722b6069..7cda61047 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ linux-tools (3.16-3) UNRELEASED; urgency=low (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 Sat, 27 Sep 2014 02:39:21 +0100 diff --git a/debian/patches/perf-tools-fix-arm64-build-error.patch b/debian/patches/perf-tools-fix-arm64-build-error.patch new file mode 100644 index 000000000..6ac6b9c10 --- /dev/null +++ b/debian/patches/perf-tools-fix-arm64-build-error.patch @@ -0,0 +1,39 @@ +From: Mark Salter +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 +Acked-by: Jean Pihet +Cc: Ingo Molnar +Cc: Jean Pihet +Cc: Paul Mackerras +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/1406325766-8085-1-git-send-email-msalter@redhat.com +Signed-off-by: Arnaldo Carvalho de Melo +--- + 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 + + #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 + diff --git a/debian/patches/series b/debian/patches/series index 413b05d9e..7e214610c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ tools-perf-version.patch tools-perf-install.patch usbip-document-tcp-wrappers.patch kbuild-fix-recordmcount-dependency.patch +perf-tools-fix-arm64-build-error.patch diff --git a/debian/rules.real b/debian/rules.real index 42e7174b6..3ad38ddae 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -9,7 +9,7 @@ DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH) 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 diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in index 390782c3f..a90f8fea2 100644 --- a/debian/templates/control.main.in +++ b/debian/templates/control.main.in @@ -7,7 +7,7 @@ Description: Kbuild infrastructure for Linux @version@ Package: linux-tools-@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-@version@ diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index d58c87956..f9c8fb6c0 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -6,7 +6,7 @@ Uploaders: Bastian Blank , Ben Hutchings 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/