From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753812AbbCCGXQ (ORCPT ); Tue, 3 Mar 2015 01:23:16 -0500 Received: from terminus.zytor.com ([198.137.202.10]:49221 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752068AbbCCGXP (ORCPT ); Tue, 3 Mar 2015 01:23:15 -0500 Date: Mon, 2 Mar 2015 22:22:50 -0800 From: tip-bot for Namhyung Kim Message-ID: Cc: hpa@zytor.com, hekuang@huawei.com, namhyung@kernel.org, linux-kernel@vger.kernel.org, mingo@kernel.org, tglx@linutronix.de, david.ahern@oracle.com, a.p.zijlstra@chello.nl, acme@redhat.com Reply-To: acme@redhat.com, tglx@linutronix.de, david.ahern@oracle.com, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, mingo@kernel.org, hpa@zytor.com, hekuang@huawei.com, namhyung@kernel.org In-Reply-To: <1425270663-10215-1-git-send-email-namhyung@kernel.org> References: <1425270663-10215-1-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix build error on ARCH=i386/x86_64/ sparc64 Git-Commit-ID: b11db6581beaccef8ae9a388ae96074aa5cc144f X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b11db6581beaccef8ae9a388ae96074aa5cc144f Gitweb: http://git.kernel.org/tip/b11db6581beaccef8ae9a388ae96074aa5cc144f Author: Namhyung Kim AuthorDate: Mon, 2 Mar 2015 13:31:03 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 2 Mar 2015 12:01:42 -0300 perf tools: Fix build error on ARCH=i386/x86_64/sparc64 He Kuang reported that current perf tools failed to build when ARCH variable was given like above. It was because the name is different that internal directory name. I can see that David's sparc64 build has same problem. So fix it by applying the sed conversion script to the command line ARCH variable also, and fixing the converted name there (i.e. i386/x86_64 -> x86, sparc64 -> sparc). Reported-by: He Kuang Signed-off-by: Namhyung Kim Tested-by: He Kuang Acked: Jiri Olsa Cc: David Ahern Cc: He Kuang Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1425270663-10215-1-git-send-email-namhyung@kernel.org [ Resolved conflict with 4861f87cd3d1 "Make sparc64 arch point to sparc" ] Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/config/Makefile.arch | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch index ac8721f..e972057 100644 --- a/tools/perf/config/Makefile.arch +++ b/tools/perf/config/Makefile.arch @@ -1,32 +1,15 @@ +ifndef ARCH +ARCH := $(shell uname -m 2>/dev/null || echo not) +endif -uname_M := $(shell uname -m 2>/dev/null || echo not) - -RAW_ARCH := $(shell echo $(uname_M) | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \ + -e s/sun4u/sparc/ -e s/sparc64/sparc/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \ -e s/tile.*/tile/ ) -# Additional ARCH settings for x86 -ifeq ($(RAW_ARCH),i386) - ARCH ?= x86 -endif - -ifeq ($(RAW_ARCH),x86_64) - ARCH ?= x86 - - ifneq (, $(findstring m32,$(CFLAGS))) - RAW_ARCH := x86_32 - endif -endif - -ifeq ($(RAW_ARCH),sparc64) - ARCH ?= sparc -endif - -ARCH ?= $(RAW_ARCH) - LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) ifeq ($(LP64), 1) IS_64_BIT := 1