[webkit-changes] [100175] trunk/Source/JavaScriptCore

Mon, 14 Nov 2011 12:23:48 -0800

Title: [100175] trunk/Source/_javascript_Core
Revision
100175
Author
[email protected]
Date
2011-11-14 12:23:23 -0800 (Mon, 14 Nov 2011)

Log Message

https://bugs.webkit.org/show_bug.cgi?id=72280

Rubber stamped by Geoff Garen.

Fix 32-bit Lion.

* _javascript_Core.xcodeproj/project.pbxproj:
* wtf/OSAllocatorPosix.cpp:
(WTF::OSAllocator::reserveAndCommit):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/ChangeLog (100174 => 100175)


--- trunk/Source/_javascript_Core/ChangeLog	2011-11-14 20:08:53 UTC (rev 100174)
+++ trunk/Source/_javascript_Core/ChangeLog	2011-11-14 20:23:23 UTC (rev 100175)
@@ -1,3 +1,15 @@
+2011-11-14  Gavin Barraclough  <[email protected]>
+
+        https://bugs.webkit.org/show_bug.cgi?id=72280
+
+        Rubber stamped by Geoff Garen.
+
+        Fix 32-bit Lion.
+
+        * _javascript_Core.xcodeproj/project.pbxproj:
+        * wtf/OSAllocatorPosix.cpp:
+        (WTF::OSAllocator::reserveAndCommit):
+
 2011-11-14  Geoffrey Garen  <[email protected]>
 
         32-bit Build fix: declare virtual register indices to be int rather than

Modified: trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj (100174 => 100175)


--- trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2011-11-14 20:08:53 UTC (rev 100174)
+++ trunk/Source/_javascript_Core/_javascript_Core.xcodeproj/project.pbxproj	2011-11-14 20:23:23 UTC (rev 100175)
@@ -2324,39 +2324,28 @@
 		86EC9DB31328DF44002B2AD7 /* dfg */ = {
 			isa = PBXGroup;
 			children = (
-				0F5F08CC146BE602000472A9 /* DFGByteCodeCache.h */,
-				0FC0979F146B28C700CF2442 /* DFGThunks.cpp */,
-				0FC097A0146B28C700CF2442 /* DFGThunks.h */,
-				0FC0979D146B271E00CF2442 /* DFGCorrectableJumpPoint.cpp */,
-				0FC0979A146A772000CF2442 /* DFGCorrectableJumpPoint.h */,
-				0FC0978E146A6F6300CF2442 /* DFGOSRExit.cpp */,
-				0FC0978F146A6F6300CF2442 /* DFGOSRExitCompiler.cpp */,
-				0FC09775146943AD00CF2442 /* DFGOSRExitCompiler32_64.cpp */,
-				0FC0976F14693AEF00CF2442 /* DFGOSRExitCompiler.h */,
-				0FC0977014693AEF00CF2442 /* DFGOSRExitCompiler64.cpp */,
-				0FC0977E1469EBC400CF2442 /* DFGCommon.h */,
-				0FC0976B1468AB4A00CF2442 /* DFGAssemblyHelpers.cpp */,
-				0FC0976C1468AB4A00CF2442 /* DFGAssemblyHelpers.h */,
-				0FC097681468A6EF00CF2442 /* DFGOSRExit.h */,
 				0F62016D143FCD2F0068B77C /* DFGAbstractState.cpp */,
 				0F62016E143FCD2F0068B77C /* DFGAbstractState.h */,
 				0F62016F143FCD2F0068B77C /* DFGAbstractValue.h */,
+				0FC0976B1468AB4A00CF2442 /* DFGAssemblyHelpers.cpp */,
+				0FC0976C1468AB4A00CF2442 /* DFGAssemblyHelpers.h */,
 				0F620170143FCD2F0068B77C /* DFGBasicBlock.h */,
-				0F620171143FCD2F0068B77C /* DFGOperands.h */,
-				0F620172143FCD2F0068B77C /* DFGVariableAccessData.h */,
-				0FFF4BB2143955E600655BC0 /* DFGStructureSet.h */,
+				0F5F08CC146BE602000472A9 /* DFGByteCodeCache.h */,
 				86EC9DB41328DF82002B2AD7 /* DFGByteCodeParser.cpp */,
 				86EC9DB51328DF82002B2AD7 /* DFGByteCodeParser.h */,
 				0FD82E1E14172C2F00179C94 /* DFGCapabilities.cpp */,
 				0FD82E1F14172C2F00179C94 /* DFGCapabilities.h */,
+				0FC0977E1469EBC400CF2442 /* DFGCommon.h */,
+				0FC0979D146B271E00CF2442 /* DFGCorrectableJumpPoint.cpp */,
+				0FC0979A146A772000CF2442 /* DFGCorrectableJumpPoint.h */,
 				0FD3C82214115D0E00FD81CB /* DFGDriver.h */,
 				0FD3C82014115CF800FD81CB /* DFGDriver.cpp */,
 				86AE6C4B136A11E400963012 /* DFGFPRInfo.h */,
 				86EC9DB61328DF82002B2AD7 /* DFGGenerationInfo.h */,
 				86AE6C4C136A11E400963012 /* DFGGPRInfo.h */,
 				86EC9DB71328DF82002B2AD7 /* DFGGraph.cpp */,
+				86EC9DB81328DF82002B2AD7 /* DFGGraph.h */,
 				0FD82EF31423073900179C94 /* DFGIntrinsic.h */,
-				86EC9DB81328DF82002B2AD7 /* DFGGraph.h */,
 				86EC9DB91328DF82002B2AD7 /* DFGJITCodeGenerator.cpp */,
 				86EC9DBA1328DF82002B2AD7 /* DFGJITCodeGenerator.h */,
 				86880F1814328BB900B08D42 /* DFGJITCodeGenerator32_64.cpp */,
@@ -2365,8 +2354,15 @@
 				86EC9DBC1328DF82002B2AD7 /* DFGJITCompiler.h */,
 				86880F1A14328BB900B08D42 /* DFGJITCompilerInlineMethods.h */,
 				86ECA3E9132DEF1C002B2AD7 /* DFGNode.h */,
+				0F620171143FCD2F0068B77C /* DFGOperands.h */,
 				0FD82E52141DAEDE00179C94 /* DFGOSREntry.cpp */,
 				0FD82E53141DAEDE00179C94 /* DFGOSREntry.h */,
+				0FC0978E146A6F6300CF2442 /* DFGOSRExit.cpp */,
+				0FC097681468A6EF00CF2442 /* DFGOSRExit.h */,
+				0FC0978F146A6F6300CF2442 /* DFGOSRExitCompiler.cpp */,
+				0FC0976F14693AEF00CF2442 /* DFGOSRExitCompiler.h */,
+				0FC09775146943AD00CF2442 /* DFGOSRExitCompiler32_64.cpp */,
+				0FC0977014693AEF00CF2442 /* DFGOSRExitCompiler64.cpp */,
 				86EC9DBF1328DF82002B2AD7 /* DFGOperations.cpp */,
 				86EC9DC01328DF82002B2AD7 /* DFGOperations.h */,
 				0FD3C82414115D2200FD81CB /* DFGPropagator.h */,
@@ -2379,6 +2375,10 @@
 				86EC9DC31328DF82002B2AD7 /* DFGSpeculativeJIT.h */,
 				86880F1B14328BB900B08D42 /* DFGSpeculativeJIT32_64.cpp */,
 				86880F4C14353B2100B08D42 /* DFGSpeculativeJIT64.cpp */,
+				0FFF4BB2143955E600655BC0 /* DFGStructureSet.h */,
+				0FC0979F146B28C700CF2442 /* DFGThunks.cpp */,
+				0FC097A0146B28C700CF2442 /* DFGThunks.h */,
+				0F620172143FCD2F0068B77C /* DFGVariableAccessData.h */,
 			);
 			name = dfg;
 			sourceTree = "<group>";

Modified: trunk/Source/_javascript_Core/wtf/OSAllocatorPosix.cpp (100174 => 100175)


--- trunk/Source/_javascript_Core/wtf/OSAllocatorPosix.cpp	2011-11-14 20:08:53 UTC (rev 100174)
+++ trunk/Source/_javascript_Core/wtf/OSAllocatorPosix.cpp	2011-11-14 20:23:23 UTC (rev 100175)
@@ -54,7 +54,7 @@
         protection |= PROT_EXEC;
 
     int flags = MAP_PRIVATE | MAP_ANON;
-#if defined MAP_JIT
+#if PLATFORM(IOS)
     if (executable)
         flags |= MAP_JIT;
 #endif

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to