[armel,armhf] linux-tools: Enable use of libunwind

perf requires some architecture-specific code in conjunction with
libunwind.  It used to enable use of libunwind automatically anyway,
so we had to override this for architectures where it would fail to
build (by setting NO_LIBUNWIND=1).

The makefile is now fixed so we don't need to this.  Since perf now
has the extra code for arm, this enables use of libunwind there.

svn path=/dists/sid/linux-tools/; revision=21910
This commit is contained in:
Ben Hutchings 2014-09-27 02:07:04 +00:00
parent 3c43bbca49
commit 1458163929
2 changed files with 2 additions and 4 deletions

View File

@ -3,20 +3,17 @@ OUTDIR = tools/perf
include ../../Makefile.inc
DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
NO_LIBUNWIND=1
ifeq ($(DEB_HOST_ARCH_CPU),alpha)
KERNEL_ARCH_PERF = alpha
else ifeq ($(DEB_HOST_ARCH_CPU),amd64)
KERNEL_ARCH_PERF = x86_64
NO_LIBUNWIND=
else ifeq ($(DEB_HOST_ARCH_CPU),arm)
KERNEL_ARCH_PERF = arm
else ifeq ($(DEB_HOST_ARCH_CPU),hppa)
KERNEL_ARCH_PERF = parisc
else ifeq ($(DEB_HOST_ARCH_CPU),i386)
KERNEL_ARCH_PERF = i386
NO_LIBUNWIND=
else ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
KERNEL_ARCH_PERF = powerpc
else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64)
@ -35,7 +32,7 @@ else ifeq ($(DEB_HOST_ARCH_CPU),sparc64)
KERNEL_ARCH_PERF = sparc
endif
MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error NO_LIBUNWIND=$(NO_LIBUNWIND)
MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error
# Disable Gtk UI until it's more usable
MAKE_PERF += NO_GTK2=1

1
debian/changelog vendored
View File

@ -3,6 +3,7 @@ linux-tools (3.16-3) UNRELEASED; urgency=low
* linux-tools: Fix build configuration to avoid linking perf with libbfd
(Closes: #763002)
* linux-tools: Add a check that perf is not linked with libbfd
* [armel,armhf] linux-tools: Enable use of libunwind
-- Ben Hutchings <ben@decadent.org.uk> Sat, 27 Sep 2014 02:39:21 +0100