Bug 1680057 - New PM LTO: Don't take the elif block on Windows r=firefox-build-system-reviewers,mhentges

Windows being Windows, with its own spellings for everything, let's stay within the WINNT block regardless of whether we meet the compiler requirement.

Differential Revision: https://phabricator.services.mozilla.com/D98355
This commit is contained in:
David Major 2020-12-02 17:02:01 +00:00
parent 722ab0f916
commit 87237b867f

View File

@ -300,11 +300,12 @@ def lto(
# during LTO. Further we can use the resulting size savings to increase
# the import limit in hot functions.
if newpm_flags:
if target.os == "WINNT" and (automation or c_compiler.version >= "12.0.0"):
if target.os == "WINNT":
# On Windows, this flag requires a change from clang-12, which
# is applied as a patch to our automation toolchain.
ldflags.append("-opt:ltonewpassmanager")
ldflags.append("-mllvm:-import-hot-multiplier=30")
if automation or c_compiler.version >= "12.0.0":
ldflags.append("-opt:ltonewpassmanager")
ldflags.append("-mllvm:-import-hot-multiplier=30")
elif select_linker.KIND != "ld64" and c_compiler.type == "clang":
ldflags.append("-Wl,-plugin-opt=new-pass-manager")
ldflags.append("-Wl,-plugin-opt=-import-hot-multiplier=30")