From 6aa8fb941df05ad33d75529b4c987cd2e4f933a9 Mon Sep 17 00:00:00 2001 From: "K.Ohta" Date: Sat, 12 Jan 2019 17:35:36 +0900 Subject: [PATCH] [BUILD] Separate threads definition for LTO. --- source/build-cmake/buildvars.dat.tmpl | 2 ++ source/build-cmake/buildvars_mingw_cross_win32.dat.tmpl | 2 ++ source/build-cmake/params/buildvars_linux_params_gcc.dat | 2 +- source/build-cmake/params/buildvars_mingw_params_gcc.dat | 2 +- source/build-cmake/params/buildvars_mingw_params_llvm.dat | 2 +- 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/source/build-cmake/buildvars.dat.tmpl b/source/build-cmake/buildvars.dat.tmpl index abdd05452..3d10bf013 100644 --- a/source/build-cmake/buildvars.dat.tmpl +++ b/source/build-cmake/buildvars.dat.tmpl @@ -23,6 +23,8 @@ USE_RADICAL_OPTIMIZE="Yes" USE_COMMON_DEVICE_LIB="Yes" # "No" or "Yes" USE_WHOLE_PROGRAM_OPTIMIZE="No" +# Threads when using LTO. +LTO_THREADS=6 # "No" or "Yes" USE_OPENMP="No" diff --git a/source/build-cmake/buildvars_mingw_cross_win32.dat.tmpl b/source/build-cmake/buildvars_mingw_cross_win32.dat.tmpl index d759cc4b1..a155fdadb 100644 --- a/source/build-cmake/buildvars_mingw_cross_win32.dat.tmpl +++ b/source/build-cmake/buildvars_mingw_cross_win32.dat.tmpl @@ -17,6 +17,8 @@ LOCAL_ARCH_TYPE="SSE2" USE_LTO="Yes" # "No" or "Yes" USE_WHOLE_PROGRAM_OPTIMIZE="Yes" +# Threads when using LTO. +LTO_THREADS=12 # No" or "Yes" STRIP_SYMBOLS="Yes" diff --git a/source/build-cmake/params/buildvars_linux_params_gcc.dat b/source/build-cmake/params/buildvars_linux_params_gcc.dat index 32e09840f..461986354 100644 --- a/source/build-cmake/params/buildvars_linux_params_gcc.dat +++ b/source/build-cmake/params/buildvars_linux_params_gcc.dat @@ -136,7 +136,7 @@ esac case ${USE_LTO} in "Yes" | "yes" | "YES" ) - MAKEFLAGS_LINK_BASE2="-flto=6 -flto-compression-level=9 ${LTO_FLAGS} ${MAKEFLAGS_BASE2}" + MAKEFLAGS_LINK_BASE2="-flto=${LTO_THREADS} -flto-compression-level=9 ${LTO_FLAGS} ${MAKEFLAGS_BASE2}" MAKEFLAGS_BASE2="-flto -flto-compression-level=9 -ffat-lto-objects ${MAKEFLAGS_BASE2}" ;; "No" | "no" | "NO" | * ) diff --git a/source/build-cmake/params/buildvars_mingw_params_gcc.dat b/source/build-cmake/params/buildvars_mingw_params_gcc.dat index c5db4c6e9..fbc814e8f 100644 --- a/source/build-cmake/params/buildvars_mingw_params_gcc.dat +++ b/source/build-cmake/params/buildvars_mingw_params_gcc.dat @@ -88,7 +88,7 @@ esac case ${USE_LTO} in "Yes" | "yes" | "YES" ) - MAKEFLAGS_LINK_BASE="-flto ${LTO_FLAGS} ${MAKEFLAGS_BASE2}" + MAKEFLAGS_LINK_BASE="-flto=${LTO_THREADS} ${LTO_FLAGS} ${MAKEFLAGS_BASE2}" MAKEFLAGS_BASE2="-flto -ffat-lto-objects ${MAKEFLAGS_BASE2}" ;; "No" | "no" | "NO" | * ) diff --git a/source/build-cmake/params/buildvars_mingw_params_llvm.dat b/source/build-cmake/params/buildvars_mingw_params_llvm.dat index 9a5db5b79..a2cba8cc0 100644 --- a/source/build-cmake/params/buildvars_mingw_params_llvm.dat +++ b/source/build-cmake/params/buildvars_mingw_params_llvm.dat @@ -119,7 +119,7 @@ esac case ${USE_LTO} in "Yes" | "yes" | "YES" ) - MAKEFLAGS_LINK_BASE2="-flto=6 ${LTO_FLAGS} ${MAKEFLAGS_BASE2}" + MAKEFLAGS_LINK_BASE2="-flto=${LTO_THREADS} ${LTO_FLAGS} ${MAKEFLAGS_BASE2}" MAKEFLAGS_BASE2="-flto -ffat-lto-objects ${MAKEFLAGS_BASE2}" ;; "No" | "no" | "NO" | * ) -- 2.11.0