Changeset 226268 in webkit

Timestamp:

Dec 22, 2017 10:12:53 AM (6 years ago)

Author:

Michael Catanzaro

Message:

[GTK] Duplicated symbols in libjavascriptcoregtk and libwebkit2gtk can cause crashes in production builds
​https://bugs.webkit.org/show_bug.cgi?id=179914
<rdar://problem/36196039>

Unreviewed.

Source/JavaScriptCore:

• PlatformGTK.cmake:

Source/WebKit:

I messed up a last-minute change, and inverted the conditional that determines whether to
use the version script. I did test this change to ensure that it worked properly by checking
that the library size was correct, but only in non-developer mode. My test was thwarted by
-fvisibility=hidden. It looks like so few internal symbols are exported that missing the
version script had little impact on the size of the resulting libraries. That's good, I
suppose.

• PlatformGTK.cmake:
• PlatformWPE.cmake:

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/PlatformGTK.cmake (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/PlatformGTK.cmake (modified) (1 diff)
• WebKit/PlatformWPE.cmake (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2017-12-22  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Duplicated symbols in libjavascriptcoregtk and libwebkit2gtk can cause crashes in production builds
+        https://bugs.webkit.org/show_bug.cgi?id=179914
+        <rdar://problem/36196039>
+
+        Unreviewed.
+
+        * PlatformGTK.cmake:
+
 2017-12-22  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/JavaScriptCore/PlatformGTK.cmake

@@ -66 +66 @@
 set_target_properties(JavaScriptCoreGTK PROPERTIES VERSION ${JAVASCRIPTCORE_VERSION} SOVERSION ${JAVASCRIPTCORE_VERSION_MAJOR})
 
-if (DEVELOPER_MODE)
+if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
     WEBKIT_ADD_TARGET_PROPERTIES(JavaScriptCoreGTK LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/javascriptcoregtk-symbols.map")
 endif ()

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-12-22  Michael Catanzaro  <mcatanzaro@igalia.com>
+
+        [GTK] Duplicated symbols in libjavascriptcoregtk and libwebkit2gtk can cause crashes in production builds
+        https://bugs.webkit.org/show_bug.cgi?id=179914
+        <rdar://problem/36196039>
+
+        Unreviewed.
+
+        I messed up a last-minute change, and inverted the conditional that determines whether to
+        use the version script. I did test this change to ensure that it worked properly by checking
+        that the library size was correct, but only in non-developer mode. My test was thwarted by
+        -fvisibility=hidden. It looks like so few internal symbols are exported that missing the
+        version script had little impact on the size of the resulting libraries. That's good, I
+        suppose.
+
+        * PlatformGTK.cmake:
+        * PlatformWPE.cmake:
+
 2017-12-22  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebKit/PlatformGTK.cmake

@@ -25 +25 @@
 add_definitions(-DDATADIR="${CMAKE_INSTALL_FULL_DATADIR}")
 
-if (DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
     WEBKIT_ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/webkitglib-symbols.map")
 endif ()

trunk/Source/WebKit/PlatformWPE.cmake

@@ -17 +17 @@
 add_definitions(-DLOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
 
-if (DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
+if (NOT DEVELOPER_MODE AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
     WEBKIT_ADD_TARGET_PROPERTIES(WebKit LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/webkitglib-symbols.map")
 endif ()