OSDN Git Service
(root)
/
csp-qt
/
common_source_project-fm7.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
25e837f
)
[BUILD] Separate threads definition for LTO.
author
K.Ohta
<whatisthis.sowhat@gmail.com>
Sat, 12 Jan 2019 08:35:36 +0000
(17:35 +0900)
committer
K.Ohta
<whatisthis.sowhat@gmail.com>
Sat, 12 Jan 2019 08:35:36 +0000
(17:35 +0900)
source/build-cmake/buildvars.dat.tmpl
patch
|
blob
|
history
source/build-cmake/buildvars_mingw_cross_win32.dat.tmpl
patch
|
blob
|
history
source/build-cmake/params/buildvars_linux_params_gcc.dat
patch
|
blob
|
history
source/build-cmake/params/buildvars_mingw_params_gcc.dat
patch
|
blob
|
history
source/build-cmake/params/buildvars_mingw_params_llvm.dat
patch
|
blob
|
history
diff --git
a/source/build-cmake/buildvars.dat.tmpl
b/source/build-cmake/buildvars.dat.tmpl
index
abdd054
..
3d10bf0
100644
(file)
--- 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"
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"
# "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
d759cc4
..
a155fda
100644
(file)
--- 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"
USE_LTO="Yes"
# "No" or "Yes"
USE_WHOLE_PROGRAM_OPTIMIZE="Yes"
+# Threads when using LTO.
+LTO_THREADS=12
# No" or "Yes"
STRIP_SYMBOLS="Yes"
# 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
32e0984
..
4619863
100644
(file)
--- 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" )
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" | * )
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
c5db4c6
..
fbc814e
100644
(file)
--- 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" )
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" | * )
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
9a5db5b
..
a2cba8c
100644
(file)
--- 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" )
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" | * )
MAKEFLAGS_BASE2="-flto -ffat-lto-objects ${MAKEFLAGS_BASE2}"
;;
"No" | "no" | "NO" | * )