From: Mika Lindqvist <postmaster@raasu.org>
Date: Sat, 9 Jul 2022 09:33:02 +0000 (+0300)
Subject: Treat arm64 as aarch64 for Apple M1.
X-Git-Tag: 2.0.7~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=08e3044fdcb66ab6da423a0764cae96db72e3d77;p=thirdparty%2Fzlib-ng.git

Treat arm64 as aarch64 for Apple M1.
---

diff --git a/cmake/detect-arch.c b/cmake/detect-arch.c
index 84e6a841..43ddb126 100644
--- a/cmake/detect-arch.c
+++ b/cmake/detect-arch.c
@@ -12,7 +12,7 @@
     #error archfound i686
 
 // ARM
-#elif defined(__aarch64__) || defined(_M_ARM64)
+#elif defined(__aarch64__) || defined(__arm64__) || defined(_M_ARM64)
     #error archfound aarch64
 #elif defined(__arm__) || defined(__arm) || defined(_M_ARM) || defined(__TARGET_ARCH_ARM)
     #if defined(__ARM64_ARCH_8__) || defined(__ARMv8__) || defined(__ARMv8_A__)
diff --git a/configure b/configure
index 76350219..a7dfc5bf 100755
--- a/configure
+++ b/configure
@@ -332,7 +332,7 @@ if test "$gcc" -eq 1 && ($cc $CFLAGS -c $test.c) >> configure.log 2>&1; then
       else
         ARCH=native
       fi ;;
-    aarch64 | aarch64_be)
+    aarch64 | aarch64_be | arm64)
       if test "${uname}" = "elf"; then
         uname=aarch64
       fi
@@ -1479,7 +1479,7 @@ EOF
 
     ;;
     # 64-bit ARM specific optimizations
-    aarch64)
+    aarch64 | arm64)
         [ ! -z $CROSS_PREFIX ] && QEMU_ARCH=aarch64
         ARCHDIR=arch/arm