lkml.org 
[lkml]   [2015]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH -tip] perf tools: fix building error for arm64.
Date
Commit b11db6581beaccef8ae9a388ae96074aa5cc144f ("perf tools: Fix build
error on ARCH=i386/x86_64/sparc64") use sed process 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>
---
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..6224eb8 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


\
 
 \ /
  Last update: 2015-03-17 13:01    [W:0.337 / U:0.056 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site