[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

jocelyn.turcotte at nokia.com jocelyn.turcotte at nokia.com
Wed Dec 22 13:11:33 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 92f9783fd210332c9d42988adfd8152d6a62c392
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 16:52:44 2010 +0000

    2010-09-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
    
            Reviewed by Andreas Kling.
    
            Re-Disable JIT for MSVC 64bit to fix the build on this compiler.
            https://bugs.webkit.org/show_bug.cgi?id=45382
    
            It was enabled in the cleanup made in r64176, though it is still
            not implemented.
    
            * wtf/Platform.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66991 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 9ca5b8c..77446f7 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-08  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Andreas Kling.
+
+        Re-Disable JIT for MSVC 64bit to fix the build on this compiler.
+        https://bugs.webkit.org/show_bug.cgi?id=45382
+
+        It was enabled in the cleanup made in r64176, though it is still
+        not implemented.
+
+        * wtf/Platform.h:
+
 2010-09-08  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Xan Lopez.
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 0d971b4..a8b0504 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -948,6 +948,11 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */
 #define ENABLE_JIT 0
 #endif
 
+/* JIT is not implemented for 64 bit on MSVC */
+#if !defined(ENABLE_JIT) && COMPILER(MSVC) && CPU(X86_64)
+#define ENABLE_JIT 0
+#endif
+
 /* The JIT is enabled by default on all x86, x64-64, ARM & MIPS platforms. */
 #if !defined(ENABLE_JIT) \
     && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(MIPS)) \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list