Title: [197878] trunk/Source
- Revision
- 197878
- Author
- [email protected]
- Date
- 2016-03-09 13:15:00 -0800 (Wed, 09 Mar 2016)
Log Message
Fix old iOS
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (197877 => 197878)
--- trunk/Source/_javascript_Core/ChangeLog 2016-03-09 21:13:51 UTC (rev 197877)
+++ trunk/Source/_javascript_Core/ChangeLog 2016-03-09 21:15:00 UTC (rev 197878)
@@ -1,5 +1,12 @@
2016-03-09 Oliver Hunt <[email protected]>
+ Fix old iOS
+
+ * jit/ExecutableAllocatorFixedVMPool.cpp:
+ (JSC::FixedVMPoolExecutableAllocator::initializeSeparatedWXHeaps):
+
+2016-03-09 Oliver Hunt <[email protected]>
+
Wincairo buildfix
https://bugs.webkit.org/show_bug.cgi?id=155245
Modified: trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp (197877 => 197878)
--- trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2016-03-09 21:13:51 UTC (rev 197877)
+++ trunk/Source/_javascript_Core/jit/ExecutableAllocatorFixedVMPool.cpp 2016-03-09 21:15:00 UTC (rev 197878)
@@ -181,7 +181,7 @@
bool remapSucceeded = (ret == KERN_SUCCESS);
if (!remapSucceeded)
- writableAddr = (mach_vm_address_t)jitBase;
+ return;
// Assemble a thunk that will serve as the means for writing into the JIT region.
MacroAssemblerCodeRef writeThunk = jitWriteThunkGenerator(writableAddr, stubBase, stubSize);
Modified: trunk/Source/WTF/ChangeLog (197877 => 197878)
--- trunk/Source/WTF/ChangeLog 2016-03-09 21:13:51 UTC (rev 197877)
+++ trunk/Source/WTF/ChangeLog 2016-03-09 21:15:00 UTC (rev 197878)
@@ -1,3 +1,9 @@
+2016-03-09 Oliver Hunt <[email protected]>
+
+ Fix old iOS
+
+ * wtf/Platform.h:
+
2016-03-08 Filip Pizlo <[email protected]>
Remove failing assertion. There are strings that claim to be atomic but that the
Modified: trunk/Source/WTF/wtf/Platform.h (197877 => 197878)
--- trunk/Source/WTF/wtf/Platform.h 2016-03-09 21:13:51 UTC (rev 197877)
+++ trunk/Source/WTF/wtf/Platform.h 2016-03-09 21:15:00 UTC (rev 197878)
@@ -1138,8 +1138,10 @@
#define USE_OS_LOG 1
#endif
-#if !CPU(ARM64) && defined(ENABLE_SEPARATED_WX_HEAP)
+#if defined(ENABLE_SEPARATED_WX_HEAP)
+#if !(CPU(ARM64) && ((PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 100000)))
#undef ENABLE_SEPARATED_WX_HEAP
#endif
+#endif
#endif /* WTF_Platform_h */
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
