From 7d0adfb758b7964cc4d42976a7938b88dfffd23a Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Mon, 11 May 2015 00:48:55 +0000
Subject: [PATCH] Group and sort KERNEL_ARCH_PERF definitions by kernel
 architecture

Use the $(filter) function to test for any of the CPU names that map
to each kernel architecture, where there are several.

svn path=/dists/trunk/linux-tools/; revision=22596
---
 debian/build/tools/perf/Makefile | 30 +++++++-----------------------
 1 file changed, 7 insertions(+), 23 deletions(-)

diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile
index d92ded4be..3e14aeb11 100644
--- a/debian/build/tools/perf/Makefile
+++ b/debian/build/tools/perf/Makefile
@@ -6,40 +6,24 @@ DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
 ifeq ($(DEB_HOST_ARCH_CPU),alpha)
   KERNEL_ARCH_PERF = alpha
-else ifeq ($(DEB_HOST_ARCH_CPU),amd64)
-  KERNEL_ARCH_PERF = x86
 else ifeq ($(DEB_HOST_ARCH_CPU),arm)
   KERNEL_ARCH_PERF = arm
 else ifeq ($(DEB_HOST_ARCH_CPU),arm64)
   KERNEL_ARCH_PERF = arm64
+else ifneq ($(filter mips%,$(DEB_HOST_ARCH_CPU)),)
+  KERNEL_ARCH_PERF = mips
 else ifeq ($(DEB_HOST_ARCH_CPU),hppa)
   KERNEL_ARCH_PERF = parisc
-else ifeq ($(DEB_HOST_ARCH_CPU),i386)
-  KERNEL_ARCH_PERF = x86
-else ifeq ($(DEB_HOST_ARCH_CPU),mips)
-  KERNEL_ARCH_PERF = mips
-else ifeq ($(DEB_HOST_ARCH_CPU),mips64)
-  KERNEL_ARCH_PERF = mips
-else ifeq ($(DEB_HOST_ARCH_CPU),mips64el)
-  KERNEL_ARCH_PERF = mips
-else ifeq ($(DEB_HOST_ARCH_CPU),mipsel)
-  KERNEL_ARCH_PERF = mips
-else ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
+else ifneq ($(filter powerpc% ppc%,$(DEB_HOST_ARCH_CPU)),)
   KERNEL_ARCH_PERF = powerpc
-else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64)
-  KERNEL_ARCH_PERF = powerpc
-else ifeq ($(DEB_HOST_ARCH_CPU),ppc64el)
-  KERNEL_ARCH_PERF = powerpc
-else ifeq ($(DEB_HOST_ARCH_CPU),s390)
-  KERNEL_ARCH_PERF = s390
-else ifeq ($(DEB_HOST_ARCH_CPU),s390x)
+else ifneq ($(filter s390%,$(DEB_HOST_ARCH_CPU)),)
   KERNEL_ARCH_PERF = s390
 else ifeq ($(DEB_HOST_ARCH_CPU),sh4)
   KERNEL_ARCH_PERF = sh
-else ifeq ($(DEB_HOST_ARCH_CPU),sparc)
-  KERNEL_ARCH_PERF = sparc
-else ifeq ($(DEB_HOST_ARCH_CPU),sparc64)
+else ifneq ($(filter sparc%,$(DEB_HOST_ARCH_CPU)),)
   KERNEL_ARCH_PERF = sparc
+else ifneq ($(filter amd64 i386,$(DEB_HOST_ARCH_CPU)),)
+  KERNEL_ARCH_PERF = x86
 endif
 
 MAKE_PERF := $(MAKE) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error