From b76ad05a533ee770f7d4cf01589d48a03ef0be2e Mon Sep 17 00:00:00 2001
From: niansa <tuxifan@posteo.de>
Date: Tue, 12 Mar 2024 22:02:00 +0100
Subject: [PATCH 1/2] Link to LLVM statically

---
 src/common/CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 3baae5a30d..05dc4a5209 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -254,8 +254,14 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
   )
 endif()
 
+function (target_link_static_library TARGET MODE LIBRARY)
+    set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
+    target_link_libraries(${TARGET} ${MODE} ${LIBRARY})
+endfunction()
+
 target_link_libraries(common PUBLIC Boost::context Boost::headers fmt::fmt microprofile stb::headers Threads::Threads)
-target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd LLVM::Demangle)
+target_link_libraries(common PRIVATE lz4::lz4 zstd::zstd)
+target_link_static_library(common PRIVATE LLVM::Demangle)
 
 if (ANDROID)
     # For ASharedMemory_create

From 6febb8291740bec1d3ac66aa8ec0c91bbc5fc8cb Mon Sep 17 00:00:00 2001
From: niansa <tuxifan@posteo.de>
Date: Tue, 12 Mar 2024 22:45:45 +0100
Subject: [PATCH 2/2] Link LLVM in dynarmic statically

---
 .gitmodules        | 7 ++++---
 externals/dynarmic | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 318fa81c66..b0ef76f5d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -7,9 +7,6 @@
 [submodule "cubeb"]
 	path = externals/cubeb
 	url = https://github.com/mozilla/cubeb.git
-[submodule "dynarmic"]
-	path = externals/dynarmic
-	url = https://gitlab.com/suyu-emu/dynarmic.git
 [submodule "libusb"]
 	path = externals/libusb/libusb
 	url = https://github.com/libusb/libusb.git
@@ -67,3 +64,7 @@
 [submodule "Vulkan-Utility-Libraries"]
 	path = externals/Vulkan-Utility-Libraries
 	url = https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git
+[submodule "externals/dynarmic"]
+	path = externals/dynarmic
+	url = https://gitlab.com/suyu-emu/dynarmic.git
+	branch = stable
diff --git a/externals/dynarmic b/externals/dynarmic
index ba8192d890..f35a122a46 160000
--- a/externals/dynarmic
+++ b/externals/dynarmic
@@ -1 +1 @@
-Subproject commit ba8192d89078af51ae6f97c9352e3683612cdff1
+Subproject commit f35a122a4654d9f7edc32e0b44ad09f17819ae6d