diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-25 03:02:08 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-25 03:02:08 +0100 |
| commit | 94f1d4ad6db2e8eaad229cd091ed36f7cdc6d291 (patch) | |
| tree | 0a1910ec1da5bc0467140039d08666e6a401cfd9 | |
| parent | aa09f9195fcbb73f064849af606c55422b36c79f (diff) | |
| parent | b65a9693f730f625cda95684acfaefd21538a5da (diff) | |
| download | qtscript-94f1d4ad6db2e8eaad229cd091ed36f7cdc6d291.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I5b83e1baec75279396171433aedf4b94267e805f
| -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 |