linux-kernel - [PATCH v2 -tip] perf tools: fix building error for arm64.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1426591990-38818-1-git-send-email-wangnan0@huawei.com>
Date:	Tue, 17 Mar 2015 11:33:10 +0000
From:	Wang Nan <wangnan0@...wei.com>
To:	<namhyung@...nel.org>, <jolsa@...nel.org>, <acme@...nel.org>
CC:	<lizefan@...wei.com>, <linux-kernel@...r.kernel.org>
Subject: [PATCH v2 -tip] 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 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@...wei.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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/