From 4d29257f9bb13ad3588db33673d5dc7d9cc81992 Mon Sep 17 00:00:00 2001
From: crueter <crueter@eden-emu.dev>
Date: Sat, 27 Sep 2025 12:22:47 -0400
Subject: [PATCH] fix comp

Signed-off-by: crueter <crueter@eden-emu.dev>
---
 externals/CMakeLists.txt                           | 14 --------------
 .../dynarmic/backend/exception_handler_posix.cpp   |  9 ++++-----
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index 2860909567..18491962b2 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -186,20 +186,6 @@ endif()
 # Glad
 add_subdirectory(glad)
 
-# mbedtls
-# TODO(crueter): Findmbedtls that ONLY accepts mbedtls2
-AddJsonPackage(mbedtls)
-
-if (mbedtls_ADDED)
-    target_include_directories(mbedtls PUBLIC ${mbedtls_SOURCE_DIR}/include)
-
-    if (NOT MSVC)
-        target_compile_options(mbedcrypto PRIVATE
-            -Wno-unused-but-set-variable
-            -Wno-string-concatenation)
-    endif()
-endif()
-
 # libusb
 if (ENABLE_LIBUSB)
     add_subdirectory(libusb)
diff --git a/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp b/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp
index db7b688051..88febeacfa 100644
--- a/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp
+++ b/src/dynarmic/src/dynarmic/backend/exception_handler_posix.cpp
@@ -12,7 +12,6 @@
 #include <functional>
 #include <memory>
 #include <mutex>
-#include <lock_guard>
 #include <shared_mutex>
 #include <optional>
 #include <bit>
@@ -122,10 +121,10 @@ void SigHandler::SigAction(int sig, siginfo_t* info, void* raw_context) {
     CTX_DECLARE(raw_context);
 #if defined(ARCHITECTURE_x86_64)
     {
-        std::lock_guard<std::mutex> guard(sig_handler->code_block_infos_mutex);
+        std::shared_lock<std::shared_mutex> guard(sig_handler->code_block_infos_mutex);
         const auto iter = sig_handler->FindCodeBlockInfo(CTX_RIP);
         if (iter != sig_handler->code_block_infos.end()) {
-            FakeCall fc = iter->cb(CTX_RIP);
+            FakeCall fc = iter->second.cb(CTX_RIP);
             CTX_RSP -= sizeof(u64);
             *std::bit_cast<u64*>(CTX_RSP) = fc.ret_rip;
             CTX_RIP = fc.call_rip;
@@ -135,10 +134,10 @@ void SigHandler::SigAction(int sig, siginfo_t* info, void* raw_context) {
     fmt::print(stderr, "Unhandled {} at rip {:#018x}\n", sig == SIGSEGV ? "SIGSEGV" : "SIGBUS", CTX_RIP);
 #elif defined(ARCHITECTURE_arm64)
     {
-        std::lock_guard<std::mutex> guard(sig_handler->code_block_infos_mutex);
+        std::shared_lock<std::shared_mutex> guard(sig_handler->code_block_infos_mutex);
         const auto iter = sig_handler->FindCodeBlockInfo(CTX_PC);
         if (iter != sig_handler->code_block_infos.end()) {
-            FakeCall fc = iter->cb(CTX_PC);
+            FakeCall fc = iter->second.cb(CTX_PC);
             CTX_PC = fc.call_pc;
             return;
         }