diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2010-07-08 17:26:50 +0000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-06 15:09:19 +0200 |
| commit | 79ebd39d0d4846cb911ae122d2059e5add568d7e (patch) | |
| tree | 362acb4557f12abf9eff3a91337fefd2cd13d1be /src/3rdparty/javascriptcore/JavaScriptCore/wtf | |
| parent | 5188ded26930645e4856c59561225040033e3187 (diff) | |
| download | qtscript-79ebd39d0d4846cb911ae122d2059e5add568d7e.tar.gz | |
Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)
Cherry-picked from webkit commit
a5b3261a8c4386b4e14ce40a34c7fc933a5f7001
Task-number: QTBUG-23871
Change-Id: Ia028fe072b349e3a7883ae0f6f7298941cc1bc9e
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Diffstat (limited to 'src/3rdparty/javascriptcore/JavaScriptCore/wtf')
| -rw-r--r-- | src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h index cb4a963..48c8d18 100644 --- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h @@ -1005,6 +1005,16 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #define ENABLE_ASSEMBLER_WX_EXCLUSIVE 0 #endif +/* Pick which allocator to use; we only need an executable allocator if the assembler is compiled in. + On x86-64 we use a single fixed mmap, on other platforms we mmap on demand. */ +#if ENABLE(ASSEMBLER) +#if CPU(X86_64) +#define ENABLE_EXECUTABLE_ALLOCATOR_FIXED 1 +#else +#define ENABLE_EXECUTABLE_ALLOCATOR_DEMAND 1 +#endif +#endif + #if !defined(ENABLE_PAN_SCROLLING) && OS(WINDOWS) #define ENABLE_PAN_SCROLLING 1 #endif |