diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-11-06 00:23:44 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-06 09:07:08 +0100 |
| commit | eeabbf554880f61979fa0a9ecf87ba380cd70863 (patch) | |
| tree | 2801ba1223fba1c46cd3bc26a7881cfe8196052f /src/3rdparty/masm/stubs | |
| parent | 3a61da32e485621c9afbd453d22cbe1f6c25479e (diff) | |
Fix build on WinRT
Disable JIT and avoid unsupported functions under WinRT.
Also add MSVC's ARM flag to the double conversion white list.
Change-Id: I22ec340a20b113fdeefb802ac61812f78a527895
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/3rdparty/masm/stubs')
| -rw-r--r-- | src/3rdparty/masm/stubs/ExecutableAllocator.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/3rdparty/masm/stubs/ExecutableAllocator.h b/src/3rdparty/masm/stubs/ExecutableAllocator.h index a8f54df39f..d8618b3b44 100644 --- a/src/3rdparty/masm/stubs/ExecutableAllocator.h +++ b/src/3rdparty/masm/stubs/ExecutableAllocator.h @@ -119,8 +119,10 @@ struct ExecutableAllocator { size_t iaddr = reinterpret_cast<size_t>(addr); size_t roundAddr = iaddr & ~(pageSize - static_cast<size_t>(1)); #if OS(WINDOWS) +#if !OS(WINRT) DWORD oldProtect; VirtualProtect(reinterpret_cast<void*>(roundAddr), size + (iaddr - roundAddr), PAGE_EXECUTE_READWRITE, &oldProtect); +#endif #else int mode = PROT_READ | PROT_EXEC; #if !ENABLE(ASSEMBLER_WX_EXCLUSIVE) |