Modified: trunk/Source/_javascript_Core/ChangeLog (134050 => 134051)
--- trunk/Source/_javascript_Core/ChangeLog 2012-11-09 12:28:58 UTC (rev 134050)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-11-09 12:41:27 UTC (rev 134051)
@@ -1,3 +1,16 @@
+2012-11-09 Gabor Ballabas <gab...@inf.u-szeged.hu>
+
+ [Qt] r133953 broke the ARM_TRADITIONAL build
+ https://bugs.webkit.org/show_bug.cgi?id=101706
+
+ Reviewed by Csaba Osztrogonác.
+
+ Fix the ARM_TRADITIONAL build after r133953
+
+ * dfg/DFGCCallHelpers.h:
+ (JSC::DFG::CCallHelpers::setupArgumentsWithExecState):
+ (CCallHelpers):
+
2012-11-09 Csaba Osztrogonác <o...@webkit.org>
[Qt] Fix the LLINT build from ARMv7 platform
Modified: trunk/Source/_javascript_Core/dfg/DFGCCallHelpers.h (134050 => 134051)
--- trunk/Source/_javascript_Core/dfg/DFGCCallHelpers.h 2012-11-09 12:28:58 UTC (rev 134050)
+++ trunk/Source/_javascript_Core/dfg/DFGCCallHelpers.h 2012-11-09 12:41:27 UTC (rev 134051)
@@ -857,6 +857,12 @@
setupArgumentsWithExecState(arg1, arg2, arg3);
}
+ ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4)
+ {
+ poke(arg4);
+ setupArgumentsWithExecState(arg1, arg2, arg3);
+ }
+
ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, GPRReg arg5)
{
poke(arg5, 1);
@@ -864,6 +870,13 @@
setupArgumentsWithExecState(arg1, arg2, arg3);
}
+ ALWAYS_INLINE void setupArgumentsWithExecState(GPRReg arg1, GPRReg arg2, TrustedImm32 arg3, GPRReg arg4, TrustedImm32 arg5)
+ {
+ poke(arg5, 1);
+ poke(arg4);
+ setupArgumentsWithExecState(arg1, arg2, arg3);
+ }
+
ALWAYS_INLINE void setupArgumentsWithExecState(TrustedImm32 arg1, GPRReg arg2, GPRReg arg3, GPRReg arg4, TrustedImmPtr arg5)
{
poke(arg5, 1);
