<https://webkit.org/b/120008> [GTK][ARM] javascriptcore compilation is broken

Patch by Víctor Manuel Jáquez Leal <vjaquez@igalia.com> on 2013-08-19
Reviewed by Oliver Hunt.

Guard the compilation of these files only if DFG_JIT is enabled.

* dfg/DFGDesiredTransitions.cpp:
* dfg/DFGDesiredTransitions.h:
* dfg/DFGDesiredWeakReferences.cpp:
* dfg/DFGDesiredWeakReferences.h:
* dfg/DFGDesiredWriteBarriers.cpp:
* dfg/DFGDesiredWriteBarriers.h:

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

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 96901cc8ac3e1a76766e39084d5905527d66188f..2ebc7fe3189ba9d28d92894a59b8b2a6c738645a 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2013-08-19  Víctor Manuel Jáquez Leal  <vjaquez@igalia.com>
+
+        <https://webkit.org/b/120008> [GTK][ARM] javascriptcore compilation is broken
+
+        Reviewed by Oliver Hunt.
+
+        Guard the compilation of these files only if DFG_JIT is enabled.
+
+        * dfg/DFGDesiredTransitions.cpp:
+        * dfg/DFGDesiredTransitions.h:
+        * dfg/DFGDesiredWeakReferences.cpp:
+        * dfg/DFGDesiredWeakReferences.h:
+        * dfg/DFGDesiredWriteBarriers.cpp:
+        * dfg/DFGDesiredWriteBarriers.h:
+
 2013-08-17  Filip Pizlo  <fpizlo@apple.com>
 
         REGRESSION(r154218): DFG::FixupPhase no longer turns GetById's child1 into CellUse

diff --git a/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp b/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp
index b0e05839c7776e0edd4021c06677cd55e6eb23ca..0cfa00f6f9ddd8558b0196fe702521712cea831d 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDesiredTransitions.cpp
@@ -24,6 +24,9 @@
  */
 
 #include "config.h"
+
+#if ENABLE(DFG_JIT)
+
 #include "DFGDesiredTransitions.h"
 
 #include "CodeBlock.h"
@@ -68,3 +71,5 @@ void DesiredTransitions::reallyAdd(VM& vm, CommonData* common)
 }
 
 } } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)

diff --git a/Source/JavaScriptCore/dfg/DFGDesiredTransitions.h b/Source/JavaScriptCore/dfg/DFGDesiredTransitions.h
index acfa0f1271f7b4ee7751fbfbd222fe7f5add9404..246a81062b0c91ad6e83875f75a6a30062560921 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGDesiredTransitions.h
+++ b/Source/JavaScriptCore/dfg/DFGDesiredTransitions.h
@@ -28,6 +28,8 @@
 
 #include <wtf/Vector.h>
 
+#if ENABLE(DFG_JIT)
+
 namespace JSC { 
 
 class CodeBlock;
@@ -66,4 +68,6 @@ private:
 
 } } // namespace JSC::DFG
 
+#endif // ENABLE(DFG_JIT)
+
 #endif // DFGDesiredTransitions_h

diff --git a/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.cpp b/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.cpp
index a6f0ceddeec02d3c9b9bba1fb20b97558f7a925e..a8376ea8a749e45e668497531f59a4ff0baacd2a 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.cpp
@@ -24,6 +24,9 @@
  */
 
 #include "config.h"
+
+#if ENABLE(DFG_JIT)
+
 #include "DFGDesiredWeakReferences.h"
 
 #include "CodeBlock.h"
@@ -54,3 +57,5 @@ void DesiredWeakReferences::reallyAdd(VM& vm, CommonData* common)
 }
 
 } } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)

diff --git a/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.h b/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.h
index cecdecb56269a77eaead3cb9b531a87e8b8c99bd..981e752eaab1c5bc9e150491dfd971f428a1964a 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.h
+++ b/Source/JavaScriptCore/dfg/DFGDesiredWeakReferences.h
@@ -28,6 +28,8 @@
 
 #include <wtf/Vector.h>
 
+#if ENABLE(DFG_JIT)
+
 namespace JSC { 
 
 class CodeBlock;
@@ -53,4 +55,6 @@ private:
 
 } } // namespace JSC::DFG
 
+#endif // ENABLE(DFG_JIT)
+
 #endif // DFGDesiredWeakReferences_h

diff --git a/Source/JavaScriptCore/dfg/DFGDesiredWriteBarriers.cpp b/Source/JavaScriptCore/dfg/DFGDesiredWriteBarriers.cpp
index 2ac35a2c31c15f0f9e9ba7621d87ffd04fdf7f18..6d289ea3889c14cef14b3346dbf79f7edad0374b 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGDesiredWriteBarriers.cpp
+++ b/Source/JavaScriptCore/dfg/DFGDesiredWriteBarriers.cpp
@@ -24,6 +24,9 @@
  */
 
 #include "config.h"
+
+#if ENABLE(DFG_JIT)
+
 #include "DFGDesiredWriteBarriers.h"
 
 #include "CodeBlock.h"
@@ -93,3 +96,5 @@ void initializeLazyWriteBarrierForConstant(CodeBlock* codeBlock, DesiredWriteBar
 }
 
 } } // namespace JSC::DFG
+
+#endif // ENABLE(DFG_JIT)

diff --git a/Source/JavaScriptCore/dfg/DFGDesiredWriteBarriers.h b/Source/JavaScriptCore/dfg/DFGDesiredWriteBarriers.h
index e1ff2c0b442e3dfaeb8a348116f13e28d74afdf3..7c29182efddc7679d01dbd3ae780e5c700cb8049 100644 (file)
--- a/Source/JavaScriptCore/dfg/DFGDesiredWriteBarriers.h
+++ b/Source/JavaScriptCore/dfg/DFGDesiredWriteBarriers.h
@@ -29,6 +29,8 @@
 #include "WriteBarrier.h"
 #include <wtf/Vector.h>
 
+#if ENABLE(DFG_JIT)
+
 namespace JSC {
 
 class VM;
@@ -90,4 +92,6 @@ void initializeLazyWriteBarrierForConstant(CodeBlock*, DesiredWriteBarriers&, JS
 
 } } // namespace JSC::DFG
 
+#endif // ENABLE(DFG_JIT)
+
 #endif // DFGDesiredWriteBarriers_h