Merge pull request #4014 from boegel/arm64

correctly identify Apple Silicon M1 as Arm 64-bit by also considering arm64 next to aarch64

Author: ocaisa

easybuild/tools/systemtools.py

@@ -320,7 +320,7 @@ def get_cpu_architecture():
     :return: a value from the CPU_ARCHITECTURES list
     """
     aarch32_regex = re.compile("arm.*")
-    aarch64_regex = re.compile("aarch64.*")
+    aarch64_regex = re.compile("(aarch64|arm64).*")
     power_regex = re.compile("ppc64.*")
     riscv32_regex = re.compile("riscv32.*")
     riscv64_regex = re.compile("riscv64.*")

test/framework/systemtools.py

@@ -566,6 +566,7 @@ def test_cpu_architecture(self):
         machine_names = {
             'aarch64': AARCH64,
             'aarch64_be': AARCH64,
+            'arm64': AARCH64,
             'armv7l': AARCH32,
             'ppc64': POWER,
             'ppc64le': POWER,