linux-kernel - [PATCH v2 1/1] tools build: transform ARCH to supported values

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: Windows password security audit tool. GUI, reports in PDF.

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

Date:   Sun, 2 Apr 2017 23:41:59 -0700
From:   <jiada_wang@...tor.com>
To:     <acme@...hat.com>, <jpoimboe@...hat.com>
CC:     <linux-kernel@...r.kernel.org>, <jiada_wang@...tor.com>,
        <erosca@...adit-jv.com>
Subject: [PATCH v2 1/1] tools build: transform ARCH to supported values

From: Jiada Wang <jiada_wang@...tor.com>

with commit: 0a943cb10ce7 (tools build: Add HOSTARCH Makefile variable)
the following build failure is seen with ARCH=x86_84

In file included from util/event.c:2:0:
tools/include/uapi/linux/mman.h:4:27: fatal error: uapi/asm/mman.h: No such file or directory
compilation terminated.

This patch by evaluate ARCH to supported values just as the behavior before
above mentioned patch to fix the issue.

Signed-off-by: Jiada Wang <jiada_wang@...tor.com>
Signed-off-by: Eugeniu Rosca <erosca@...adit-jv.com>
---
 tools/scripts/Makefile.arch |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/scripts/Makefile.arch b/tools/scripts/Makefile.arch
index ad85b92..41cfc56 100644
--- a/tools/scripts/Makefile.arch
+++ b/tools/scripts/Makefile.arch
@@ -1,4 +1,4 @@
-HOSTARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
+purify-arch = $(shell echo $1 | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
                                   -e s/sun4u/sparc/ -e s/sparc64/sparc/ \
                                   -e /arm64/!s/arm.*/arm/ -e s/sa110/arm/ \
                                   -e s/s390x/s390/ -e s/parisc64/parisc/ \
@@ -6,8 +6,12 @@ HOSTARCH := $(shell uname -m | sed -e s/i.86/x86/ -e s/x86_64/x86/ \
                                   -e s/sh[234].*/sh/ -e s/aarch64.*/arm64/ \
                                   -e s/tile.*/tile/ )
 
+HOSTARCH := $(call purify-arch,$(shell uname -m))
+
 ifndef ARCH
 ARCH := $(HOSTARCH)
+else
+ARCH := $(call purify-arch,$(ARCH))
 endif
 
 SRCARCH := $(ARCH)
-- 
1.7.9.5