Title: [226945] trunk
- Revision
- 226945
- Author
- mcatanz...@igalia.com
- Date
- 2018-01-15 00:45:13 -0800 (Mon, 15 Jan 2018)
Log Message
REGRESSION(r226266): [GTK] RELEASE_ASSERT(reservedZoneSize >= minimumReservedZoneSize) in JSC::VM::updateStackLimits
https://bugs.webkit.org/show_bug.cgi?id=181438
<rdar://problem/36376724>
Reviewed by Carlos Garcia Campos.
.:
Build JSC as a shared library.
Stop using -fvisibility=hidden. This is a shame, but it is causing problems that I don't
know how to fix.
* Source/cmake/OptionsGTK.cmake:
* Source/cmake/WebKitCompilerFlags.cmake:
Source/_javascript_Core:
Roll out the functional changes of r226266. We'll keep the minor CMake library type setting
cleanup, but we have to switch back to building JSC only as a shared library, and we have to
get rid of the version script.
* PlatformGTK.cmake:
* _javascript_coregtk-symbols.map: Removed.
Modified Paths
Removed Paths
Diff
Modified: trunk/ChangeLog (226944 => 226945)
--- trunk/ChangeLog 2018-01-15 08:17:46 UTC (rev 226944)
+++ trunk/ChangeLog 2018-01-15 08:45:13 UTC (rev 226945)
@@ -1,3 +1,19 @@
+2018-01-15 Michael Catanzaro <mcatanz...@igalia.com>
+
+ REGRESSION(r226266): [GTK] RELEASE_ASSERT(reservedZoneSize >= minimumReservedZoneSize) in JSC::VM::updateStackLimits
+ https://bugs.webkit.org/show_bug.cgi?id=181438
+ <rdar://problem/36376724>
+
+ Reviewed by Carlos Garcia Campos.
+
+ Build JSC as a shared library.
+
+ Stop using -fvisibility=hidden. This is a shame, but it is causing problems that I don't
+ know how to fix.
+
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/WebKitCompilerFlags.cmake:
+
2018-01-11 Keith Miller <keith_mil...@apple.com>
Rename ENABLE_ASYNC_ITERATION to ENABLE_JS_ASYNC_ITERATION
Modified: trunk/Source/_javascript_Core/ChangeLog (226944 => 226945)
--- trunk/Source/_javascript_Core/ChangeLog 2018-01-15 08:17:46 UTC (rev 226944)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-01-15 08:45:13 UTC (rev 226945)
@@ -1,3 +1,18 @@
+2018-01-15 Michael Catanzaro <mcatanz...@igalia.com>
+
+ REGRESSION(r226266): [GTK] RELEASE_ASSERT(reservedZoneSize >= minimumReservedZoneSize) in JSC::VM::updateStackLimits
+ https://bugs.webkit.org/show_bug.cgi?id=181438
+ <rdar://problem/36376724>
+
+ Reviewed by Carlos Garcia Campos.
+
+ Roll out the functional changes of r226266. We'll keep the minor CMake library type setting
+ cleanup, but we have to switch back to building JSC only as a shared library, and we have to
+ get rid of the version script.
+
+ * PlatformGTK.cmake:
+ * _javascript_coregtk-symbols.map: Removed.
+
2018-01-14 Saam Barati <sbar...@apple.com>
Unreviewed. r226928 broke the CLOOP build. This patch fixes the CLOOP build.
Modified: trunk/Source/_javascript_Core/PlatformGTK.cmake (226944 => 226945)
--- trunk/Source/_javascript_Core/PlatformGTK.cmake 2018-01-15 08:17:46 UTC (rev 226944)
+++ trunk/Source/_javascript_Core/PlatformGTK.cmake 2018-01-15 08:45:13 UTC (rev 226945)
@@ -1,3 +1,5 @@
+set(_javascript_Core_OUTPUT_NAME _javascript_coregtk-${WEBKITGTK_API_VERSION})
+
list(APPEND _javascript_Core_UNIFIED_SOURCE_LIST_FILES
"SourcesGTK.txt"
)
@@ -50,23 +52,3 @@
list(APPEND _javascript_Core_SYSTEM_INCLUDE_DIRECTORIES
${GLIB_INCLUDE_DIRS}
)
-
-# Linking WebKit properly is extremely tricky. We need to build both a static library
-# and a shared library for JSC. See https://bugs.webkit.org/show_bug.cgi?id=179914.
-set(_javascript_CoreGTK_LIBRARIES
- _javascript_Core${DEBUG_SUFFIX}
-)
-ADD_WHOLE_ARCHIVE_TO_LIBRARIES(_javascript_CoreGTK_LIBRARIES)
-
-add_library(_javascript_CoreGTK SHARED "${CMAKE_BINARY_DIR}/cmakeconfig.h")
-target_link_libraries(_javascript_CoreGTK ${_javascript_CoreGTK_LIBRARIES})
-set_target_properties(_javascript_CoreGTK PROPERTIES OUTPUT_NAME _javascript_coregtk-${WEBKITGTK_API_VERSION})
-
-WEBKIT_POPULATE_LIBRARY_VERSION(_javascript_CORE)
-set_target_properties(_javascript_CoreGTK PROPERTIES VERSION ${_javascript_CORE_VERSION} SOVERSION ${_javascript_CORE_VERSION_MAJOR})
-
-if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
- WEBKIT_ADD_TARGET_PROPERTIES(_javascript_CoreGTK LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/_javascript_coregtk-symbols.map")
-endif ()
-
-install(TARGETS _javascript_CoreGTK DESTINATION "${LIB_INSTALL_DIR}")
Deleted: trunk/Source/_javascript_Core/_javascript_coregtk-symbols.map (226944 => 226945)
--- trunk/Source/_javascript_Core/_javascript_coregtk-symbols.map 2018-01-15 08:17:46 UTC (rev 226944)
+++ trunk/Source/_javascript_Core/_javascript_coregtk-symbols.map 2018-01-15 08:45:13 UTC (rev 226945)
@@ -1,6 +0,0 @@
-{
-global:
- JS*;
-local:
- *;
-};
Modified: trunk/Source/cmake/OptionsGTK.cmake (226944 => 226945)
--- trunk/Source/cmake/OptionsGTK.cmake 2018-01-15 08:17:46 UTC (rev 226944)
+++ trunk/Source/cmake/OptionsGTK.cmake 2018-01-15 08:45:13 UTC (rev 226945)
@@ -376,6 +376,7 @@
set(WebKit2_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-${WEBKITGTK_API_VERSION}.pc)
set(WebKit2WebExtension_PKGCONFIG_FILE ${CMAKE_BINARY_DIR}/Source/WebKit/webkit2gtk-web-extension-${WEBKITGTK_API_VERSION}.pc)
+set(_javascript_Core_LIBRARY_TYPE SHARED)
set(SHOULD_INSTALL_JS_SHELL ON)
# Add a typelib file to the list of all typelib dependencies. This makes it easy to
Modified: trunk/Source/cmake/WebKitCompilerFlags.cmake (226944 => 226945)
--- trunk/Source/cmake/WebKitCompilerFlags.cmake 2018-01-15 08:17:46 UTC (rev 226944)
+++ trunk/Source/cmake/WebKitCompilerFlags.cmake 2018-01-15 08:45:13 UTC (rev 226945)
@@ -105,13 +105,6 @@
WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-std=c++14
-fno-rtti)
- if (UNIX AND NOT DEVELOPER_MODE)
- # These are used even for ports that use symbol maps so that the
- # compiler can take visibility into account for code optimization.
- WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-fvisibility=hidden)
- WEBKIT_APPEND_GLOBAL_CXX_FLAGS(-fvisibility-inlines-hidden)
- endif ()
-
if (WIN32)
WEBKIT_APPEND_GLOBAL_COMPILER_FLAGS(-mno-ms-bitfields)
WEBKIT_PREPEND_GLOBAL_COMPILER_FLAGS(-Wno-unknown-pragmas)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
