Fix build on armv8l

armv8l means arm64 in 32 bit mode so we need to treat it as 32 bit. ref: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/arch/arm64/include/asm/compat.h?h=v6.6.28#n34 ref: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/kernel/sys.c?h=v6.6.28#n1265 Signed-off-by: Natanael Copa <[email protected]>
k0sproject · Apr 26, 2024 · 03d9c6b · 03d9c6b
1 parent 0d9ecaf
commit 03d9c6b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -4,9 +4,9 @@ include hack/tools/Makefile.variables
 
 ifndef HOST_ARCH
 HOST_HARDWARE := $(shell uname -m)
-ifneq (, $(filter $(HOST_HARDWARE), aarch64 arm64 armv8l))
+ifneq (, $(filter $(HOST_HARDWARE), aarch64 arm64))
   HOST_ARCH := arm64
-else ifneq (, $(filter $(HOST_HARDWARE), armv7l arm))
+else ifneq (, $(filter $(HOST_HARDWARE), armv8l armv7l arm))
   HOST_ARCH := arm
 else
   ifeq (, $(filter $(HOST_HARDWARE), x86_64 amd64 x64))

diff --git a/hack/tool/Makefile b/hack/tool/Makefile
@@ -1,8 +1,8 @@
 ifndef HOST_ARCH
 HOST_HARDWARE := $(shell uname -m)
-ifneq (, $(filter $(HOST_HARDWARE), aarch64 arm64 armv8l))
+ifneq (, $(filter $(HOST_HARDWARE), aarch64 arm64))
   HOST_ARCH := arm64
-else ifneq (, $(filter $(HOST_HARDWARE), armv7l arm))
+else ifneq (, $(filter $(HOST_HARDWARE), armv8l armv7l arm))
   HOST_ARCH := arm
 else
   ifeq (, $(filter $(HOST_HARDWARE), x86_64 amd64 x64))