From 3ced13f64d49b2e4a9b38dd9bda80481a39d6b1a Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Tue, 17 Mar 2015 15:27:48 -0700
Subject: [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf

IS_X86_64 is never defined nor necessary.  We check check ARCH and
IS_64_BIT instead.

ifeq ($(IS_X86_64),1)

can be replaced by

ifeq ($(ARCH)$(IS_64_BIT), x861)

If IS_64_BIT is 1, we can replace

ifneq (${IS_X86_64}, 1)

with

ifneq ($(ARCH), x86)

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
---
 tools/perf/config/Makefile | 4 ++--
 tools/perf/tests/make      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile
index 648e31f..f97de8e 100644
--- a/tools/perf/config/Makefile
+++ b/tools/perf/config/Makefile
@@ -645,7 +645,7 @@ ifeq (${IS_64_BIT}, 1)
       NO_PERF_READ_VDSO32 := 1
     endif
   endif
-  ifneq (${IS_X86_64}, 1)
+  ifneq ($(ARCH), x86)
     NO_PERF_READ_VDSOX32 := 1
   endif
   ifndef NO_PERF_READ_VDSOX32
@@ -693,7 +693,7 @@ sysconfdir = $(prefix)/etc
 ETC_PERFCONFIG = etc/perfconfig
 endif
 ifndef lib
-ifeq ($(IS_X86_64),1)
+ifeq ($(ARCH)$(IS_64_BIT), x861)
 lib = lib64
 else
 lib = lib
diff --git a/tools/perf/tests/make b/tools/perf/tests/make
index 69a71ff..f8b24a2 100644
--- a/tools/perf/tests/make
+++ b/tools/perf/tests/make
@@ -5,7 +5,7 @@ include config/Makefile.arch
 
 # FIXME looks like x86 is the only arch running tests ;-)
 # we need some IS_(32/64) flag to make this generic
-ifeq ($(IS_X86_64),1)
+ifeq ($(ARCH)$(IS_64_BIT), x861)
 lib = lib64
 else
 lib = lib
-- 
1.9.3