From b65a9693f730f625cda95684acfaefd21538a5da Mon Sep 17 00:00:00 2001 From: Thomas Miller Date: Thu, 20 Dec 2018 12:34:50 -0800 Subject: Enable JavaScriptCore to compile for MSVC arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2a735a5bfa8eb417cb2824ebd8e008676f403e35 Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki --- src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 2 +- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp index 1b2fd1d..e8f78ee 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp @@ -601,7 +601,7 @@ static inline void* currentThreadStackBase() MOV pTib, EAX } return static_cast(pTib->StackBase); -#elif OS(WINDOWS) && CPU(X86_64) && (COMPILER(MSVC) || COMPILER(GCC)) +#elif OS(WINDOWS) && (CPU(X86_64) || CPU(AARCH64)) && (COMPILER(MSVC) || COMPILER(GCC)) // FIXME: why only for MSVC? PNT_TIB64 pTib = reinterpret_cast(NtCurrentTeb()); return reinterpret_cast(pTib->StackBase); diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index 96942c7..a4695a2 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -252,7 +252,7 @@ #endif /* CPU(AARCH64) - AArch64 */ -#if defined(__aarch64__) +#if defined(__aarch64__) || defined(_M_ARM64) #define WTF_CPU_AARCH64 1 #if defined(__AARCH64EB__) #define WTF_CPU_BIG_ENDIAN 1 -- cgit v1.2.1