From 5feb087c05beff18208c31b369d74dc3badeada3 Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Mon, 31 Aug 2020 20:02:08 +0200 Subject: [PATCH 1/2] Handle Apple labeling armv8 as arm64 rather than aarch64 --- cmake/system_check.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/system_check.cmake b/cmake/system_check.cmake index 4382ffc4e..511a7c7d1 100644 --- a/cmake/system_check.cmake +++ b/cmake/system_check.cmake @@ -54,14 +54,14 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") endif() elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*|amd64.*|AMD64.*") set(X86 1) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)") - set(ARM 1) -elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*)") +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)") if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") set(ARM64 1) else() set(ARM 1) endif() +elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)") + set(ARM 1) elseif (${CMAKE_CROSSCOMPILING}) if (${TARGET} STREQUAL "CORE2") if (NOT BINARY) From 3210a427345126112d3a1501d2ea8024aea861cc Mon Sep 17 00:00:00 2001 From: Martin Kroeker Date: Mon, 31 Aug 2020 20:03:21 +0200 Subject: [PATCH 2/2] Report cpu as ARMV8 instead of just giving up on non-Linux hosts --- cpuid_arm64.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cpuid_arm64.c b/cpuid_arm64.c index 6f41be604..1fd43148a 100644 --- a/cpuid_arm64.c +++ b/cpuid_arm64.c @@ -197,6 +197,8 @@ int detect(void) } +#else + return CPU_ARMV8; #endif return CPU_UNKNOWN;