Skip to content
Permalink
Browse files
Source/JavaScriptCore: Fixed compile errors while compiling without t…
…he JIT enabled.

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.

Canonical link: https://commits.webkit.org/140616@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157147 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
Alex Christensen authored and webkit-commit-queue committed Oct 9, 2013
1 parent 4c539ff commit cc80d2b7756caab53bdf19eb616706ba153b910a
@@ -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
@@ -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)
@@ -12,6 +12,7 @@
<AdditionalDependencies>d3d9.lib;libGLESv2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
<ModuleDefinitionFile>../src/libEGL/libEGL.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
@@ -11,6 +11,7 @@
<ModuleDefinitionFile>../src/libGLESv2/libGLESv2.def</ModuleDefinitionFile>
<AdditionalDependencies>d3d9.lib;dxguid.lib;translator_common.lib;translator_hlsl.lib;preprocessor.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(CONFIGURATIONBUILDDIR)\lib$(PlatformArchitecture)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
</Link>
</ItemDefinitionGroup>
<ItemGroup />
@@ -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
@@ -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
@@ -7563,10 +7563,7 @@
<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>
@@ -9836,14 +9833,7 @@
<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>
@@ -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..
@@ -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

0 comments on commit cc80d2b

Please sign in to comment.