Commit 5c44b2a9 authored by George Burgess IV's avatar George Burgess IV Committed by Commit Bot

compiler: remove `!is_android` from CrOS thinlto checks

This was originally added for linux-chromeos builds. Now that we have
is_chromeos_device here, it's redundant, and it unintentionally disables
ThinLTO/CFI for ARC pieces of non-linux CrOS builds.

Bug: 1062713, 1050199
Change-Id: I27022ed72597a90ae7d2bb385729550fa8d772e6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2108822Reviewed-by: default avatarBob Haarman <inglorion@chromium.org>
Reviewed-by: default avatarNico Weber <thakis@chromium.org>
Reviewed-by: default avatarBen Pastene <bpastene@chromium.org>
Commit-Queue: George Burgess <gbiv@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751505}
parent 3ee80e39
...@@ -69,10 +69,9 @@ declare_args() { ...@@ -69,10 +69,9 @@ declare_args() {
# Use it by default on official-optimized android and Chrome OS builds, but # Use it by default on official-optimized android and Chrome OS builds, but
# not ARC or linux-chromeos since it's been seen to not play nicely with # not ARC or linux-chromeos since it's been seen to not play nicely with
# Chrome's clang. crbug.com/1033839 # Chrome's clang. crbug.com/1033839
use_thin_lto = use_thin_lto = is_cfi || (is_official_build &&
is_cfi || (is_official_build && (target_os == "android" || (target_os == "android" ||
(target_os == "chromeos" && (target_os == "chromeos" && is_chromeos_device)))
is_chromeos_device && !is_android)))
# Performs ThinLTO code generation on Goma. # Performs ThinLTO code generation on Goma.
use_goma_thin_lto = false use_goma_thin_lto = false
......
...@@ -57,7 +57,7 @@ declare_args() { ...@@ -57,7 +57,7 @@ declare_args() {
# crbug.com/1033839. Similarly, don't use this on ARC builds. # crbug.com/1033839. Similarly, don't use this on ARC builds.
is_cfi = is_official_build && is_cfi = is_official_build &&
((target_os == "linux" && !is_chromeos && target_cpu == "x64") || ((target_os == "linux" && !is_chromeos && target_cpu == "x64") ||
(target_os == "chromeos" && is_chromeos_device && !is_android)) (target_os == "chromeos" && is_chromeos_device))
# Enable checks for indirect function calls via a function pointer. # Enable checks for indirect function calls via a function pointer.
# TODO(pcc): remove this when we're ready to add these checks by default. # TODO(pcc): remove this when we're ready to add these checks by default.
......
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