Commit 850cd207 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot

Explicitly pass -fmerge-all-constants to clang.

Speculative change to try and get the debug bots to link again.

Bug: 829795
Change-Id: I987675ee5c0163f2dc1e725910f9be14ca92aa1e
Reviewed-on: https://chromium-review.googlesource.com/999323Reviewed-by: default avatarHans Wennborg <hans@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#548842}
parent 5d0b6a07
...@@ -221,10 +221,20 @@ config("compiler") { ...@@ -221,10 +221,20 @@ config("compiler") {
# In general, Windows is totally different, but all the other builds share # In general, Windows is totally different, but all the other builds share
# some common GCC configuration. # some common GCC configuration.
if (!is_win) { if (!is_win) {
# Common GCC compiler flags setup. # Common POSIX compiler flags setup.
# -------------------------------- # --------------------------------
cflags += [ "-fno-strict-aliasing" ] # See http://crbug.com/32204 cflags += [ "-fno-strict-aliasing" ] # See http://crbug.com/32204
if (is_clang) {
# Enable -fmerge-all-constants. This used to be the default in clang
# for over a decade. It makes clang non-conforming, but is fairly safe
# in practice and saves some binary size. We might want to consider
# disabling this (https://bugs.llvm.org/show_bug.cgi?id=18538#c13),
# but for now it looks like our build might rely on it
# (https://crbug.com/829795).
cflags += [ "-fmerge-all-constants" ]
}
# Stack protection. # Stack protection.
if (is_mac) { if (is_mac) {
# The strong variant of the stack protector significantly increases # The strong variant of the stack protector significantly increases
......
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