289 lines
9.5 KiB
Diff
289 lines
9.5 KiB
Diff
--- a/build/config/compiler/BUILD.gn
|
|
+++ b/build/config/compiler/BUILD.gn
|
|
@@ -311,9 +311,6 @@
|
|
|
|
configs += [
|
|
# See the definitions below.
|
|
- ":clang_revision",
|
|
- ":rustc_revision",
|
|
- ":compiler_cpu_abi",
|
|
":compiler_codegen",
|
|
":compiler_deterministic",
|
|
]
|
|
@@ -587,63 +584,6 @@
|
|
ldflags += [ "-Wl,-z,keep-text-section-prefix" ]
|
|
}
|
|
|
|
- if (is_clang && !is_nacl) {
|
|
- cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
|
|
- if (save_reproducers_on_lld_crash && use_lld) {
|
|
- ldflags += [
|
|
- "-fcrash-diagnostics=all",
|
|
- "-fcrash-diagnostics-dir=" + clang_diagnostic_dir,
|
|
- ]
|
|
- }
|
|
-
|
|
- # TODO(hans): Remove this once Clang generates better optimized debug info
|
|
- # by default. https://crbug.com/765793
|
|
- cflags += [
|
|
- "-mllvm",
|
|
- "-instcombine-lower-dbg-declare=0",
|
|
- ]
|
|
- if (!is_debug && use_thin_lto && is_a_target_toolchain) {
|
|
- if (is_win) {
|
|
- ldflags += [ "-mllvm:-instcombine-lower-dbg-declare=0" ]
|
|
- } else {
|
|
- ldflags += [ "-Wl,-mllvm,-instcombine-lower-dbg-declare=0" ]
|
|
- }
|
|
- }
|
|
-
|
|
- # TODO(crbug.com/40283598): This causes binary size growth and potentially
|
|
- # other problems.
|
|
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
|
|
- if (default_toolchain != "//build/toolchain/cros:target" &&
|
|
- !llvm_android_mainline) {
|
|
- cflags += [
|
|
- # "-mllvm",
|
|
- # "-split-threshold-for-reg-with-hint=0",
|
|
- ]
|
|
- if (use_thin_lto && is_a_target_toolchain) {
|
|
- if (is_win) {
|
|
- # ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
|
|
- } else {
|
|
- # ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
- if (use_avx2 || use_avx512 || use_fma || current_cpu == "arm64" || is_mac) {
|
|
- if (is_win) {
|
|
- cflags += [ "/clang:-ffp-contract=fast" ]
|
|
- } else {
|
|
- cflags += [ "-ffp-contract=fast" ]
|
|
- }
|
|
- } else {
|
|
- # TODO(crbug.com/40192287): Investigate why/if this should be needed.
|
|
- if (is_win) {
|
|
- cflags += [ "/clang:-ffp-contract=off" ]
|
|
- } else {
|
|
- cflags += [ "-ffp-contract=off" ]
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
# C11/C++11 compiler flags setup.
|
|
# ---------------------------
|
|
if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) ||
|
|
@@ -1748,52 +1688,6 @@
|
|
}
|
|
}
|
|
|
|
- # Makes builds independent of absolute file path.
|
|
- if (is_clang && strip_absolute_paths_from_debug_symbols) {
|
|
- # If debug option is given, clang includes $cwd in debug info by default.
|
|
- # For such build, this flag generates reproducible obj files even we use
|
|
- # different build directory like "out/feature_a" and "out/feature_b" if
|
|
- # we build same files with same compile flag.
|
|
- # Other paths are already given in relative, no need to normalize them.
|
|
- if (is_nacl) {
|
|
- # TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
|
|
- cflags += [
|
|
- "-Xclang",
|
|
- "-fdebug-compilation-dir",
|
|
- "-Xclang",
|
|
- ".",
|
|
- ]
|
|
- } else {
|
|
- # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
|
|
- # and -fcoverage-compilation-dir=.
|
|
- cflags += [ "-ffile-compilation-dir=." ]
|
|
-
|
|
- # Convert absolute paths to relative paths. Expands to, for example:
|
|
- # -file-prefix-map /path/to/chromium/src=../..
|
|
- swiftflags += [
|
|
- "-file-prefix-map",
|
|
- rebase_path("//.", "") + "=" + rebase_path("//.", root_build_dir),
|
|
- ]
|
|
- }
|
|
- if (!is_win) {
|
|
- # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
|
|
- asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
|
|
- }
|
|
-
|
|
- if (is_win && use_lld) {
|
|
- if (symbol_level == 2 || (is_clang && using_sanitizer)) {
|
|
- # Absolutize source file paths for PDB. Pass the real build directory
|
|
- # if the pdb contains source-level debug information and if linker
|
|
- # reproducibility is not critical.
|
|
- ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]
|
|
- } else {
|
|
- # Use a fake fixed base directory for paths in the pdb to make the pdb
|
|
- # output fully deterministic and independent of the build directory.
|
|
- ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]
|
|
- }
|
|
- }
|
|
- }
|
|
-
|
|
# Tells the compiler not to use absolute paths when passing the default
|
|
# paths to the tools it invokes. We don't want this because we don't
|
|
# really need it and it can mess up the RBE cache entries.
|
|
@@ -1812,40 +1706,6 @@
|
|
}
|
|
}
|
|
|
|
-config("clang_revision") {
|
|
- if (is_clang && clang_base_path == default_clang_base_path &&
|
|
- current_os != "zos") {
|
|
- update_args = [
|
|
- "--print-revision",
|
|
- "--verify-version=$clang_version",
|
|
- ]
|
|
- if (llvm_force_head_revision) {
|
|
- update_args += [ "--llvm-force-head-revision" ]
|
|
- }
|
|
- clang_revision = exec_script("//tools/clang/scripts/update.py",
|
|
- update_args,
|
|
- "trim string")
|
|
-
|
|
- # This is here so that all files get recompiled after a clang roll and
|
|
- # when turning clang on or off. (defines are passed via the command line,
|
|
- # and build system rebuild things when their commandline changes). Nothing
|
|
- # should ever read this define.
|
|
- defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ]
|
|
- }
|
|
-}
|
|
-
|
|
-config("rustc_revision") {
|
|
- if (rustc_revision != "") {
|
|
- # Similar to the above config, this is here so that all files get recompiled
|
|
- # after a rustc roll. Nothing should ever read this cfg. This will not be
|
|
- # set if a custom toolchain is used.
|
|
- rustflags = [
|
|
- "--cfg",
|
|
- "cr_rustc_revision=\"$rustc_revision\"",
|
|
- ]
|
|
- }
|
|
-}
|
|
-
|
|
config("compiler_arm_fpu") {
|
|
if (current_cpu == "arm" && !is_ios && !is_nacl) {
|
|
cflags = [ "-mfpu=$arm_fpu" ]
|
|
@@ -2252,11 +2112,7 @@
|
|
defines = [ "_HAS_NODISCARD" ]
|
|
}
|
|
} else {
|
|
- cflags = [ "-Wall" ]
|
|
- if (is_clang) {
|
|
- # Enable extra warnings for chromium_code when we control the compiler.
|
|
- cflags += [ "-Wextra" ]
|
|
- }
|
|
+ cflags = []
|
|
|
|
# In Chromium code, we define __STDC_foo_MACROS in order to get the
|
|
# C99 macros on Mac and Linux.
|
|
@@ -2265,24 +2121,6 @@
|
|
"__STDC_FORMAT_MACROS",
|
|
]
|
|
|
|
- if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
|
|
- current_cpu != "s390" && current_cpu != "ppc64" &&
|
|
- current_cpu != "mips" && current_cpu != "mips64" &&
|
|
- current_cpu != "riscv64" && current_cpu != "loong64") {
|
|
- # Non-chromium code is not guaranteed to compile cleanly with
|
|
- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
|
|
- # disabled, so only do that for Release build.
|
|
- fortify_level = "2"
|
|
-
|
|
- # ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3
|
|
- # implementation with a few custom glibc patches. Use that if it's
|
|
- # available.
|
|
- if (is_chromeos_device && !lacros_use_chromium_toolchain) {
|
|
- fortify_level = "3"
|
|
- }
|
|
- defines += [ "_FORTIFY_SOURCE=" + fortify_level ]
|
|
- }
|
|
-
|
|
if (is_apple) {
|
|
cflags_objc = [ "-Wimplicit-retain-self" ]
|
|
cflags_objcc = [ "-Wimplicit-retain-self" ]
|
|
@@ -2950,7 +2788,8 @@
|
|
# [0]: https://pinpoint-dot-chromeperf.appspot.com/job/147634a8be0000
|
|
# [1]: https://pinpoint-dot-chromeperf.appspot.com/job/132bc772be0000
|
|
# [2]: https://crrev.com/c/5447532
|
|
-config("optimize") {
|
|
+config("optimize") { }
|
|
+config("xoptimize") {
|
|
if (is_win) {
|
|
# clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for
|
|
# consistency with the other platforms.
|
|
@@ -3000,7 +2839,8 @@
|
|
}
|
|
|
|
# Turn off optimizations.
|
|
-config("no_optimize") {
|
|
+config("no_optimize") { }
|
|
+config("xno_optimize") {
|
|
if (is_win) {
|
|
cflags = [
|
|
"/Od", # Disable optimization.
|
|
@@ -3040,7 +2880,8 @@
|
|
# Turns up the optimization level. Used to explicitly enable -O2 instead of
|
|
# -Os for select targets on platforms that use optimize_for_size. No-op
|
|
# elsewhere.
|
|
-config("optimize_max") {
|
|
+config("optimize_max") { }
|
|
+config("xoptimize_max") {
|
|
if (is_nacl && is_nacl_irt) {
|
|
# The NaCl IRT is a special case and always wants its own config.
|
|
# Various components do:
|
|
@@ -3076,7 +2917,8 @@
|
|
#
|
|
# TODO(crbug.com/41259697) - rework how all of these configs are related
|
|
# so that we don't need this disclaimer.
|
|
-config("optimize_speed") {
|
|
+config("optimize_speed") { }
|
|
+config("xoptimize_speed") {
|
|
if (is_nacl && is_nacl_irt) {
|
|
# The NaCl IRT is a special case and always wants its own config.
|
|
# Various components do:
|
|
@@ -3105,7 +2947,8 @@
|
|
}
|
|
}
|
|
|
|
-config("optimize_fuzzing") {
|
|
+config("optimize_fuzzing") { }
|
|
+config("xoptimize_fuzzing") {
|
|
cflags = [ "-O3" ] + common_optimize_on_cflags
|
|
rustflags = [ "-Copt-level=3", ]
|
|
ldflags = common_optimize_on_ldflags
|
|
@@ -3271,7 +3114,8 @@
|
|
}
|
|
|
|
# Full symbols.
|
|
-config("symbols") {
|
|
+config("symbols") { }
|
|
+config("xsymbols") {
|
|
rustflags = []
|
|
configs = []
|
|
if (is_win) {
|
|
@@ -3433,7 +3277,8 @@
|
|
# Minimal symbols.
|
|
# This config guarantees to hold symbol for stack trace which are shown to user
|
|
# when crash happens in unittests running on buildbot.
|
|
-config("minimal_symbols") {
|
|
+config("minimal_symbols") { }
|
|
+config("xminimal_symbols") {
|
|
rustflags = []
|
|
if (is_win) {
|
|
# Functions, files, and line tables only.
|
|
@@ -3518,7 +3363,8 @@
|
|
# This configuration contains function names only. That is, the compiler is
|
|
# told to not generate debug information and the linker then just puts function
|
|
# names in the final debug information.
|
|
-config("no_symbols") {
|
|
+config("no_symbols") { }
|
|
+config("xno_symbols") {
|
|
if (is_win) {
|
|
ldflags = [ "/DEBUG" ]
|
|
|