WebKit Bugzilla
Attachment 371191 Details for
Bug 198446
: [PlayStation] Build a shared JavaScriptCore
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
WIP Patch
playstation-object-jsc.diff (text/plain), 3.17 KB, created by
Don Olmstead
on 2019-06-03 09:07:38 PDT
(
hide
)
Description:
WIP Patch
Filename:
MIME Type:
Creator:
Don Olmstead
Created:
2019-06-03 09:07:38 PDT
Size:
3.17 KB
patch
obsolete
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt >index 9c9747408f9..7657c1f222d 100644 >--- a/Source/JavaScriptCore/CMakeLists.txt >+++ b/Source/JavaScriptCore/CMakeLists.txt >@@ -115,7 +115,7 @@ set(JavaScriptCore_OBJECT_LUT_SOURCES > ) > > set(JavaScriptCore_LIBRARIES >- WebKit::WTF >+ PUBLIC WebKit::WTF > ) > > if (USE_CAPSTONE) >diff --git a/Source/JavaScriptCore/PlatformPlayStation.cmake b/Source/JavaScriptCore/PlatformPlayStation.cmake >index 60bfa78a4db..c1d5f9fbe97 100644 >--- a/Source/JavaScriptCore/PlatformPlayStation.cmake >+++ b/Source/JavaScriptCore/PlatformPlayStation.cmake >@@ -34,9 +34,13 @@ list(APPEND JavaScriptCore_SOURCES > inspector/remote/socket/posix/RemoteInspectorSocketPOSIX.cpp > ) > >-if (${WTF_LIBRARY_TYPE} STREQUAL "STATIC") >- add_definitions(-DSTATICALLY_LINKED_WITH_WTF) >-endif () >- > # This overrides the default x64 value of 1GB for the memory pool size > add_definitions(-DFIXED_EXECUTABLE_MEMORY_POOL_SIZE_IN_MB=64) >+ >+# Both bmalloc and WTF are built as object libraries. Link them into JavaScriptCore >+# privately so the object files do not propagate. >+list(APPEND JavaScriptCore_LIBRARIES >+ PRIVATE $<TARGET_OBJECTS:bmalloc> >+ PRIVATE $<TARGET_OBJECTS:WTF> >+) >+target_compile_definitions(JavaScriptCore PRIVATE STATICALLY_LINKED_WITH_WTF) >diff --git a/Source/WTF/wtf/PlatformPlayStation.cmake b/Source/WTF/wtf/PlatformPlayStation.cmake >index 287a2690828..f431226083f 100644 >--- a/Source/WTF/wtf/PlatformPlayStation.cmake >+++ b/Source/WTF/wtf/PlatformPlayStation.cmake >@@ -15,7 +15,6 @@ list(APPEND WTF_SOURCES > text/unix/TextBreakIteratorInternalICUUnix.cpp > > unix/CPUTimeUnix.cpp >- unix/LanguageUnix.cpp > ) > > list(APPEND WTF_LIBRARIES >@@ -24,3 +23,11 @@ list(APPEND WTF_LIBRARIES > ${C_STD_LIBRARY} > ${KERNEL_LIBRARY} > ) >+ >+# Override the WTF interface libraries for an object library >+# >+# We're building in WTF within JavaScriptCore so we don't include the objects here >+# however we want to propagate the interface link libraries >+set(WTF_INTERFACE_LIBRARIES >+ $<TARGET_PROPERTY:WTF,INTERFACE_LINK_LIBRARIES> >+) >diff --git a/Source/cmake/OptionsPlayStation.cmake b/Source/cmake/OptionsPlayStation.cmake >index 4028b772b5f..fe9bac2d44b 100644 >--- a/Source/cmake/OptionsPlayStation.cmake >+++ b/Source/cmake/OptionsPlayStation.cmake >@@ -126,8 +126,9 @@ SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER ON) > SET_AND_EXPOSE_TO_BUILD(USE_TEXTURE_MAPPER_GL ON) > SET_AND_EXPOSE_TO_BUILD(USE_TILED_BACKING_STORE ON) > >-set(WTF_LIBRARY_TYPE STATIC) >-set(JavaScriptCore_LIBRARY_TYPE STATIC) >+set(bmalloc_LIBRARY_TYPE OBJECT) >+set(WTF_LIBRARY_TYPE OBJECT) >+set(JavaScriptCore_LIBRARY_TYPE SHARED) > set(WebCore_LIBRARY_TYPE STATIC) > > set(ENABLE_API_TESTS ON) >diff --git a/Tools/TestWebKitAPI/PlatformPlayStation.cmake b/Tools/TestWebKitAPI/PlatformPlayStation.cmake >index 952d043f062..2fe9e422290 100644 >--- a/Tools/TestWebKitAPI/PlatformPlayStation.cmake >+++ b/Tools/TestWebKitAPI/PlatformPlayStation.cmake >@@ -10,6 +10,11 @@ list(APPEND TestWTF_SOURCES > generic/UtilitiesGeneric.cpp > ) > >+list(APPEND TestWTF_LIBRARIES >+ $<TARGET_OBJECTS:bmalloc> >+ $<TARGET_OBJECTS:WTF> >+) >+ > list(APPEND TestWebCore_SOURCES > ${test_main_SOURCES} > )
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 198446
:
371191
|
389741
|
389742
|
389877