From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755104AbbCRI03 (ORCPT ); Wed, 18 Mar 2015 04:26:29 -0400 Received: from mga09.intel.com ([134.134.136.24]:35624 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750756AbbCRI00 (ORCPT ); Wed, 18 Mar 2015 04:26:26 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,421,1422950400"; d="scan'208";a="693791412" Message-ID: <5509362A.8030202@intel.com> Date: Wed, 18 Mar 2015 10:24:10 +0200 From: Adrian Hunter Organization: Intel Finland Oy, Registered Address: PL 281, 00181 Helsinki, Business Identity Code: 0357606 - 4, Domiciled in Helsinki User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.4.0 MIME-Version: 1.0 To: "H.J. Lu" , Arnaldo Carvalho de Melo CC: "H. Peter Anvin" , Namhyung Kim , LKML , Jiri Olsa Subject: Re: [PATCH] Check ARCH and IS_64_BIT instead of IS_X86_64 in perf References: In-Reply-To: Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi +Arnaldo +Jiri I would change the commit message and subject. Say: Subject: perf tools: Fix perf-read-vdsox32 not building and lib64 install dir Commit: c6e5e9fbc3ea ("perf tools: Fix building error in x86_64 when dwarf unwind is on") removed the definition of IS_X86_64 but not all places using it, with the consequence that perf-read-vdsox32 would not be built anymore, and the default lib install directory was 'lib' instead of 'lib64'. Also needs to go to v3.19. Otherwise: Acked-by: Adrian Hunter Cc: stable@vger.kernel.org # 3.19 On 18/03/15 00:33, H.J. Lu wrote: > 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) > > > -- H.J. > > > 0001-Check-ARCH-and-IS_64_BIT-instead-of-IS_X86_64-in-per.patch > > > From 3ced13f64d49b2e4a9b38dd9bda80481a39d6b1a Mon Sep 17 00:00:00 2001 > From: "H.J. Lu" > 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 > --- > 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 >