Title: [131269] trunk/Source/_javascript_Core
- Revision
- 131269
- Author
- [email protected]
- Date
- 2012-10-14 12:58:26 -0700 (Sun, 14 Oct 2012)
Log Message
Fix the build of universal binary with ARMv7s of _javascript_Core
* llint/LLIntOfflineAsmConfig.h:
* llint/LowLevelInterpreter.asm:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (131268 => 131269)
--- trunk/Source/_javascript_Core/ChangeLog 2012-10-14 19:42:17 UTC (rev 131268)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-10-14 19:58:26 UTC (rev 131269)
@@ -1,3 +1,10 @@
+2012-10-14 Filip Pizlo <[email protected]>
+
+ Fix the build of universal binary with ARMv7s of _javascript_Core
+
+ * llint/LLIntOfflineAsmConfig.h:
+ * llint/LowLevelInterpreter.asm:
+
2012-10-13 Filip Pizlo <[email protected]>
Array length array profiling is broken in the baseline JIT
Modified: trunk/Source/_javascript_Core/llint/LLIntOfflineAsmConfig.h (131268 => 131269)
--- trunk/Source/_javascript_Core/llint/LLIntOfflineAsmConfig.h 2012-10-14 19:42:17 UTC (rev 131268)
+++ trunk/Source/_javascript_Core/llint/LLIntOfflineAsmConfig.h 2012-10-14 19:58:26 UTC (rev 131269)
@@ -37,6 +37,7 @@
#define OFFLINE_ASM_X86 0
#define OFFLINE_ASM_ARMv7 0
#define OFFLINE_ASM_X86_64 0
+#define OFFLINE_ASM_ARMv7s 0
#else // !ENABLE(LLINT_C_LOOP)
@@ -48,6 +49,12 @@
#define OFFLINE_ASM_X86 0
#endif
+#ifdef __ARM_ARCH_7S__
+#define OFFLINE_ASM_ARMv7s 1
+#else
+#define OFFLINE_ASM_ARMv7s 0
+#endif
+
#if CPU(ARM_THUMB2)
#define OFFLINE_ASM_ARMv7 1
#else
Modified: trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm (131268 => 131269)
--- trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2012-10-14 19:42:17 UTC (rev 131268)
+++ trunk/Source/_javascript_Core/llint/LowLevelInterpreter.asm 2012-10-14 19:58:26 UTC (rev 131269)
@@ -24,6 +24,12 @@
# First come the common protocols that both interpreters use. Note that each
# of these must have an ASSERT() in LLIntData.cpp
+# Work-around for the fact that the toolchain's awareness of armv7s results in
+# a separate slab in the fat binary, yet the offlineasm doesn't know to expect
+# it.
+if ARMv7s
+end
+
# These declarations must match interpreter/JSStack.h.
const CallFrameHeaderSize = 48
const ArgumentCount = -48
@@ -907,3 +913,4 @@
# Indicate the end of LLInt.
_llint_end:
crash()
+
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
