From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751950AbbCVKGB (ORCPT ); Sun, 22 Mar 2015 06:06:01 -0400 Received: from terminus.zytor.com ([198.137.202.10]:56824 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751785AbbCVKF5 (ORCPT ); Sun, 22 Mar 2015 06:05:57 -0400 Date: Sun, 22 Mar 2015 03:05:40 -0700 From: tip-bot for Wang Nan Message-ID: Cc: acme@redhat.com, namhyung@kernel.org, tglx@linutronix.de, lizefan@huawei.com, jolsa@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, mingo@kernel.org Reply-To: acme@redhat.com, namhyung@kernel.org, tglx@linutronix.de, lizefan@huawei.com, jolsa@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, wangnan0@huawei.com, mingo@kernel.org In-Reply-To: <1426598987-75245-1-git-send-email-wangnan0@huawei.com> References: <1426598987-75245-1-git-send-email-wangnan0@huawei.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Fix building error for arm64. Git-Commit-ID: 235504dec113089856b39c65afb77a2f444aa2a9 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: 235504dec113089856b39c65afb77a2f444aa2a9 Gitweb: http://git.kernel.org/tip/235504dec113089856b39c65afb77a2f444aa2a9 Author: Wang Nan AuthorDate: Tue, 17 Mar 2015 13:29:47 +0000 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 18 Mar 2015 09:58:56 -0300 perf tools: Fix building error for arm64. Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build error on ARCH=i386/x86_64/sparc64") uses sed on ARCH, which triggers a bug in sequence of sed expression, where 's/arm.*/arm/' will replace 'arm64' to 'arm', causes arm64 building failure. This patch prevent 'arm64' to be mached for 'arm.*' case. Signed-off-by: Wang Nan Acked-by: Namhyung Kim Cc: Jiri Olsa Cc: Zefan Li Link: http://lkml.kernel.org/r/1426598987-75245-1-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/config/Makefile.arch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch index e972057..e11fbd6 100644 --- a/tools/perf/config/Makefile.arch +++ b/tools/perf/config/Makefile.arch @@ -4,7 +4,7 @@ endif 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 /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/ \