From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753566AbcGYSK6 (ORCPT ); Mon, 25 Jul 2016 14:10:58 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44678 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751962AbcGYSKx (ORCPT ); Mon, 25 Jul 2016 14:10:53 -0400 Date: Mon, 25 Jul 2016 11:10:37 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: wangnan0@huawei.com, hpa@zytor.com, adrian.hunter@intel.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, jolsa@kernel.org, mingo@kernel.org, namhyung@kernel.org, jpoimboe@redhat.com, tglx@linutronix.de, acme@redhat.com, sfr@canb.auug.org.au Reply-To: wangnan0@huawei.com, adrian.hunter@intel.com, hpa@zytor.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, mingo@kernel.org, jolsa@kernel.org, tglx@linutronix.de, jpoimboe@redhat.com, namhyung@kernel.org, acme@redhat.com, sfr@canb.auug.org.au To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools build: Add HOSTARCH Makefile variable Git-Commit-ID: 0a943cb10ce783a1c55adf6f52f62bcbd5f49314 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: 0a943cb10ce783a1c55adf6f52f62bcbd5f49314 Gitweb: http://git.kernel.org/tip/0a943cb10ce783a1c55adf6f52f62bcbd5f49314 Author: Arnaldo Carvalho de Melo AuthorDate: Fri, 22 Jul 2016 09:55:53 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 22 Jul 2016 16:25:45 -0300 tools build: Add HOSTARCH Makefile variable For tools that needs to be always compiled with the host headers. Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Josh Poimboeuf Cc: Namhyung Kim Cc: Stephen Rothwell Cc: Wang Nan Link: http://lkml.kernel.org/n/tip-907q32k2nep6q670dkxypmu6@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/scripts/Makefile.arch | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/scripts/Makefile.arch b/tools/scripts/Makefile.arch index e11fbd6..887321c 100644 --- a/tools/scripts/Makefile.arch +++ b/tools/scripts/Makefile.arch @@ -1,14 +1,13 @@ -ifndef ARCH -ARCH := $(shell uname -m 2>/dev/null || echo not) -endif - -ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \ +HOSTARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \ -e s/sun4u/sparc/ -e s/sparc64/sparc/ \ -e /arm64/!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/ ) +ifndef ARCH +ARCH := $(HOSTARCH) +endif LP64 := $(shell echo __LP64__ | ${CC} ${CFLAGS} -E -x c - | tail -n 1) ifeq ($(LP64), 1)