Commit 9ea7ffa8 authored by inglorion's avatar inglorion Committed by Commit Bot

Revert "Disable /guard:cf,nolongjmp in ThinLTO configurations where it breaks."

This reverts crrev.com/c/952666. That commit was a workaround for a
bug which was fixed in Clang r327557, so the workaround is no longer
needed.

R=depranke,brucedawson

Bug: 818086
Change-Id: I98ba3cea051734da2eef81fe1986c9f9b5d9b617
Reviewed-on: https://chromium-review.googlesource.com/998513Reviewed-by: default avatarBruce Dawson <brucedawson@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Bob Haarman <inglorion@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548657}
parent a126aee2
......@@ -366,13 +366,7 @@ config("cfi_linker") {
# turned on either.
# CFG seems to lead to random corruption with incremental linking so turn off
# CFG in component builds. https://crbug.com/812421
# CFG, ThinLTO and RTTI don't currently work together, so turn off
# CFG for that combination. We detect RTTI by looking for
# use_cfi_diag || is_ubsan_vptr || is_ubsan_security, as per
# //build/config/compiler/BUILD.gn.
# TODO(inglorion): Re-enable once figured out, bug https://crbug.com/818086
if (!is_debug && !is_component_build &&
!(use_thin_lto && (use_cfi_diag || is_ubsan_vptr || is_ubsan_security))) {
if (!is_debug && !is_component_build) {
# Turn on CFG in msvc linker, regardless of compiler used. Turn off CFG for
# longjmp (new in VS 2017) because it relies on compiler support which we do
# not have enabled.
......
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