1 |
From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001 |
From 307a0f63dd9b118f4b8470ed3d7567e81fdb7a6d Mon Sep 17 00:00:00 2001 |
2 |
From: Mike Gilbert <floppym@gentoo.org> |
From: Mike Gilbert <floppym@gentoo.org> |
3 |
Date: Wed, 28 Sep 2022 09:39:57 +0000 |
Date: Sat, 17 Dec 2022 10:49:23 +0000 |
4 |
Subject: [PATCH] Disable various compiler configs |
Subject: [PATCH] Disable various compiler configs |
5 |
|
|
6 |
--- |
--- |
7 |
build/config/compiler/BUILD.gn | 133 +++++---------------------------- |
build/config/compiler/BUILD.gn | 134 +++++---------------------------- |
8 |
1 file changed, 17 insertions(+), 116 deletions(-) |
1 file changed, 17 insertions(+), 117 deletions(-) |
9 |
|
|
10 |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
11 |
index 249cf0b..5bb0f4e 100644 |
index d72f810..35db3da 100644 |
12 |
--- a/build/config/compiler/BUILD.gn |
--- a/build/config/compiler/BUILD.gn |
13 |
+++ b/build/config/compiler/BUILD.gn |
+++ b/build/config/compiler/BUILD.gn |
14 |
@@ -274,9 +274,7 @@ config("compiler") { |
@@ -276,9 +276,7 @@ config("compiler") { |
15 |
|
|
16 |
configs += [ |
configs += [ |
17 |
# See the definitions below. |
# See the definitions below. |
21 |
":compiler_codegen", |
":compiler_codegen", |
22 |
":compiler_deterministic", |
":compiler_deterministic", |
23 |
] |
] |
24 |
@@ -527,36 +525,6 @@ config("compiler") { |
@@ -529,37 +527,6 @@ config("compiler") { |
25 |
ldflags += [ "-Wl,-z,keep-text-section-prefix" ] |
ldflags += [ "-Wl,-z,keep-text-section-prefix" ] |
26 |
} |
} |
27 |
|
|
28 |
- if (is_clang && !is_nacl && current_os != "zos") { |
- if (is_clang && !is_nacl && current_os != "zos") { |
29 |
- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] |
- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] |
30 |
|
- if (save_reproducers_on_lld_crash && use_lld) { |
31 |
|
- ldflags += [ |
32 |
|
- "-fcrash-diagnostics=all", |
33 |
|
- "-fcrash-diagnostics-dir=" + clang_diagnostic_dir, |
34 |
|
- ] |
35 |
|
- } |
36 |
- |
- |
37 |
- # TODO(hans): Remove this once Clang generates better optimized debug info |
- # TODO(hans): Remove this once Clang generates better optimized debug info |
38 |
- # by default. https://crbug.com/765793 |
- # by default. https://crbug.com/765793 |
56 |
- } |
- } |
57 |
- } |
- } |
58 |
- |
- |
59 |
- # Rust compiler setup (for either clang or rustc). |
# Rust compiler setup (for either clang or rustc). |
60 |
- if (enable_rust) { |
if (enable_rust) { |
61 |
- defines += [ "RUST_ENABLED" ] |
defines += [ "RUST_ENABLED" ] |
62 |
- } |
@@ -1300,46 +1267,6 @@ config("compiler_deterministic") { |
|
- |
|
|
# C11/C++11 compiler flags setup. |
|
|
# --------------------------- |
|
|
if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) || |
|
|
@@ -1260,46 +1228,6 @@ config("compiler_deterministic") { |
|
63 |
} |
} |
64 |
} |
} |
65 |
|
|
106 |
# Tells the compiler not to use absolute paths when passing the default |
# Tells the compiler not to use absolute paths when passing the default |
107 |
# paths to the tools it invokes. We don't want this because we don't |
# paths to the tools it invokes. We don't want this because we don't |
108 |
# really need it and it can mess up the goma cache entries. |
# really need it and it can mess up the goma cache entries. |
109 |
@@ -1318,27 +1246,6 @@ config("compiler_deterministic") { |
@@ -1358,27 +1285,6 @@ config("compiler_deterministic") { |
110 |
} |
} |
111 |
} |
} |
112 |
|
|
134 |
config("rustc_revision") { |
config("rustc_revision") { |
135 |
if (enable_rust && defined(rustc_version)) { |
if (enable_rust && defined(rustc_version)) { |
136 |
# Similar to the above config, this is here so that all files get |
# Similar to the above config, this is here so that all files get |
137 |
@@ -1624,7 +1531,7 @@ config("chromium_code") { |
@@ -1668,7 +1574,7 @@ config("chromium_code") { |
138 |
defines = [ "_HAS_NODISCARD" ] |
defines = [ "_HAS_NODISCARD" ] |
139 |
} |
} |
140 |
} else { |
} else { |
143 |
if (treat_warnings_as_errors) { |
if (treat_warnings_as_errors) { |
144 |
cflags += [ "-Werror" ] |
cflags += [ "-Werror" ] |
145 |
|
|
146 |
@@ -1633,10 +1540,6 @@ config("chromium_code") { |
@@ -1677,10 +1583,6 @@ config("chromium_code") { |
147 |
# well. |
# well. |
148 |
ldflags = [ "-Werror" ] |
ldflags = [ "-Werror" ] |
149 |
} |
} |
154 |
|
|
155 |
# In Chromium code, we define __STDC_foo_MACROS in order to get the |
# In Chromium code, we define __STDC_foo_MACROS in order to get the |
156 |
# C99 macros on Mac and Linux. |
# C99 macros on Mac and Linux. |
157 |
@@ -1645,16 +1548,6 @@ config("chromium_code") { |
@@ -1689,16 +1591,6 @@ config("chromium_code") { |
158 |
"__STDC_FORMAT_MACROS", |
"__STDC_FORMAT_MACROS", |
159 |
] |
] |
160 |
|
|
171 |
if (is_mac) { |
if (is_mac) { |
172 |
cflags_objc = [ "-Wobjc-missing-property-synthesis" ] |
cflags_objc = [ "-Wobjc-missing-property-synthesis" ] |
173 |
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] |
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] |
174 |
@@ -2047,7 +1940,8 @@ config("default_stack_frames") { |
@@ -2091,7 +1983,8 @@ config("default_stack_frames") { |
175 |
} |
} |
176 |
|
|
177 |
# Default "optimization on" config. |
# Default "optimization on" config. |
181 |
if (is_win) { |
if (is_win) { |
182 |
if (chrome_pgo_phase != 2) { |
if (chrome_pgo_phase != 2) { |
183 |
# Favor size over speed, /O1 must be before the common flags. |
# Favor size over speed, /O1 must be before the common flags. |
184 |
@@ -2092,7 +1986,8 @@ config("optimize") { |
@@ -2136,7 +2029,8 @@ config("optimize") { |
185 |
} |
} |
186 |
|
|
187 |
# Turn off optimizations. |
# Turn off optimizations. |
191 |
if (is_win) { |
if (is_win) { |
192 |
cflags = [ |
cflags = [ |
193 |
"/Od", # Disable optimization. |
"/Od", # Disable optimization. |
194 |
@@ -2132,7 +2027,8 @@ config("no_optimize") { |
@@ -2176,7 +2070,8 @@ config("no_optimize") { |
195 |
# Turns up the optimization level. On Windows, this implies whole program |
# Turns up the optimization level. On Windows, this implies whole program |
196 |
# optimization and link-time code generation which is very expensive and should |
# optimization and link-time code generation which is very expensive and should |
197 |
# be used sparingly. |
# be used sparingly. |
201 |
if (is_nacl && is_nacl_irt) { |
if (is_nacl && is_nacl_irt) { |
202 |
# The NaCl IRT is a special case and always wants its own config. |
# The NaCl IRT is a special case and always wants its own config. |
203 |
# Various components do: |
# Various components do: |
204 |
@@ -2165,7 +2061,8 @@ config("optimize_max") { |
@@ -2209,7 +2104,8 @@ config("optimize_max") { |
205 |
# |
# |
206 |
# TODO(crbug.com/621335) - rework how all of these configs are related |
# TODO(crbug.com/621335) - rework how all of these configs are related |
207 |
# so that we don't need this disclaimer. |
# so that we don't need this disclaimer. |
211 |
if (is_nacl && is_nacl_irt) { |
if (is_nacl && is_nacl_irt) { |
212 |
# The NaCl IRT is a special case and always wants its own config. |
# The NaCl IRT is a special case and always wants its own config. |
213 |
# Various components do: |
# Various components do: |
214 |
@@ -2191,7 +2088,8 @@ config("optimize_speed") { |
@@ -2235,7 +2131,8 @@ config("optimize_speed") { |
215 |
} |
} |
216 |
} |
} |
217 |
|
|
221 |
cflags = [ "-O1" ] + common_optimize_on_cflags |
cflags = [ "-O1" ] + common_optimize_on_cflags |
222 |
rustflags = [ "-Copt-level=1" ] |
rustflags = [ "-Copt-level=1" ] |
223 |
ldflags = common_optimize_on_ldflags |
ldflags = common_optimize_on_ldflags |
224 |
@@ -2311,7 +2209,8 @@ config("win_pdbaltpath") { |
@@ -2355,7 +2252,8 @@ config("win_pdbaltpath") { |
225 |
} |
} |
226 |
|
|
227 |
# Full symbols. |
# Full symbols. |
231 |
if (is_win) { |
if (is_win) { |
232 |
if (is_clang) { |
if (is_clang) { |
233 |
cflags = [ "/Z7" ] # Debug information in the .obj files. |
cflags = [ "/Z7" ] # Debug information in the .obj files. |
234 |
@@ -2445,7 +2344,8 @@ config("symbols") { |
@@ -2487,7 +2385,8 @@ config("symbols") { |
235 |
# Minimal symbols. |
# Minimal symbols. |
236 |
# This config guarantees to hold symbol for stack trace which are shown to user |
# This config guarantees to hold symbol for stack trace which are shown to user |
237 |
# when crash happens in unittests running on buildbot. |
# when crash happens in unittests running on buildbot. |
241 |
if (is_win) { |
if (is_win) { |
242 |
# Functions, files, and line tables only. |
# Functions, files, and line tables only. |
243 |
cflags = [] |
cflags = [] |
244 |
@@ -2517,7 +2417,8 @@ config("minimal_symbols") { |
@@ -2560,7 +2459,8 @@ config("minimal_symbols") { |
245 |
# This configuration contains function names only. That is, the compiler is |
# This configuration contains function names only. That is, the compiler is |
246 |
# told to not generate debug information and the linker then just puts function |
# told to not generate debug information and the linker then just puts function |
247 |
# names in the final debug information. |
# names in the final debug information. |
252 |
ldflags = [ "/DEBUG" ] |
ldflags = [ "/DEBUG" ] |
253 |
|
|
254 |
-- |
-- |
255 |
2.35.1 |
2.38.2 |
|
|
|