Commit 602678c6 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

win: Remove dead /GL flags.

Nothing sets `is_official_build && !is_clang` anymore.

Once we do use LTO with clang on Win, we'll likely use the
existing use_thinlto codepath instead of these configs.

Bug: 598772,1053958
Change-Id: I58992b86ab395e7cd5119847139aedc446f95b9c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2072417
Commit-Queue: Nico Weber <thakis@chromium.org>
Commit-Queue: Hans Wennborg <hans@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#744295}
parent 62dcab86
...@@ -1998,8 +1998,6 @@ config("optimize") { ...@@ -1998,8 +1998,6 @@ config("optimize") {
# Favor size over speed, /O1 must be before the common flags. # Favor size over speed, /O1 must be before the common flags.
# /O1 implies /Os and /GF. # /O1 implies /Os and /GF.
cflags = [ "/O1" ] + common_optimize_on_cflags + [ "/Oi" ] cflags = [ "/O1" ] + common_optimize_on_cflags + [ "/Oi" ]
# TODO(thakis): Use -flto in official builds here eventually,
# https://crbug.com/598772
} else if (optimize_for_size && !is_nacl) { } else if (optimize_for_size && !is_nacl) {
# Favor size over speed. # Favor size over speed.
# TODO(crbug.com/718650): Fix -Os in PNaCl compiler and remove the is_nacl # TODO(crbug.com/718650): Fix -Os in PNaCl compiler and remove the is_nacl
...@@ -2067,13 +2065,6 @@ config("optimize_max") { ...@@ -2067,13 +2065,6 @@ config("optimize_max") {
# Favor speed over size, /O2 must be before the common flags. # Favor speed over size, /O2 must be before the common flags.
# /O2 implies /Ot, /Oi, and /GF. # /O2 implies /Ot, /Oi, and /GF.
cflags = [ "/O2" ] + common_optimize_on_cflags cflags = [ "/O2" ] + common_optimize_on_cflags
if (is_official_build) {
if (!is_clang) {
cflags += [ "/GL" ] # Whole program optimization.
}
# TODO(crbug.com/598772): Enable -flto for Clang.
}
} else if (optimize_for_fuzzing) { } else if (optimize_for_fuzzing) {
cflags = [ "-O1" ] + common_optimize_on_cflags cflags = [ "-O1" ] + common_optimize_on_cflags
} else { } else {
...@@ -2106,11 +2097,6 @@ config("optimize_speed") { ...@@ -2106,11 +2097,6 @@ config("optimize_speed") {
# Favor speed over size, /O2 must be before the common flags. # Favor speed over size, /O2 must be before the common flags.
# /O2 implies /Ot, /Oi, and /GF. # /O2 implies /Ot, /Oi, and /GF.
cflags = [ "/O2" ] + common_optimize_on_cflags cflags = [ "/O2" ] + common_optimize_on_cflags
# TODO(thakis): Remove is_clang here, https://crbug.com/598772
if (is_official_build && !is_clang) {
cflags += [ "/GL" ] # Whole program optimization.
}
} else if (optimize_for_fuzzing) { } else if (optimize_for_fuzzing) {
cflags = [ "-O1" ] + common_optimize_on_cflags cflags = [ "-O1" ] + common_optimize_on_cflags
} else { } else {
......
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