[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dbates at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit 7e7c18747028e7a597a518eff10892b897fff58b
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 18 22:53:41 2011 +0000

    2011-01-18  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Gavin Barraclough.
    
            Only use moving memory model assumption in ExecutableAllocator::intializePageSize() for Symbian OS
            https://bugs.webkit.org/show_bug.cgi?id=52517
    
            Patch by David Tapuska
    
            Currently, we compile code with respect to the Symbian-specific moving memory model
            assumption for all ARMv5 or lower architectures. Instead, we should only compile
            such code when building for Symbian OS on those architectures because this model
            is Symbian-specific.
    
            * jit/ExecutableAllocator.cpp:
            (JSC::ExecutableAllocator::intializePageSize):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76068 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 56715e1..3e53e96 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,20 @@
+2011-01-18  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Gavin Barraclough.
+
+        Only use moving memory model assumption in ExecutableAllocator::intializePageSize() for Symbian OS
+        https://bugs.webkit.org/show_bug.cgi?id=52517
+
+        Patch by David Tapuska
+
+        Currently, we compile code with respect to the Symbian-specific moving memory model
+        assumption for all ARMv5 or lower architectures. Instead, we should only compile
+        such code when building for Symbian OS on those architectures because this model
+        is Symbian-specific.
+
+        * jit/ExecutableAllocator.cpp:
+        (JSC::ExecutableAllocator::intializePageSize):
+
 2011-01-18  Dimitry Andric  <dim at freebsd.org>
 
         Reviewed by Andreas Kling.
diff --git a/Source/JavaScriptCore/jit/ExecutableAllocator.cpp b/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
index 4530b38..fa6db83 100644
--- a/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
+++ b/Source/JavaScriptCore/jit/ExecutableAllocator.cpp
@@ -37,7 +37,7 @@ size_t ExecutableAllocator::pageSize = 0;
 
 void ExecutableAllocator::intializePageSize()
 {
-#if CPU(ARMV5_OR_LOWER)
+#if OS(SYMBIAN) && CPU(ARMV5_OR_LOWER)
     // The moving memory model (as used in ARMv5 and earlier platforms)
     // on Symbian OS limits the number of chunks for each process to 16. 
     // To mitigate this limitation increase the pagesize to allocate

-- 
WebKit Debian packaging