diff --git a/Common/Misc.cpp b/Common/Misc.cpp index 9c711cd900..6c62a06021 100644 --- a/Common/Misc.cpp +++ b/Common/Misc.cpp @@ -23,6 +23,10 @@ #if defined(__APPLE__) || defined(__SYMBIAN32__) #define __thread #endif +// Experiencing emutls crashes on ARM64 Android, so disabling for now. +#if defined(ANDROID) && !defined(ARM64) +#define __thread +#endif #ifdef _WIN32 #include "CommonWindows.h" diff --git a/ext/native/thread/threadutil.cpp b/ext/native/thread/threadutil.cpp index c0ff13f044..ac7f90d6af 100644 --- a/ext/native/thread/threadutil.cpp +++ b/ext/native/thread/threadutil.cpp @@ -1,7 +1,8 @@ #ifdef _WIN32 #include #define TLS_SUPPORTED -#elif defined(ANDROID) +// Experiencing emutls crashes on ARM64 Android, so disabling for now. +#elif defined(ANDROID) && !defined(ARM64) #define TLS_SUPPORTED #endif