2010-06-17 Shu Chang <chang.shu@nokia.com>
authorchang.shu@nokia.com <chang.shu@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jun 2010 17:46:41 +0000 (17:46 +0000)
committerchang.shu@nokia.com <chang.shu@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 17 Jun 2010 17:46:41 +0000 (17:46 +0000)
        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Fix the link error on symbian with ENABLE_JIT=0.
        1. Add "#if ENABLE(JIT)" in the header file;
        2. Put feature enable/disable logic to a common.pri so
        that both JavaScriptCore.pri and WebCore.pri can share.

        https://bugs.webkit.org/show_bug.cgi?id=40780

        * JavaScriptCore.pri:
        * jit/ExecutableAllocator.h:

2010-06-17  Shu Chang  <chang.shu@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Fix the link error on symbian with ENABLE_JIT=0.
        1. Add "#if ENABLE(JIT)" in the header file;
        2. Put feature enable/disable logic to a common.pri so
        that both JavaScriptCore.pri and WebCore.pri can share.

        https://bugs.webkit.org/show_bug.cgi?id=40780

        * common.pri: Added.

2010-06-17  Shu Chang  <chang.shu@nokia.com>

        Reviewed by Kenneth Rohde Christiansen.

        [Qt] Fix the link error on symbian with ENABLE_JIT=0.
        1. Add "#if ENABLE(JIT)" in the header file;
        2. Put feature enable/disable logic to a common.pri so
        that both JavaScriptCore.pri and WebCore.pri can share.

        https://bugs.webkit.org/show_bug.cgi?id=40780

        * WebCore.pri:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@61338 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
JavaScriptCore/ChangeLog
JavaScriptCore/JavaScriptCore.pri
JavaScriptCore/jit/ExecutableAllocator.h
WebCore/ChangeLog
WebCore/WebCore.pri
common.pri [new file with mode: 0644]

index 27b20131de3535dd053207b9a9896c4cd6c72bf8..be0b9f4829e964ba25bedcae00bc7d9d305394b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2010-06-17  Shu Chang  <chang.shu@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix the link error on symbian with ENABLE_JIT=0.
+        1. Add "#if ENABLE(JIT)" in the header file;
+        2. Put feature enable/disable logic to a common.pri so
+        that both JavaScriptCore.pri and WebCore.pri can share.
+
+        https://bugs.webkit.org/show_bug.cgi?id=40780
+
+        * common.pri: Added.
+
 2010-06-17  Alexis Menard  <alexis.menard@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
index b12a1a3777964b673b60bd13521e4f9e14a3f1ea..756358f6bb1fa7d11ac541d8a5ddecb5e61d181f 100644 (file)
@@ -1,3 +1,17 @@
+2010-06-17  Shu Chang  <chang.shu@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix the link error on symbian with ENABLE_JIT=0.
+        1. Add "#if ENABLE(JIT)" in the header file;
+        2. Put feature enable/disable logic to a common.pri so
+        that both JavaScriptCore.pri and WebCore.pri can share.
+
+        https://bugs.webkit.org/show_bug.cgi?id=40780
+
+        * JavaScriptCore.pri:
+        * jit/ExecutableAllocator.h:
+
 2010-06-17  Darin Adler  <darin@apple.com>
 
         Reviewed by Sam Weinig.
index 09dba2f3781c1f37184f0a6ead91541e3c3615da..cacbaf25bc4eb890df7dc96c64d70a804a15c86d 100644 (file)
@@ -1,4 +1,7 @@
 # JavaScriptCore - Qt4 build info
+
+include(../common.pri)
+
 VPATH += $$PWD
 !CONFIG(release, debug|release) {
     # Output in JavaScriptCore/<config>
@@ -51,9 +54,6 @@ win32-*: DEFINES += _HAS_TR1=0
 
 DEFINES += BUILDING_QT__ BUILDING_JavaScriptCore BUILDING_WTF
 
-contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
-contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
-
 wince* {
     INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/ce-compat
     DEFINES += WINCEBASIC
index 610b7888af76557e78ec48098d888e2eef69212d..9b6d6eaf13fa6215cf8ef605f8b1f23a0570525b 100644 (file)
@@ -26,6 +26,8 @@
 #ifndef ExecutableAllocator_h
 #define ExecutableAllocator_h
 
+#if ENABLE(JIT)
+
 #include <stddef.h> // for ptrdiff_t
 #include <limits>
 #include <wtf/Assertions.h>
@@ -318,4 +320,6 @@ inline void* ExecutablePool::poolAllocate(size_t n)
 
 #endif // ENABLE(ASSEMBLER)
 
+#endif // ENABLE(JIT)
+
 #endif // !defined(ExecutableAllocator)
index 54745650f842e79bb7999dbce0c34e9d7ba5835e..c8edc0a2572e0b07af11be667e2a831bd0bd31ab 100644 (file)
@@ -1,3 +1,16 @@
+2010-06-17  Shu Chang  <chang.shu@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Fix the link error on symbian with ENABLE_JIT=0.
+        1. Add "#if ENABLE(JIT)" in the header file;
+        2. Put feature enable/disable logic to a common.pri so
+        that both JavaScriptCore.pri and WebCore.pri can share.
+
+        https://bugs.webkit.org/show_bug.cgi?id=40780
+
+        * WebCore.pri:
+
 2010-06-17  Kenneth Russell  <kbr@google.com>
 
         Reviewed by Oliver Hunt.
index f4abc27ff5638839bba9a1a8c931886af4b305e2..25c95ffcbe647669402ca51c7827a7f828a9a975 100644 (file)
@@ -1,3 +1,6 @@
+
+include(../common.pri)
+
 CONFIG(standalone_package) {
     isEmpty(WC_GENERATED_SOURCES_DIR):WC_GENERATED_SOURCES_DIR = $$PWD/generated
 } else {
diff --git a/common.pri b/common.pri
new file mode 100644 (file)
index 0000000..91a7785
--- /dev/null
@@ -0,0 +1,5 @@
+# common project include file for JavaScriptCore and WebCore
+
+contains(JAVASCRIPTCORE_JIT,yes): DEFINES+=ENABLE_JIT=1
+contains(JAVASCRIPTCORE_JIT,no): DEFINES+=ENABLE_JIT=0
+