Merge pull request #1977 from Sonicadvance1/extend_arch_check

CMake: Extend AArch64 check to include arm64
FEX-Emu · Sep 10, 2022 · a583ebe · a583ebe
2 parents c987e1e + ce8175a
commit a583ebe
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -88,7 +88,7 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
   set (X86_TOOLCHAIN_FILE "")
 endif()
 
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64|^arm64|^armv8\.*")
   set(_M_ARM_64 1)
   add_definitions(-D_M_ARM_64=1)
 endif()

diff --git a/External/FEXCore/CMakeLists.txt b/External/FEXCore/CMakeLists.txt
@@ -9,7 +9,7 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mcx16")
 endif()
 
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64")
+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64|^arm64|^armv8\.*")
   set(_M_ARM_64 1)
 endif()