Title: [160403] branches/safari-537.74-branch/Source
- Revision
- 160403
- Author
- matthew_han...@apple.com
- Date
- 2013-12-10 17:25:06 -0800 (Tue, 10 Dec 2013)
Log Message
Merge 152982: <rdar://problem/15498697>.
Modified Paths
Diff
Modified: branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog (160402 => 160403)
--- branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog 2013-12-11 01:11:17 UTC (rev 160402)
+++ branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog 2013-12-11 01:25:06 UTC (rev 160403)
@@ -1,5 +1,19 @@
2013-12-10 Matthew Hanson <matthew_han...@apple.com>
+ Merge 152982
+
+ 2013-07-22 Alex Christensen <achristen...@apple.com>
+
+ Added assembly files to Windows 64-bit builds.
+ https://bugs.webkit.org/show_bug.cgi?id=118931
+
+ Reviewed by Brent Fulgham.
+
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj: Added JITStubsMSVC64.asm for x64 and enabled MASM.
+ * _javascript_Core.vcxproj/_javascript_Core.vcxproj.filters: Added JITStubsMSVC64.asm.
+
+2013-12-10 Matthew Hanson <matthew_han...@apple.com>
+
Merge 152921
2013-07-19 Alex Christensen <achristen...@apple.com>
Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj (160402 => 160403)
--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2013-12-11 01:11:17 UTC (rev 160402)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj 2013-12-11 01:25:06 UTC (rev 160403)
@@ -119,6 +119,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup>
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -914,7 +915,17 @@
<FileType>Document</FileType>
</None>
</ItemGroup>
+ <ItemGroup>
+ <MASM Include="..\jit\JITStubsMSVC64.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ </MASM>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters (160402 => 160403)
--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2013-12-11 01:11:17 UTC (rev 160402)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.vcxproj.filters 2013-12-11 01:25:06 UTC (rev 160403)
@@ -1932,4 +1932,9 @@
<None Include="_javascript_CorePostBuild.cmd" />
<None Include="_javascript_CorePreBuild.cmd" />
</ItemGroup>
+ <ItemGroup>
+ <MASM Include="..\jit\JITStubsMSVC64.asm">
+ <Filter>jit</Filter>
+ </MASM>
+ </ItemGroup>
</Project>
\ No newline at end of file
Modified: branches/safari-537.74-branch/Source/WebCore/ChangeLog (160402 => 160403)
--- branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-11 01:11:17 UTC (rev 160402)
+++ branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-11 01:25:06 UTC (rev 160403)
@@ -1,5 +1,19 @@
2013-12-10 Matthew Hanson <matthew_han...@apple.com>
+ Merge 152982
+
+ 2013-07-22 Alex Christensen <achristen...@apple.com>
+
+ Added assembly files to Windows 64-bit builds.
+ https://bugs.webkit.org/show_bug.cgi?id=118931
+
+ Reviewed by Brent Fulgham.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Added PaintHooks.asm for x64 and enabled MASM.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Added PaintHooks.asm.
+
+2013-12-10 Matthew Hanson <matthew_han...@apple.com>
+
Merge 152921
2013-07-19 Alex Christensen <achristen...@apple.com>
Modified: branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (160402 => 160403)
--- branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-11 01:11:17 UTC (rev 160402)
+++ branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-11 01:25:06 UTC (rev 160403)
@@ -106,6 +106,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -21383,7 +21384,17 @@
<None Include="WebCorePostBuild.cmd" />
<None Include="WebCorePreBuild.cmd" />
</ItemGroup>
+ <ItemGroup>
+ <MASM Include="..\plugins\win\PaintHooks.asm">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ </MASM>
+ </ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
+ <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
</Project>
\ No newline at end of file
Modified: branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (160402 => 160403)
--- branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-12-11 01:11:17 UTC (rev 160402)
+++ branches/safari-537.74-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2013-12-11 01:25:06 UTC (rev 160403)
@@ -15240,4 +15240,9 @@
<Filter>platform\win</Filter>
</MASM>
</ItemGroup>
+ <ItemGroup>
+ <MASM Include="..\plugins\win\PaintHooks.asm">
+ <Filter>plugins\win</Filter>
+ </MASM>
+ </ItemGroup>
</Project>
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
