Commit 3c18a663 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Remove optimize_no_wpo

It existed for Windows, and we currently don't do WPO on Windows.
When we bring it back, it'll likely be different from /GL cl.exe-style
WPO.

Depends on https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/2065789

Bug: 1053958,598772
Change-Id: Ie2ea04ad54f0d3b6711ffb7682fe1ae15662cb95
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2066106
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#743283}
parent 894c519c
......@@ -2013,29 +2013,6 @@ config("optimize") {
ldflags = common_optimize_on_ldflags
}
# Same config as 'optimize' but without the WPO flag.
config("optimize_no_wpo") {
if (is_win) {
# Favor size over speed, /O1 must be before the common flags.
# /O1 implies /Os and /GF.
cflags = [ "/O1" ] + common_optimize_on_cflags + [ "/Oi" ]
} else if (optimize_for_size && !is_nacl) {
# Favor size over speed.
# TODO(crbug.com/718650): Fix -Os in PNaCl compiler and remove the is_nacl
# guard above.
if (is_clang) {
cflags = [ "-Oz" ] + common_optimize_on_cflags
} else {
cflags = [ "-Os" ] + common_optimize_on_cflags
}
} else if (optimize_for_fuzzing) {
cflags = [ "-O1" ] + common_optimize_on_cflags
} else {
cflags = [ "-O2" ] + common_optimize_on_cflags
}
ldflags = common_optimize_on_ldflags
}
# Turn off optimizations.
config("no_optimize") {
if (is_win) {
......
......@@ -241,18 +241,15 @@ template("generate_mini_installer") {
]
# This target is special so we manually override most linker flags and
# specify our own to keep the size down. Also make sure that we don't use
# WPO as it's not supported by the mini installer.
# specify our own to keep the size down.
configs -= [
# Initialization may insert unexpected memset calls.
"//build/config/compiler:default_init_stack_vars",
"//build/config/compiler:default_optimization",
"//build/config:executable_config",
"//build/config/win:console",
]
configs += [
":mini_installer_compiler_flags",
"//build/config/compiler:optimize_no_wpo",
"//build/config/sanitizers:link_executable",
"//build/config/win:sdk_link",
"//build/config/win:windowed",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment