From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754150AbbCQLd1 (ORCPT ); Tue, 17 Mar 2015 07:33:27 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:58097 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751983AbbCQLdZ (ORCPT ); Tue, 17 Mar 2015 07:33:25 -0400 From: Wang Nan To: , , CC: , Subject: [PATCH v2 -tip] perf tools: fix building error for arm64. Date: Tue, 17 Mar 2015 11:33:10 +0000 Message-ID: <1426591990-38818-1-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.210] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 replaces 'arm64' to 'aarch64' before 's/arm.*/arm/' to protect arm64 and replaces 'aarch64' back to 'arm64' after fixing 'arm.*'. Signed-off-by: Wang Nan --- v1 -> v2: Replace tabs with spaces to make new line similay to other lines. --- tools/perf/config/Makefile.arch | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch index e972057..a5b6020 100644 --- a/tools/perf/config/Makefile.arch +++ b/tools/perf/config/Makefile.arch @@ -2,8 +2,11 @@ ifndef ARCH ARCH := $(shell uname -m 2>/dev/null || echo not) endif +# Set arm64 to aarch64 before replacing arm.* to arm to protect ARCH = arm64. +# aarch64 will be replaced by arm64 again. 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/arm64/aarch64/ \ -e s/arm.*/arm/ -e s/sa110/arm/ \ -e s/s390x/s390/ -e s/parisc64/parisc/ \ -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ -- 1.8.3.4