Title: [153334] trunk/Source/_javascript_Core

Diff

Modified: trunk/Source/_javascript_Core/API/APICallbackFunction.h (153333 => 153334)


--- trunk/Source/_javascript_Core/API/APICallbackFunction.h	2013-07-25 17:10:34 UTC (rev 153333)
+++ trunk/Source/_javascript_Core/API/APICallbackFunction.h	2013-07-25 17:10:51 UTC (rev 153334)
@@ -40,7 +40,7 @@
 };
 
 template <typename T>
-EncodedJSValue APICallbackFunction::call(ExecState* exec)
+EncodedJSValue JSC_HOST_CALL APICallbackFunction::call(ExecState* exec)
 {
     JSContextRef execRef = toRef(exec);
     JSObjectRef functionRef = toRef(exec->callee());

Modified: trunk/Source/_javascript_Core/ChangeLog (153333 => 153334)


--- trunk/Source/_javascript_Core/ChangeLog	2013-07-25 17:10:34 UTC (rev 153333)
+++ trunk/Source/_javascript_Core/ChangeLog	2013-07-25 17:10:51 UTC (rev 153334)
@@ -1,3 +1,14 @@
+2013-07-25  Oliver Hunt  <[email protected]>
+
+        More 32bit build fixes
+
+        - Apparnetly some compilers don't track the fastcall directive everywhere we expect
+
+        * API/APICallbackFunction.h:
+        (JSC::APICallbackFunction::call):
+        * bytecode/CodeBlock.cpp:
+        * runtime/Structure.cpp:
+
 2013-07-25  Yi Shen  <[email protected]>
 
         Optimize the thread locks for API Shims

Modified: trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp (153333 => 153334)


--- trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp	2013-07-25 17:10:34 UTC (rev 153333)
+++ trunk/Source/_javascript_Core/bytecode/CodeBlock.cpp	2013-07-25 17:10:51 UTC (rev 153334)
@@ -2873,7 +2873,7 @@
 #endif
 }
 
-#if ENABLE(DFG_JIT)
+#if ENABLE(JIT)
 unsigned CodeBlock::reoptimizationRetryCounter() const
 {
     ASSERT(m_reoptimizationRetryCounter <= Options::reoptimizationRetryCounterMax());

Modified: trunk/Source/_javascript_Core/runtime/Structure.cpp (153333 => 153334)


--- trunk/Source/_javascript_Core/runtime/Structure.cpp	2013-07-25 17:10:34 UTC (rev 153333)
+++ trunk/Source/_javascript_Core/runtime/Structure.cpp	2013-07-25 17:10:51 UTC (rev 153334)
@@ -27,6 +27,7 @@
 #include "Structure.h"
 
 #include "CodeBlock.h"
+#include "DumpContext.h"
 #include "JSObject.h"
 #include "JSPropertyNameIterator.h"
 #include "Lookup.h"
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to