Attachment 459852 Details for Bug 241002 – Patch

[patch] Patch

bug-241002-20220530170653.patch (text/plain), 4.68 KB, created by Fujii Hironori on 2022-05-30 01:06:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2022-05-30 01:06:54 PDT

Size: 4.68 KB

patch

obsolete

>From 953fbfc309434d7aaf690029ef7e9d69d3c8d4c1 Mon Sep 17 00:00:00 2001
>From: Fujii Hironori <Hironori.Fujii@sony.com>
>Date: Mon, 30 May 2022 14:28:08 +0900
>Subject: [PATCH] [CMake][WPE] WebKitTestRunner shouldn't link object files of
> JavaScriptCore and WebCore https://bugs.webkit.org/show_bug.cgi?id=241002
>
>Reviewed by Don Olmstead.
>
>243269@main removed `WebKit` from `WebKitTestRunner_FRAMEWORKS` for
>WPE. But, it should be there not to link object files of
>JavaScriptCore and WebCore to WebKitTestRunner. In WPE builds,
>JavaScriptCore and WebCore API are exported from WebKit shared
>library. WebKit consumers shouldn't link with object files of
>JavaScriptCore and WebCore.
>
>However, adding `WebKit` to `WebKitTestRunner_FRAMEWORKS` introduced a
>new problem that the object file of LowLevelInterpreter.cpp was linked
>into WebKitTestRunner. This problem was fixed by changing
>LowLevelInterpreterLib to a STATIC library.
>
>* Source/JavaScriptCore/CMakeLists.txt:
>* Tools/WebKitTestRunner/CMakeLists.txt:
>* Tools/WebKitTestRunner/PlatformGTK.cmake:
>* Tools/WebKitTestRunner/PlatformWin.cmake:
>---
> Source/JavaScriptCore/CMakeLists.txt     | 12 +++---------
> Tools/WebKitTestRunner/CMakeLists.txt    |  1 +
> Tools/WebKitTestRunner/PlatformGTK.cmake |  4 ----
> Tools/WebKitTestRunner/PlatformWin.cmake |  4 ----
> 4 files changed, 4 insertions(+), 17 deletions(-)
>
>diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
>index ebf30f7bec38..bb4ad01e4262 100644
>--- a/Source/JavaScriptCore/CMakeLists.txt
>+++ b/Source/JavaScriptCore/CMakeLists.txt
>@@ -463,7 +463,7 @@ if (MSVC AND NOT ENABLE_C_LOOP)
>         COMMAND ${MASM_EXECUTABLE} ${LLINT_MASM_FLAGS} ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.asm
>         VERBATIM)
>     list(APPEND JavaScriptCore_SOURCES ${JavaScriptCore_DERIVED_SOURCES_DIR}/LowLevelInterpreterWin.obj)
>-    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp)
>+    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp)
> else ()
>     # As there's poor toolchain support for using `.file` directives in
>     # inline asm (i.e. there's no way to avoid clashes with the `.file`
>@@ -472,7 +472,7 @@ else ()
>     # an object file. We only need to do this for LowLevelInterpreter.cpp
>     # and cmake doesn't allow us to introduce a compiler wrapper for a
>     # single source file, so we need to create a separate target for it.
>-    add_library(LowLevelInterpreterLib OBJECT llint/LowLevelInterpreter.cpp
>+    add_library(LowLevelInterpreterLib STATIC llint/LowLevelInterpreter.cpp
>         ${JavaScriptCore_DERIVED_SOURCES_DIR}/${LLIntOutput})
> endif ()
> 
>@@ -1489,13 +1489,7 @@ if (CMAKE_COMPILER_IS_GNUCXX AND GCC_OFFLINEASM_SOURCE_MAP)
>         COMPILE_OPTIONS "-fno-lto")
> endif ()
> 
>-# When building JavaScriptCore as an object library, we need to make sure the
>-# lowlevelinterpreter lib objects get propogated.
>-if (${JavaScriptCore_LIBRARY_TYPE} STREQUAL "OBJECT")
>-    list(APPEND JavaScriptCore_PRIVATE_LIBRARIES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
>-else ()
>-    list(APPEND JavaScriptCore_SOURCES $<TARGET_OBJECTS:LowLevelInterpreterLib>)
>-endif ()
>+list(APPEND JavaScriptCore_PRIVATE_LIBRARIES LowLevelInterpreterLib)
> 
> WEBKIT_COMPUTE_SOURCES(JavaScriptCore)
> WEBKIT_FRAMEWORK(JavaScriptCore)
>diff --git a/Tools/WebKitTestRunner/CMakeLists.txt b/Tools/WebKitTestRunner/CMakeLists.txt
>index 9cd69944436a..f21a68277b40 100644
>--- a/Tools/WebKitTestRunner/CMakeLists.txt
>+++ b/Tools/WebKitTestRunner/CMakeLists.txt
>@@ -26,6 +26,7 @@ set(WebKitTestRunner_FRAMEWORKS
>     JavaScriptCore
>     WebCore
>     WebCoreTestSupport
>+    WebKit
> )
> 
> if (COMPILER_IS_GCC_OR_CLANG)
>diff --git a/Tools/WebKitTestRunner/PlatformGTK.cmake b/Tools/WebKitTestRunner/PlatformGTK.cmake
>index a87adedcc0e1..8e434fbb2d6c 100644
>--- a/Tools/WebKitTestRunner/PlatformGTK.cmake
>+++ b/Tools/WebKitTestRunner/PlatformGTK.cmake
>@@ -33,10 +33,6 @@ list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES
>     GTK::GTK
> )
> 
>-list(APPEND WebKitTestRunner_FRAMEWORKS
>-    WebKit
>-)
>-
> list(APPEND WebKitTestRunnerInjectedBundle_SOURCES
>     InjectedBundle/atspi/AccessibilityControllerAtspi.cpp
>     InjectedBundle/atspi/AccessibilityNotificationHandler.cpp
>diff --git a/Tools/WebKitTestRunner/PlatformWin.cmake b/Tools/WebKitTestRunner/PlatformWin.cmake
>index 453f2c7a3842..ca49792e9dd1 100644
>--- a/Tools/WebKitTestRunner/PlatformWin.cmake
>+++ b/Tools/WebKitTestRunner/PlatformWin.cmake
>@@ -30,10 +30,6 @@ list(APPEND WebKitTestRunner_LIBRARIES
>     Oleacc
> )
> 
>-list(APPEND WebKitTestRunner_FRAMEWORKS
>-    WebKit
>-)
>-
> list(APPEND WebKitTestRunnerInjectedBundle_LIBRARIES
>     $<TARGET_OBJECTS:WebCoreTestSupport>
> )
>-- 
>2.25.1
>

Actions: View | Formatted Diff | Diff

Attachments on bug 241002: 459802 | 459849 | 459850 | 459852