From cbaf642ffe4b05f8796798ebdc5c6892605928cc Mon Sep 17 00:00:00 2001
From: Liam <byteslice@airmail.cc>
Date: Sun, 6 Nov 2022 16:45:36 -0500
Subject: Initial ARM64 support

---
 externals/CMakeLists.txt | 11 +++++------
 externals/dynarmic       |  2 +-
 externals/xbyak          |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'externals')

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index e80fd124e..7f0a6d069 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -7,15 +7,14 @@ include(DownloadExternals)
 
 # xbyak
 if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64)
-    add_library(xbyak INTERFACE)
-    file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include)
-    file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/xbyak/xbyak DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include)
-    target_include_directories(xbyak SYSTEM INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/xbyak/include)
-    target_compile_definitions(xbyak INTERFACE XBYAK_NO_OP_NAMES)
+    add_subdirectory(xbyak)
 endif()
 
 # Dynarmic
-if (ARCHITECTURE_x86_64)
+if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64)
+    if (ARCHITECTURE_arm64)
+       set(DYNARMIC_FRONTENDS "A32")
+    endif()
     set(DYNARMIC_NO_BUNDLED_FMT ON)
     set(DYNARMIC_IGNORE_ASSERTS ON CACHE BOOL "" FORCE)
     add_subdirectory(dynarmic)
diff --git a/externals/dynarmic b/externals/dynarmic
index 2d4602a65..424fdb5c5 160000
--- a/externals/dynarmic
+++ b/externals/dynarmic
@@ -1 +1 @@
-Subproject commit 2d4602a6516c67d547000d4c80bcc5f74976abdd
+Subproject commit 424fdb5c5026ec5bdd7553271190397f63fb503e
diff --git a/externals/xbyak b/externals/xbyak
index c306b8e57..348e3e548 160000
--- a/externals/xbyak
+++ b/externals/xbyak
@@ -1 +1 @@
-Subproject commit c306b8e5786eeeb87b8925a8af5c3bf057ff5a90
+Subproject commit 348e3e548ebac06d243e5881caec8440e249f65f
-- 
cgit v1.2.3