mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: <namhyung@kernel.org>, <jolsa@kernel.org>, <acme@kernel.org>
Cc: <lizefan@huawei.com>, <linux-kernel@vger.kernel.org>
Subject: [PATCH v2 -tip] perf tools: fix building error for arm64.
Date: Tue, 17 Mar 2015 11:33:10 +0000	[thread overview]
Message-ID: <1426591990-38818-1-git-send-email-wangnan0@huawei.com> (raw)

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 <wangnan0@huawei.com>
---
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


             reply	other threads:[~2015-03-17 11:33 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-17 11:33 Wang Nan [this message]
2015-03-17 13:12 ` Jiri Olsa
2015-03-17 13:29   ` [PATCH v3 " Wang Nan
2015-03-18  7:19     ` Namhyung Kim
2015-03-19  6:23       ` Wang Nan
2015-03-19 14:02         ` Arnaldo Carvalho de Melo
2015-03-22 10:05     ` [tip:perf/core] perf tools: Fix " tip-bot for Wang Nan
2015-03-17 13:30   ` [PATCH v2 -tip] perf tools: fix " Wang Nan

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1426591990-38818-1-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=acme@kernel.org \
    --cc=jolsa@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®