Title: [264786] trunk/Source/WebCore
- Revision
- 264786
- Author
- hironori.fu...@sony.com
- Date
- 2020-07-23 13:27:43 -0700 (Thu, 23 Jul 2020)
Log Message
[CMake][Win] Build StructuredExceptionHandlerSuppressor.cpp and makesafeseh.asm only for AppleWin
https://bugs.webkit.org/show_bug.cgi?id=214671
Reviewed by Per Arne Vollan.
StructuredExceptionHandlerSuppressor is used only by AppleWin port
in platform/graphics/ca/win/LayerChangesFlusher.cpp.
makesafeseh.asm causes a building problem for 32bit WinCairo
because it is using OBJECT library type for WebCore.
* PlatformAppleWin.cmake: Added build rules for them.
* PlatformWin.cmake: Removed build rules for them.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (264785 => 264786)
--- trunk/Source/WebCore/ChangeLog 2020-07-23 20:16:49 UTC (rev 264785)
+++ trunk/Source/WebCore/ChangeLog 2020-07-23 20:27:43 UTC (rev 264786)
@@ -1,3 +1,18 @@
+2020-07-23 Fujii Hironori <hironori.fu...@sony.com>
+
+ [CMake][Win] Build StructuredExceptionHandlerSuppressor.cpp and makesafeseh.asm only for AppleWin
+ https://bugs.webkit.org/show_bug.cgi?id=214671
+
+ Reviewed by Per Arne Vollan.
+
+ StructuredExceptionHandlerSuppressor is used only by AppleWin port
+ in platform/graphics/ca/win/LayerChangesFlusher.cpp.
+ makesafeseh.asm causes a building problem for 32bit WinCairo
+ because it is using OBJECT library type for WebCore.
+
+ * PlatformAppleWin.cmake: Added build rules for them.
+ * PlatformWin.cmake: Removed build rules for them.
+
2020-07-23 Andres Gonzalez <andresg...@apple.com>
Update the isolated tree even when there is no client request.
Modified: trunk/Source/WebCore/PlatformAppleWin.cmake (264785 => 264786)
--- trunk/Source/WebCore/PlatformAppleWin.cmake 2020-07-23 20:16:49 UTC (rev 264785)
+++ trunk/Source/WebCore/PlatformAppleWin.cmake 2020-07-23 20:27:43 UTC (rev 264786)
@@ -53,6 +53,8 @@
platform/network/cf/SynchronousLoaderClientCFNet.cpp
platform/text/LocaleNone.cpp
+
+ platform/win/StructuredExceptionHandlerSuppressor.cpp
)
list(APPEND WebCore_PRIVATE_FRAMEWORK_HEADERS
@@ -184,3 +186,12 @@
platform/graphics/cg/UTIRegistry.h
)
endif ()
+
+if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+ list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj)
+ add_custom_command(
+ OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj
+ DEPENDS ${WEBCORE_DIR}/platform/win/makesafeseh.asm
+ COMMAND ml /safeseh /c /Fo ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj ${WEBCORE_DIR}/platform/win/makesafeseh.asm
+ VERBATIM)
+endif ()
Modified: trunk/Source/WebCore/PlatformWin.cmake (264785 => 264786)
--- trunk/Source/WebCore/PlatformWin.cmake 2020-07-23 20:16:49 UTC (rev 264785)
+++ trunk/Source/WebCore/PlatformWin.cmake 2020-07-23 20:27:43 UTC (rev 264786)
@@ -97,7 +97,6 @@
platform/win/SearchPopupMenuDB.cpp
platform/win/SearchPopupMenuWin.cpp
platform/win/SharedBufferWin.cpp
- platform/win/StructuredExceptionHandlerSuppressor.cpp
platform/win/SystemInfo.cpp
platform/win/UserAgentWin.cpp
platform/win/WCDataObject.cpp
@@ -202,15 +201,6 @@
)
endif ()
-if (CMAKE_SIZEOF_VOID_P EQUAL 4)
- list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj)
- add_custom_command(
- OUTPUT ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj
- DEPENDS ${WEBCORE_DIR}/platform/win/makesafeseh.asm
- COMMAND ml /safeseh /c /Fo ${WebCore_DERIVED_SOURCES_DIR}/makesafeseh.obj ${WEBCORE_DIR}/platform/win/makesafeseh.asm
- VERBATIM)
-endif ()
-
if (${WTF_PLATFORM_WIN_CAIRO})
include(PlatformWinCairo.cmake)
else ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
