diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-01-11 08:06:26 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-30 12:43:16 (GMT) |
| commit | 55b37f8d4a85c926dab69e4bca0add3295e1c259 (patch) | |
| tree | 4e8131902b31c72518831036d86001d3e740a876 /src/3rdparty | |
| parent | 8736de61dc30d70e05ad1be4ef456e8eedbe51b8 (diff) | |
| download | Qt-55b37f8d4a85c926dab69e4bca0add3295e1c259.zip Qt-55b37f8d4a85c926dab69e4bca0add3295e1c259.tar.gz Qt-55b37f8d4a85c926dab69e4bca0add3295e1c259.tar.bz2 | |
Add a means to specify that the VM_POOL_SIZE can be 1gb and not 2gb
Due to a reported problem where the reserving of 2gb was too big under
certain circumstances then in order to provide a means for people who
hit this problem a define is added so that the VM_POOL_SIZE is set to be
1gb instead. This is an optional define and the default is for the size
to be 2gb which keeps it to current behavior.
Change-Id: I73200e1bcfcf7b37c6ba62f8b7bcf217f239dfcb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
(cherry picked from commit f32c98f4876fd6f4d28d710d6ee1d59707b2ac62)
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp index e1237e4..5233923 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp +++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp @@ -39,7 +39,11 @@ #if CPU(X86_64) // These limits suitable on 64-bit platforms (particularly x86-64, where we require all jumps to have a 2Gb max range). +#ifdef QT_USE_ONEGB_VMALLOCATOR + #define VM_POOL_SIZE (1024u * 1024u * 1024u) // 1Gb +#else #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb +#endif #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb #else // These limits are hopefully sensible on embedded platforms. |