aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/config
diff options
context:
space:
mode:
authorWang Nan <wangnan0@huawei.com>2015-03-17 09:29:47 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-03-18 08:58:56 -0400
commit235504dec113089856b39c65afb77a2f444aa2a9 (patch)
tree9f04a14d7e1fdbc4c8ac6ad64f651ee26160fae1 /tools/perf/config
parentd5dbc518cd8fbc7cf54b91d5b506eb4d67e4047d (diff)
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 <wangnan0@huawei.com> Acked-by: Namhyung Kim <namhyung@kernel.org> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Zefan Li <lizefan@huawei.com> Link: http://lkml.kernel.org/r/1426598987-75245-1-git-send-email-wangnan0@huawei.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/config')
-rw-r--r--tools/perf/config/Makefile.arch2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/config/Makefile.arch b/tools/perf/config/Makefile.arch
index e9720571341d..e11fbd6fae78 100644
--- a/tools/perf/config/Makefile.arch
+++ b/tools/perf/config/Makefile.arch
@@ -4,7 +4,7 @@ endif
4 4
5ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \ 5ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
6 -e s/sun4u/sparc/ -e s/sparc64/sparc/ \ 6 -e s/sun4u/sparc/ -e s/sparc64/sparc/ \
7 -e s/arm.*/arm/ -e s/sa110/arm/ \ 7 -e /arm64/!s/arm.*/arm/ -e s/sa110/arm/ \
8 -e s/s390x/s390/ -e s/parisc64/parisc/ \ 8 -e s/s390x/s390/ -e s/parisc64/parisc/ \
9 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \ 9 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
10 -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \ 10 -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \