Source/JavaScriptCore: Fixed compile errors while compiling without the JIT enabled.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Oct 2013 00:05:49 +0000 (00:05 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 9 Oct 2013 00:05:49 +0000 (00:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=122530

Patch by Alex Christensen <achristensen@webkit.org> on 2013-10-08
Reviewed by Brent Fulgham.

* jit/JITOperations.cpp:
Protected with #if ENABLE(JIT) like the rest of the JIT source.

Source/ThirdParty/ANGLE: Generate pdb files for debugging ANGLE DLLs.
https://bugs.webkit.org/show_bug.cgi?id=122530

Patch by Alex Christensen <achristensen@webkit.org> on 2013-10-08
Reviewed by Brent Fulgham.

* ANGLE.vcxproj/libEGLCommon.props:
* ANGLE.vcxproj/libGLESv2Common.props:
Generate debug information.

Source/WebCore: Enabled all necessary files for Win64 build.
https://bugs.webkit.org/show_bug.cgi?id=122530

Patch by Alex Christensen <achristensen@webkit.org> on 2013-10-08
Reviewed by Brent Fulgham.

* WebCore.vcxproj/WebCore.vcxproj:
Enabled MediaPlayerPrivateFullscreenWindow and
RenderLayerModelObject to be built in Win64 build.

Source/WebKit: Fixed Win64 linking.
https://bugs.webkit.org/show_bug.cgi?id=122530

Patch by Alex Christensen <achristensen@webkit.org> on 2013-10-08
Reviewed by Brent Fulgham.

* WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
Added 64-bit linker symbols.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157147 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/jit/JITOperations.cpp
Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGLCommon.props
Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2Common.props
Source/ThirdParty/ANGLE/ChangeLog
Source/WebCore/ChangeLog
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebKit/ChangeLog
Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in

index 757e74e575a03c95b5cf624a556817e7a2dd33e9..d72c851efa633ba5167518d39f66a6850dd6329b 100644 (file)
@@ -1,3 +1,13 @@
+2013-10-08  Alex Christensen  <achristensen@webkit.org>
+
+        Fixed compile errors while compiling without the JIT enabled.
+        https://bugs.webkit.org/show_bug.cgi?id=122530
+
+        Reviewed by Brent Fulgham.
+
+        * jit/JITOperations.cpp:
+        Protected with #if ENABLE(JIT) like the rest of the JIT source.
+
 2013-10-07  Mark Hahnenberg  <mhahnenberg@apple.com>
 
         JSManagedValue should be able to store non-object JSValues
index 676b6ea486f72b1d5f803419076e537fcc717eb0..eb44cb57f004739f3685e2bb2152281c4cad744a 100644 (file)
@@ -24,6 +24,7 @@
  */
 
 #include "config.h"
+#if ENABLE(JIT)
 #include "JITOperations.h"
 
 #include "CommonSlowPaths.h"
@@ -758,3 +759,4 @@ extern "C" {
 
 } // namespace JSC
 
+#endif // ENABLE(JIT)
index 4a67b539be3e56700eed5c73c39d038864cb6c22..501efe0258d37f76ff7b400afcf8865a7f347ffb 100755 (executable)
@@ -12,6 +12,7 @@
       <AdditionalDependencies>d3d9.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>\r
       <ModuleDefinitionFile>../src/libEGL/libEGL.def</ModuleDefinitionFile>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup />\r
index 923bc4376a9655ca97c909bb07d8370e57672a35..88876fe7035f2762937494e8de9edd0ef5ec8639 100755 (executable)
@@ -11,6 +11,7 @@
       <ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>\r
       <AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common.lib;translator_hlsl.lib;preprocessor.lib;%(AdditionalDependencies)</AdditionalDependencies>\r
       <AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>\r
+      <GenerateDebugInformation>true</GenerateDebugInformation>\r
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup />\r
index 581e3995fabb76e40cf0397bce5486093e723224..6cc6140e2ce1cd2ca5957bc3a672f6a44b9e3be8 100644 (file)
@@ -1,3 +1,14 @@
+2013-10-08  Alex Christensen  <achristensen@webkit.org>
+
+        Generate pdb files for debugging ANGLE DLLs.
+        https://bugs.webkit.org/show_bug.cgi?id=122530
+
+        Reviewed by Brent Fulgham.
+
+        * ANGLE.vcxproj/libEGLCommon.props:
+        * ANGLE.vcxproj/libGLESv2Common.props:
+        Generate debug information.
+
 2013-10-03  Dan Bernstein  <mitz@apple.com>
 
         <rdar://problem/15116673> [mac] Build failure when the source directory is not named ANGLE
index 2f28151cfc84ee2b22b254ae5499d151f3c075f8..b1370b87c31ff5c05eae35a6ef413ba696883652 100644 (file)
@@ -1,3 +1,14 @@
+2013-10-08  Alex Christensen  <achristensen@webkit.org>
+
+        Enabled all necessary files for Win64 build.
+        https://bugs.webkit.org/show_bug.cgi?id=122530
+
+        Reviewed by Brent Fulgham.
+
+        * WebCore.vcxproj/WebCore.vcxproj:
+        Enabled MediaPlayerPrivateFullscreenWindow and
+        RenderLayerModelObject to be built in Win64 build.
+
 2013-10-07  Sam Weinig  <sam@webkit.org>
 
         Consolidate findString functions
index d2aaba66c261bafe03e313674e3eb92834516571..6a9ec38ea1918e4cc6062e70d6f21fbd8b2a63c7 100644 (file)
     <ClCompile Include="..\platform\graphics\win\IntPointWin.cpp" />
     <ClCompile Include="..\platform\graphics\win\IntRectWin.cpp" />
     <ClCompile Include="..\platform\graphics\win\IntSizeWin.cpp" />
-    <ClCompile Include="..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.cpp" />
     <ClCompile Include="..\platform\graphics\win\MediaPlayerPrivateQuickTimeVisualContext.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\rendering\RenderLayerFilterInfo.cpp" />
-    <ClCompile Include="..\rendering\RenderLayerModelObject.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
-    </ClCompile>
+    <ClCompile Include="..\rendering\RenderLayerModelObject.cpp" />
     <ClCompile Include="..\rendering\RenderLineBoxList.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
index ccd651780df5a64af97123695e96bbeddb9f2898..426166b46e8949ac598cc99a0e30f8954b952e9c 100644 (file)
@@ -1,3 +1,13 @@
+2013-10-08  Alex Christensen  <achristensen@webkit.org>
+
+        Fixed Win64 linking.
+        https://bugs.webkit.org/show_bug.cgi?id=122530
+
+        Reviewed by Brent Fulgham.
+
+        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+        Added 64-bit linker symbols.
+
 2013-10-06  Andreas Kling  <akling@apple.com>
 
         No? Okay, let's try that again..
index f084dfcf985425a368bea4dacf853c738c144aeb..f0e7e6987cc5fac6cfefdd8a2c08ff0ab86ebe5d 100644 (file)
@@ -181,7 +181,7 @@ EXPORTS
         symbolWithPointer(?addSlowCase@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PAVStringImpl@2@@Z, ?addSlowCase@AtomicString@WTF@@CA?AV?$PassRefPtr@VStringImpl@WTF@@@2@PEAVStringImpl@2@@Z)
         symbolWithPointer(?cacheDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PAV23@PBUClassInfo@3@@Z, ?cacheDOMStructure@WebCore@@YAPEAVStructure@JSC@@PEAVJSDOMGlobalObject@1@PEAV23@PEBUClassInfo@3@@Z)
         symbolWithPointer(?childItemWithTarget@HistoryItem@WebCore@@QBEPAV12@ABVString@WTF@@@Z, ?childItemWithTarget@HistoryItem@WebCore@@QEBAPEAV12@AEBVString@WTF@@@Z)
-        ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@AAVDocument@2@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z
+        symbolWithPointer(?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@AAVDocument@2@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z, ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@AEAVDocument@2@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z)
         symbolWithPointer(?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z, ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@AEBVString@4@@Z)
 #if USE(CF)
         symbolWithPointer(?createCFString@String@WTF@@QBE?AV?$RetainPtr@PBU__CFString@@@2@XZ, ?createCFString@String@WTF@@QEBA?AV?$RetainPtr@PEBU__CFString@@@2@XZ)
@@ -437,7 +437,7 @@ EXPORTS
         symbolWithPointer(?toInt64@WebCore@@YA_JPAVExecState@JSC@@VJSValue@3@W4IntegerConversionConfiguration@1@@Z, ?toInt64@WebCore@@YA_JPEAVExecState@JSC@@VJSValue@3@W4IntegerConversionConfiguration@1@@Z)
         symbolWithPointer(?toUInt32EnforceRange@WebCore@@YAIPAVExecState@JSC@@VJSValue@3@@Z, ?toUInt32EnforceRange@WebCore@@YAIPEAVExecState@JSC@@VJSValue@3@@Z)
         symbolWithPointer(?toUInt64@WebCore@@YA_KPAVExecState@JSC@@VJSValue@3@W4IntegerConversionConfiguration@1@@Z, ?toUInt64@WebCore@@YA_KPEAVExecState@JSC@@VJSValue@3@W4IntegerConversionConfiguration@1@@Z)
-        ?commonVM@JSDOMWindowBase@WebCore@@SAPAVVM@JSC@@XZ
+        symbolWithPointer(?commonVM@JSDOMWindowBase@WebCore@@SAPAVVM@JSC@@XZ, ?commonVM@JSDOMWindowBase@WebCore@@SAPEAVVM@JSC@@XZ)
 
 #if ENABLE(WORKERS)
         ?workerThreadCount@WorkerThread@WebCore@@SAIXZ