diff options
| author | Thomas Miller <thomaslmiller91@gmail.com> | 2018-12-20 12:34:50 -0800 |
|---|---|---|
| committer | Thomas Miller <thomaslmiller91@gmail.com> | 2018-12-21 16:06:29 +0000 |
| commit | b65a9693f730f625cda95684acfaefd21538a5da (patch) | |
| tree | b7f0b8bc299bff096fe40c5b25622d863d992a0b | |
| parent | 0be84da60090e9d20ec0066bcd3900ca5572df95 (diff) | |
| download | qtscript-b65a9693f730f625cda95684acfaefd21538a5da.tar.gz | |
Enable JavaScriptCore to compile for MSVC arm64
Change-Id: I2a735a5bfa8eb417cb2824ebd8e008676f403e35
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 2 | ||||
| -rw-r--r-- | 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<void*>(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<PNT_TIB64>(NtCurrentTeb()); return reinterpret_cast<void*>(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 |