Changeset 244895 in webkit

Timestamp:

May 2, 2019 4:39:35 PM (5 years ago)

Author:

chris.reid@sony.com

Message:

[CMake] Add support for LTO builds
​https://bugs.webkit.org/show_bug.cgi?id=188986

Reviewed by Don Olmstead.

.:

Add LTO_MODE cmake variable to enable flto in clang builds.
Add support to use ld.lld to build with LTO.

• Source/cmake/OptionsCommon.cmake:
• Source/cmake/WebKitCompilerFlags.cmake:

Tools:

Add support to configure --lto-mode with cmake builds.

• Scripts/build-webkit:
• Scripts/webkitdirs.pm:

(generateBuildSystemFromCMakeProject):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/cmake/OptionsCommon.cmake (modified) (1 diff)
• Source/cmake/WebKitCompilerFlags.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/build-webkit (modified) (1 diff)
• Tools/Scripts/webkitdirs.pm (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2019-05-02  Christopher Reid  <chris.reid@sony.com>
+
+        [CMake] Add support for LTO builds
+        https://bugs.webkit.org/show_bug.cgi?id=188986
+
+        Reviewed by Don Olmstead.
+
+        Add LTO_MODE cmake variable to enable flto in clang builds.
+        Add support to use ld.lld to build with LTO.
+
+        * Source/cmake/OptionsCommon.cmake:
+        * Source/cmake/WebKitCompilerFlags.cmake:
+
 2019-05-02  Don Olmstead  <don.olmstead@sony.com>
 

trunk/Source/cmake/OptionsCommon.cmake

@@ -60 +60 @@
 endif ()
 
+# Use ld.lld when building with LTO
+CMAKE_DEPENDENT_OPTION(USE_LD_LLD "Use LLD linker" ON
+                       "LTO_MODE;NOT USE_LD_GOLD;NOT WIN32" OFF)
+if (USE_LD_LLD)
+    execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=lld -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)
+    if ("${LD_VERSION}" MATCHES "LLD")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld -Wl,--disable-new-dtags")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld -Wl,--disable-new-dtags")
+    else ()
+        set(USE_LD_LLD OFF)
+    endif ()
+endif ()
+
 # Use ld.gold if it is available and isn't disabled explicitly
 CMAKE_DEPENDENT_OPTION(USE_LD_GOLD "Use GNU gold linker" ON
-                       "NOT CXX_ACCEPTS_MFIX_CORTEX_A53_835769;NOT ARM_TRADITIONAL_DETECTED;NOT WIN32;NOT APPLE" OFF)
+                       "NOT CXX_ACCEPTS_MFIX_CORTEX_A53_835769;NOT ARM_TRADITIONAL_DETECTED;NOT WIN32;NOT APPLE;NOT USE_LD_LLD" OFF)
 if (USE_LD_GOLD)
     execute_process(COMMAND ${CMAKE_C_COMPILER} -fuse-ld=gold -Wl,--version ERROR_QUIET OUTPUT_VARIABLE LD_VERSION)

trunk/Source/cmake/WebKitCompilerFlags.cmake

@@ -165 +165 @@
     # See https://bugs.webkit.org/show_bug.cgi?id=77327
     set(CMAKE_SHARED_LINKER_FLAGS_DEBUG "-Wl,--no-keep-memory ${CMAKE_SHARED_LINKER_FLAGS_DEBUG}")
+endif ()
+
+if (LTO_MODE AND COMPILER_IS_CLANG)
+    set(CMAKE_C_FLAGS "-flto=${LTO_MODE} ${CMAKE_C_FLAGS}")
+    set(CMAKE_CXX_FLAGS "-flto=${LTO_MODE} ${CMAKE_CXX_FLAGS}")
+    set(CMAKE_EXE_LINKER_FLAGS "-flto=${LTO_MODE} ${CMAKE_EXE_LINKER_FLAGS}")
+    set(CMAKE_SHARED_LINKER_FLAGS "-flto=${LTO_MODE} ${CMAKE_SHARED_LINKER_FLAGS}")
+    set(CMAKE_MODULE_LINKER_FLAGS "-flto=${LTO_MODE} ${CMAKE_MODULE_LINKER_FLAGS}")
 endif ()
 

trunk/Tools/ChangeLog

@@ +1 @@
+2019-05-02  Christopher Reid  <chris.reid@sony.com>
+
+        [CMake] Add support for LTO builds
+        https://bugs.webkit.org/show_bug.cgi?id=188986
+
+        Reviewed by Don Olmstead.
+
+        Add support to configure --lto-mode with cmake builds.
+
+        * Scripts/build-webkit:
+        * Scripts/webkitdirs.pm:
+        (generateBuildSystemFromCMakeProject):
+
 2019-05-02  John Wilander  <wilander@apple.com>
 

trunk/Tools/Scripts/build-webkit

@@ -115 +115 @@
   --coverage                        Enable code coverage support (Mac only)
   --analyze                         Enable static anaylsis (iOS and Mac only)
-  --lto-mode=<mode>                 Set Link Time Optimization mode (full, thin, or none) (Xcode only)
+  --lto-mode=<mode>                 Set Link Time Optimization mode (full, thin, or none) (LLVM only)
 
   --gtk                             Build the GTK+ port

trunk/Tools/Scripts/webkitdirs.pm

@@ -2180 +2180 @@
     push @args, "-DENABLE_SANITIZERS=address" if asanIsEnabled();
 
+    push @args, "-DLTO_MODE=$ltoMode" if ltoMode();
+
     push @args, '-DCMAKE_TOOLCHAIN_FILE=Platform/PlayStation' if isPlayStation();