From 5ab0db2cd301e3ca460453a96b30b17824daffa7 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 9 Oct 2016 20:40:00 -0700 Subject: [PATCH] Undo arm64 fix: was a local problem, after all. --- Common/Misc.cpp | 4 ---- ext/native/thread/threadutil.cpp | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/Common/Misc.cpp b/Common/Misc.cpp index 6c62a06021..9c711cd900 100644 --- a/Common/Misc.cpp +++ b/Common/Misc.cpp @@ -23,10 +23,6 @@ #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 ac7f90d6af..c0ff13f044 100644 --- a/ext/native/thread/threadutil.cpp +++ b/ext/native/thread/threadutil.cpp @@ -1,8 +1,7 @@ #ifdef _WIN32 #include #define TLS_SUPPORTED -// Experiencing emutls crashes on ARM64 Android, so disabling for now. -#elif defined(ANDROID) && !defined(ARM64) +#elif defined(ANDROID) #define TLS_SUPPORTED #endif