Sun Feb 10 01:12:35 PST 2013

5 files changed, 0 insertions, 457 deletions

diff --git a/extra/qt/disable-ssl-compression.patch b/extra/qt/disable-ssl-compression.patch
deleted file mode 100644
index 443af57f3..000000000
--- a/extra/qt/disable-ssl-compression.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From d41dc3e101a694dec98d7bbb582d428d209e5401 Mon Sep 17 00:00:00 2001
-From: Richard Moore <rich@kde.org>
-Date: Fri, 14 Sep 2012 00:13:08 +0100
-Subject: [PATCH] Disable SSL compression by default.
-
-Disable SSL compression by default since this appears to be the a likely
-cause of the currently hyped CRIME attack.
-
-This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74
-
-Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a
-Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
-Reviewed-by: Peter Hartmann <phartmann@rim.com>
----
- src/network/ssl/qssl.cpp              |    5 +++--
- src/network/ssl/qsslconfiguration.cpp |    4 +++-
- src/network/ssl/qsslconfiguration_p.h |    4 +++-
- 3 files changed, 9 insertions(+), 4 deletions(-)
-
-diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
-index 49e086f..9578178 100644
---- a/src/network/ssl/qssl.cpp
-+++ b/src/network/ssl/qssl.cpp
-@@ -148,8 +148,9 @@ QT_BEGIN_NAMESPACE
- 
-     By default, SslOptionDisableEmptyFragments is turned on since this causes
-     problems with a large number of servers. SslOptionDisableLegacyRenegotiation
--    is also turned on, since it introduces a security risk. The other options
--    are turned off.
-+    is also turned on, since it introduces a security risk.
-+    SslOptionDisableCompression is turned on to prevent the attack publicised by
-+    CRIME. The other options are turned off.
- 
-     Note: Availability of above options depends on the version of the SSL
-     backend in use.
-diff --git a/src/network/ssl/qsslconfiguration.cpp b/src/network/ssl/qsslconfiguration.cpp
-index 24c7b77..3a05f54 100644
---- a/src/network/ssl/qsslconfiguration.cpp
-+++ b/src/network/ssl/qsslconfiguration.cpp
-@@ -201,7 +201,9 @@ bool QSslConfiguration::isNull() const
-             d->privateKey.isNull() &&
-             d->peerCertificate.isNull() &&
-             d->peerCertificateChain.count() == 0 &&
--            d->sslOptions == (QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation));
-+            d->sslOptions == ( QSsl::SslOptionDisableEmptyFragments
-+                              |QSsl::SslOptionDisableLegacyRenegotiation
-+                              |QSsl::SslOptionDisableCompression));
- }
- 
- /*!
-diff --git a/src/network/ssl/qsslconfiguration_p.h b/src/network/ssl/qsslconfiguration_p.h
-index 74f17cd..c36b651 100644
---- a/src/network/ssl/qsslconfiguration_p.h
-+++ b/src/network/ssl/qsslconfiguration_p.h
-@@ -83,7 +83,9 @@ public:
-         : protocol(QSsl::SecureProtocols),
-           peerVerifyMode(QSslSocket::AutoVerifyPeer),
-           peerVerifyDepth(0),
--          sslOptions(QSsl::SslOptionDisableEmptyFragments|QSsl::SslOptionDisableLegacyRenegotiation)
-+          sslOptions(QSsl::SslOptionDisableEmptyFragments
-+                     |QSsl::SslOptionDisableLegacyRenegotiation
-+                     |QSsl::SslOptionDisableCompression)
-     { }
- 
-     QSslCertificate peerCertificate;
--- 
-1.7.10
-
diff --git a/extra/qt/fix-assistant-crash.patch b/extra/qt/fix-assistant-crash.patch
deleted file mode 100644
index 67bbbc48b..000000000
--- a/extra/qt/fix-assistant-crash.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp	2012-06-26 17:37:47.334536023 +0000
-+++ qt-everywhere-opensource-src-4.8.2/tools/assistant/tools/assistant/mainwindow.cpp~	2012-06-26 17:37:08.531487286 +0000
-@@ -944,8 +944,7 @@
-     if (helpEngine.usesAppFont())
-         font = helpEngine.appFont();
- 
--    const QWidgetList &widgets = qApp->allWidgets();
--    foreach (QWidget* widget, widgets)
-+    foreach (QWidget* widget, QApplication::allWidgets())
-         widget->setFont(font);
- }
- 
diff --git a/extra/qt/fix-qtscript-crash.patch b/extra/qt/fix-qtscript-crash.patch
deleted file mode 100644
index 97b1cc62d..000000000
--- a/extra/qt/fix-qtscript-crash.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From e6b7178bc2e62a37b4737695bced1b46bced9215 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= <jedrzej.nowacki@digia.com>
-Date: Mon, 22 Oct 2012 15:17:19 +0200
-Subject: [PATCH] Fix mmap usage.
-
-Add missing MAP_NORESERVE and fix error checking.
-
-Special thanks to Olivier JG for debugging the issue.
-
-Task-number: QTBUG-27322
-Change-Id: Ia9f4aa80415f0127318714912b524131a5b0f18a
-Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
----
- .../JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp             | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-index 16d0fb1..e1237e4 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-@@ -305,8 +305,8 @@ public:
-         randomLocation += (1 << 24);
-         randomLocation <<= 21;
- #endif
--        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
--        if (!m_base)
-+        m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON | MAP_NORESERVE, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
-+        if (m_base == MAP_FAILED)
-             CRASH();
- 
-         // For simplicity, we keep all memory in m_freeList in a 'released' state.
--- 
-1.8.0
-
diff --git a/extra/qt/qsortfilterproxymodel.patch b/extra/qt/qsortfilterproxymodel.patch
deleted file mode 100644
index 33770e47d..000000000
--- a/extra/qt/qsortfilterproxymodel.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 989e6c5ee6f3e38b24632ec5caf49c5b03d17aed Mon Sep 17 00:00:00 2001
-From: Stephen Kelly <stephen.kelly@kdab.com>
-Date: Fri, 14 Sep 2012 15:42:34 +0200
-Subject: [PATCH] Fix crash when invalidating a QSortFilterProxyModel
-
-Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase.
-
-Task-number: QTBUG-27122
-Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8
-Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
----
- src/gui/itemviews/qsortfilterproxymodel.cpp        | 28 +++++++---
- .../tst_qsortfilterproxymodel.cpp                  | 61 ++++++++++++++++++++++
- 2 files changed, 83 insertions(+), 6 deletions(-)
-
-diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp
-index d937b63..9fe224e 100644
---- a/src/gui/itemviews/qsortfilterproxymodel.cpp
-+++ b/src/gui/itemviews/qsortfilterproxymodel.cpp
-@@ -1036,18 +1036,34 @@ void QSortFilterProxyModelPrivate::filter_changed(const QModelIndex &source_pare
-     Mapping *m = it.value();
-     QSet<int> rows_removed = handle_filter_changed(m->proxy_rows, m->source_rows, source_parent, Qt::Vertical);
-     QSet<int> columns_removed = handle_filter_changed(m->proxy_columns, m->source_columns, source_parent, Qt::Horizontal);
--    QVector<QModelIndex> mappedChildren = m->mapped_children;
--    QVector<QModelIndex>::iterator it2 = mappedChildren.end();
--    while (it2 != mappedChildren.begin()) {
--        --it2;
--        const QModelIndex source_child_index = *it2;
-+
-+    // We need to iterate over a copy of m->mapped_children because otherwise it may be changed by other code, invalidating
-+    // the iterator it2.
-+    // The m->mapped_children vector can be appended to with indexes which are no longer filtered
-+    // out (in create_mapping) when this function recurses for child indexes.
-+    const QVector<QModelIndex> mappedChildren = m->mapped_children;
-+    QVector<int> indexesToRemove;
-+    for (int i = 0; i < mappedChildren.size(); ++i) {
-+        const QModelIndex source_child_index = mappedChildren.at(i);
-         if (rows_removed.contains(source_child_index.row()) || columns_removed.contains(source_child_index.column())) {
--            it2 = mappedChildren.erase(it2);
-+            indexesToRemove.push_back(i);
-             remove_from_mapping(source_child_index);
-         } else {
-             filter_changed(source_child_index);
-         }
-     }
-+    QVector<int>::const_iterator removeIt = indexesToRemove.constEnd();
-+    const QVector<int>::const_iterator removeBegin = indexesToRemove.constBegin();
-+
-+    // We can't just remove these items from mappedChildren while iterating above and then
-+    // do something like m->mapped_children = mappedChildren, because mapped_children might
-+    // be appended to in create_mapping, and we would lose those new items.
-+    // Because they are always appended in create_mapping, we can still remove them by
-+    // position here.
-+    while (removeIt != removeBegin) {
-+        --removeIt;
-+        m->mapped_children.remove(*removeIt);
-+    }
- }
- 
- /*!
--- 
-1.8.0
-
diff --git a/extra/qt/undo-fix-jit-crash-on-x86_64.patch b/extra/qt/undo-fix-jit-crash-on-x86_64.patch
deleted file mode 100644
index ac86a846b..000000000
--- a/extra/qt/undo-fix-jit-crash-on-x86_64.patch
+++ /dev/null
@@ -1,280 +0,0 @@
-Description: Fix JIT crash on x86-64 (avoid 32-bit branch offset overflow)
- .
- Cherry-picked from webkit commit
- a5b3261a8c4386b4e14ce40a34c7fc933a5f7001
-Origin: commit ada98493bbfbd9af0d0b593017e29d39bcd3495e
-Author: Kent Hansen <kent.hansen@nokia.com>
-Forwarded: not-needed
-Applied-Upstream: yes
-Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
-Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
----
- .../javascriptcore/JavaScriptCore/ChangeLog        |   27 +++++++++++++++++
- .../JavaScriptCore/JavaScriptCore.pri              |    1 +
- .../JavaScriptCore/jit/ExecutableAllocator.cpp     |   21 +++++++++++++
- .../jit/ExecutableAllocatorFixedVMPool.cpp         |   31 +++++++++++++-------
- .../jit/ExecutableAllocatorPosix.cpp               |   29 ++----------------
- .../jit/ExecutableAllocatorSymbian.cpp             |    2 +-
- .../JavaScriptCore/jit/ExecutableAllocatorWin.cpp  |    2 +-
- .../javascriptcore/JavaScriptCore/wtf/Platform.h   |   10 +++++++
- 8 files changed, 84 insertions(+), 39 deletions(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-index 9cbf0c1..5ab23e6 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/ChangeLog
-@@ -1,3 +1,30 @@
-+2010-07-08  Gavin Barraclough  <barraclough@apple.com>
-+
-+        Reviewed by Sam Weinig.
-+
-+        https://bugs.webkit.org/show_bug.cgi?id=41641
-+
-+        Update compile flags to allow use of ExecutableAllocatorFixedVMPool on platforms
-+        other than x86-64 (this may be useful on 32-bit platforms, too).
-+
-+        Simplify ifdefs by dividing into thwo broad allocation strategies
-+        (ENABLE_EXECUTABLE_ALLOCATOR_FIXED & ENABLE_EXECUTABLE_ALLOCATOR_DEMAND).
-+
-+        Rename constant used in the code to have names descriptive of their purpose,
-+        rather than their specific value on a given platform.
-+
-+        * jit/ExecutableAllocator.cpp:
-+        (JSC::ExecutableAllocator::reprotectRegion):
-+        (JSC::ExecutableAllocator::cacheFlush):
-+        * jit/ExecutableAllocatorFixedVMPool.cpp:
-+        (JSC::FixedVMPoolAllocator::FixedVMPoolAllocator):
-+        (JSC::FixedVMPoolAllocator::free):
-+        (JSC::ExecutablePool::systemAlloc):
-+        * jit/ExecutableAllocatorPosix.cpp:
-+        * jit/ExecutableAllocatorSymbian.cpp:
-+        * jit/ExecutableAllocatorWin.cpp:
-+        * wtf/Platform.h:
-+
- 2010-08-24  Oliver Hunt  <oliver@apple.com>
- 
-         Reviewed by Geoff Garen.
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-index b061321..847f69c 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/JavaScriptCore.pri
-@@ -100,6 +100,7 @@ SOURCES += \
-     interpreter/CallFrame.cpp \
-     interpreter/Interpreter.cpp \
-     interpreter/RegisterFile.cpp \
-+    jit/ExecutableAllocatorFixedVMPool.cpp \
-     jit/ExecutableAllocatorPosix.cpp \
-     jit/ExecutableAllocatorSymbian.cpp \
-     jit/ExecutableAllocatorWin.cpp \
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
-index f6b27ec..f0ebbab 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocator.cpp
-@@ -33,6 +33,27 @@ namespace JSC {
- 
- size_t ExecutableAllocator::pageSize = 0;
- 
-+#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
-+void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
-+{
-+    if (!pageSize)
-+        intializePageSize();
-+
-+    // Calculate the start of the page containing this region,
-+    // and account for this extra memory within size.
-+    intptr_t startPtr = reinterpret_cast<intptr_t>(start);
-+    intptr_t pageStartPtr = startPtr & ~(pageSize - 1);
-+    void* pageStart = reinterpret_cast<void*>(pageStartPtr);
-+    size += (startPtr - pageStartPtr);
-+
-+    // Round size up
-+    size += (pageSize - 1);
-+    size &= ~(pageSize - 1);
-+
-+    mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX);
-+}
-+#endif
-+
- }
- 
- #endif // HAVE(ASSEMBLER)
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-index dd1db4e..16d0fb1 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorFixedVMPool.cpp
-@@ -27,25 +27,33 @@
- 
- #include "ExecutableAllocator.h"
- 
--#include <errno.h>
-+#if ENABLE(EXECUTABLE_ALLOCATOR_FIXED)
- 
--#if ENABLE(ASSEMBLER) && OS(DARWIN) && CPU(X86_64)
-+#include <errno.h>
- 
- #include "TCSpinLock.h"
--#include <mach/mach_init.h>
--#include <mach/vm_map.h>
- #include <sys/mman.h>
- #include <unistd.h>
- #include <wtf/AVLTree.h>
- #include <wtf/VMTags.h>
- 
-+#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).
-+    #define VM_POOL_SIZE (2u * 1024u * 1024u * 1024u) // 2Gb
-+    #define COALESCE_LIMIT (16u * 1024u * 1024u) // 16Mb
-+#else
-+    // These limits are hopefully sensible on embedded platforms.
-+    #define VM_POOL_SIZE (32u * 1024u * 1024u) // 32Mb
-+    #define COALESCE_LIMIT (4u * 1024u * 1024u) // 4Mb
-+#endif
-+
-+// ASLR currently only works on darwin (due to arc4random) & 64-bit (due to address space size).
-+#define VM_POOL_ASLR (OS(DARWIN) && CPU(X86_64))
-+
- using namespace WTF;
- 
- namespace JSC {
- 
--#define TWO_GB (2u * 1024u * 1024u * 1024u)
--#define SIXTEEN_MB (16u * 1024u * 1024u)
--
- // FreeListEntry describes a free chunk of memory, stored in the freeList.
- struct FreeListEntry {
-     FreeListEntry(void* pointer, size_t size)
-@@ -291,9 +299,12 @@ public:
-         // for now instead of 2^26 bits of ASLR lets stick with 25 bits of randomization plus
-         // 2^24, which should put up somewhere in the middle of usespace (in the address range
-         // 0x200000000000 .. 0x5fffffffffff).
--        intptr_t randomLocation = arc4random() & ((1 << 25) - 1);
-+        intptr_t randomLocation = 0;
-+#if VM_POOL_ASLR
-+        randomLocation = arc4random() & ((1 << 25) - 1);
-         randomLocation += (1 << 24);
-         randomLocation <<= 21;
-+#endif
-         m_base = mmap(reinterpret_cast<void*>(randomLocation), m_totalHeapSize, INITIAL_PROTECTION_FLAGS, MAP_PRIVATE | MAP_ANON, VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY, 0);
-         if (!m_base)
-             CRASH();
-@@ -387,7 +398,7 @@ public:
-         // 16MB of allocations have been freed, sweep m_freeList
-         // coalescing any neighboring fragments.
-         m_countFreedSinceLastCoalesce += size;
--        if (m_countFreedSinceLastCoalesce >= SIXTEEN_MB) {
-+        if (m_countFreedSinceLastCoalesce >= COALESCE_LIMIT) {
-             m_countFreedSinceLastCoalesce = 0;
-             coalesceFreeSpace();
-         }
-@@ -429,7 +440,7 @@ ExecutablePool::Allocation ExecutablePool::systemAlloc(size_t size)
-   SpinLockHolder lock_holder(&spinlock);
- 
-     if (!allocator)
--        allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, TWO_GB);
-+        allocator = new FixedVMPoolAllocator(JIT_ALLOCATOR_LARGE_ALLOC_SIZE, VM_POOL_SIZE);
-     ExecutablePool::Allocation alloc = {reinterpret_cast<char*>(allocator->alloc(size)), size};
-     return alloc;
- }
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp
-index 2eb0c87..b04049c 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorPosix.cpp
-@@ -27,7 +27,7 @@
- 
- #include "ExecutableAllocator.h"
- 
--#if ENABLE(ASSEMBLER) && OS(UNIX) && !OS(SYMBIAN)
-+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && !OS(WINDOWS) && !OS(SYMBIAN)
- 
- #include <sys/mman.h>
- #include <unistd.h>
-@@ -35,8 +35,6 @@
- 
- namespace JSC {
- 
--#if !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64))
--
- void ExecutableAllocator::intializePageSize()
- {
-     ExecutableAllocator::pageSize = getpagesize();
-@@ -57,29 +55,6 @@ void ExecutablePool::systemRelease(const ExecutablePool::Allocation& alloc)
-     ASSERT_UNUSED(result, !result);
- }
- 
--#endif // !(OS(DARWIN) && !PLATFORM(QT) && CPU(X86_64))
--
--#if ENABLE(ASSEMBLER_WX_EXCLUSIVE)
--void ExecutableAllocator::reprotectRegion(void* start, size_t size, ProtectionSeting setting)
--{
--    if (!pageSize)
--        intializePageSize();
--
--    // Calculate the start of the page containing this region,
--    // and account for this extra memory within size.
--    intptr_t startPtr = reinterpret_cast<intptr_t>(start);
--    intptr_t pageStartPtr = startPtr & ~(pageSize - 1);
--    void* pageStart = reinterpret_cast<void*>(pageStartPtr);
--    size += (startPtr - pageStartPtr);
--
--    // Round size up
--    size += (pageSize - 1);
--    size &= ~(pageSize - 1);
--
--    mprotect(pageStart, size, (setting == Writable) ? PROTECTION_FLAGS_RW : PROTECTION_FLAGS_RX);
--}
--#endif
--
- }
- 
--#endif // HAVE(ASSEMBLER)
-+#endif
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp
-index e82975c..9028f50 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorSymbian.cpp
-@@ -22,7 +22,7 @@
- 
- #include "ExecutableAllocator.h"
- 
--#if ENABLE(ASSEMBLER) && OS(SYMBIAN)
-+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(SYMBIAN)
- 
- #include <e32hal.h>
- #include <e32std.h>
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp
-index e38323c..72a1d5f 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/jit/ExecutableAllocatorWin.cpp
-@@ -27,7 +27,7 @@
- 
- #include "ExecutableAllocator.h"
- 
--#if ENABLE(ASSEMBLER) && OS(WINDOWS)
-+#if ENABLE(EXECUTABLE_ALLOCATOR_DEMAND) && OS(WINDOWS)
- 
- #include "windows.h"
- 
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-index 700977e..d930ed7 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h
-@@ -1016,6 +1016,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
--- 
-1.7.10.4
-