diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn index 2fc8d82..4164b41 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -308,12 +308,8 @@ config("compiler") { configs += [ # See the definitions below. - ":clang_revision", - ":rustc_revision", - ":compiler_cpu_abi", ":compiler_codegen", ":compiler_deterministic", - ":clang_warning_suppression", ] # Here we enable -fno-delete-null-pointer-checks, which makes various nullptr @@ -493,6 +489,9 @@ config("compiler") { ldflags += [ "-fPIC" ] rustflags += [ "-Crelocation-model=pic" ] + extra_rustflags = getenv("RUSTFLAGS") + rustflags += [ extra_rustflags ] + if (!is_clang) { # Use pipes for communicating between sub-processes. Faster. # (This flag doesn't do anything with Clang.) @@ -569,63 +568,6 @@ config("compiler") { 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" ] - } - } - } - - # TODO(crbug.com/40192287): Investigate why/if this should be needed. - if (is_win) { - cflags += [ "/clang:-ffp-contract=off" ] - } else { - cflags += [ "-ffp-contract=off" ] - } - - # Enable ELF CREL (see crbug.com/357878242) for all platforms that use ELF - # (excluding toolchains that use an older version of LLVM). - # TODO(crbug.com/376278218): This causes segfault on Linux ARM builds. - if (is_linux && use_lld && !llvm_android_mainline && current_cpu != "arm" && - default_toolchain != "//build/toolchain/cros:target") { - cflags += [ "-Wa,--crel,--allow-experimental-crel" ] - } - } - # C11/C++11 compiler flags setup. # --------------------------- if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) || @@ -1036,20 +978,6 @@ config("compiler") { # `-nodefaultlibs` from the linker invocation from Rust, which would be used # to compile dylibs on Android, such as for constructing unit test APKs. "-Cdefault-linker-libraries", - - # To make Rust .d files compatible with ninja - "-Zdep-info-omit-d-target", - - # If a macro panics during compilation, show which macro and where it is - # defined. - "-Zmacro-backtrace", - - # For deterministic builds, keep the local machine's current working - # directory from appearing in build outputs. - "-Zremap-cwd-prefix=.", - - # We use clang-rt sanitizer runtimes. - "-Zexternal-clangrt", ] if (!is_win || force_rustc_color_output) { @@ -1104,7 +1032,7 @@ config("compiler") { # Don't allow unstable features to be enabled by `#![feature()]` without # additional command line flags. config("disallow_unstable_features") { - rustflags = [ "-Zallow-features=" ] + #rustflags = [ "-Zallow-features=" ] } config("libcxx_hardening") { @@ -1563,52 +1491,6 @@ config("compiler_deterministic") { } } - # 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. @@ -1627,124 +1509,6 @@ config("compiler_deterministic") { } } -config("clang_revision") { - if (is_clang && clang_base_path == default_clang_base_path && - current_os != "zos") { - _perform_consistency_checks = current_toolchain == default_toolchain - if (llvm_force_head_revision) { - _head_revision_stamp_path = "//third_party/llvm-build/force_head_revision" - _head_revision = "" - if (path_exists(_head_revision_stamp_path)) { - _head_revision = read_file(_head_revision_stamp_path, "trim string") - } - assert( - _head_revision != "", - "llvm_force_head_revision=true, but no locally built version was detected.") - _clang_revision = _head_revision - } else { - _clang_revision = read_file( - "//third_party/llvm-build/Release+Asserts/cr_build_revision", - "trim string") - - # Ensure that the synced clang version matches what's in git. - if (_perform_consistency_checks) { - # Parse the clang version from the Python script. - _clang_version_lines = filter_include( - read_file("//tools/clang/scripts/update.py", "list lines"), - [ "CLANG_*REVISION = *" ]) - _py_revision = - string_replace(_clang_version_lines[0], "CLANG_REVISION = '", "") - _py_revision = string_replace(_py_revision, "'", "") - _py_subrevision = - string_replace(_clang_version_lines[1], "CLANG_SUB_REVISION = ", "") - _expected_clang_revision = "$_py_revision-$_py_subrevision" - - # TODO(agrieve): Change filter_include to _clang_revision == - # _expected_clang_revision once angle & webrtc use a GCS DEPS entry - # rather than a update.py runhook. - assert( - filter_include([ _clang_revision ], - [ - _expected_clang_revision, - "$_expected_clang_revision,*", - ]) != [], - "clang_revision=\"$_clang_revision\" but update.py expected \"$_expected_clang_revision\". Did you forget to gclient sync?") - } - } - - if (_perform_consistency_checks) { - # Ensure that the revision matches the version major expected by GN. - _versions_match = filter_include([ _clang_revision ], - [ "llvmorg-$clang_version-*" ]) != [] - assert( - _versions_match, - "clang_revision=\"$_clang_revision\" but clang_version=\"$clang_version\". clang_version in build/toolchain/toolchain.gni is likely outdated.") - } - - if (toolchain_has_rust && _perform_consistency_checks) { - # Ensure that the synced rust version matches what's in git. - _rust_revision_lines = - filter_include(read_file("//tools/rust/update_rust.py", "list lines"), - [ "RUST_*REVISION = *" ]) - _py_revision = - string_replace(_rust_revision_lines[0], "RUST_REVISION = '", "") - _py_revision = string_replace(_py_revision, "'", "") - _py_subrevision = - string_replace(_rust_revision_lines[1], "RUST_SUB_REVISION = ", "") - _expected_rust_revision = "$_py_revision-$_py_subrevision" - - # Ensure the rust version matches the clang version. - assert( - filter_include([ rustc_revision ], - [ "*-$_expected_rust_revision-*" ]) != [], - "rustc_revision=\"$rustc_revision\" but update_rust.py expected \"$_expected_rust_revision\". Run \"gclient sync\"?") - } - - # 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\"" ] - } -} - -# Controls the usage of a warning suppression mapping (WSM) file to suppress -# warnings based on the path of the file they come from. It's controlled by the -# `clang_warning_suppression_file` gn argument , which points to a text file -# defining which warnings should be suppressed where. -# See //build/config/warning_suppression.txt for an example file; this is the -# file used by Chromium. -# -# To use a different file, or to use this functionality outside of chromium, -# set the `clang_warning_suppression_file` argument to point to the new file, -# e.g. by setting in the the project's .gn file. -config("clang_warning_suppression") { - # Some build configs use older versions of clang that don't support WSMs - if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" && - !llvm_android_mainline && is_clang && - clang_warning_suppression_file != "") { - from_build_root = - rebase_path(clang_warning_suppression_file, root_build_dir) - inputs = [ clang_warning_suppression_file ] - cflags = [ - "-Xclang", - "--warning-suppression-mappings=" + from_build_root, - ] - } -} - -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" ] @@ -2180,11 +1944,7 @@ config("chromium_code") { 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. @@ -2193,24 +1953,6 @@ config("chromium_code") { "__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" ] @@ -2626,7 +2368,8 @@ config("default_stack_frames") { # [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. @@ -2675,7 +2418,8 @@ config("optimize") { } # Turn off optimizations. -config("no_optimize") { +config("no_optimize") { } +config("xno_optimize") { if (is_win) { cflags = [ "/Od", # Disable optimization. @@ -2710,7 +2454,8 @@ config("no_optimize") { # 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: @@ -2743,7 +2488,8 @@ config("optimize_max") { # # 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: @@ -2772,7 +2518,8 @@ config("optimize_speed") { } } -config("optimize_fuzzing") { +config("optimize_fuzzing") { } +config("xoptimize_fuzzing") { cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags @@ -2903,7 +2650,8 @@ config("win_pdbaltpath") { } # Full symbols. -config("symbols") { +config("symbols") { } +config("xsymbols") { rustflags = [] configs = [] if (is_win) { @@ -3065,7 +2813,8 @@ config("symbols") { # 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. @@ -3150,7 +2899,8 @@ config("minimal_symbols") { # 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" ] diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn index a659210..bde0e1b 100644 --- a/build/config/gcc/BUILD.gn +++ b/build/config/gcc/BUILD.gn @@ -32,7 +32,7 @@ declare_args() { # See http://gcc.gnu.org/wiki/Visibility config("symbol_visibility_hidden") { cflags = [ "-fvisibility=hidden" ] - rustflags = [ "-Zdefault-visibility=hidden" ] + # rustflags = [ "-Zdefault-visibility=hidden" ] # Visibility attribute is not supported on AIX. if (current_os != "aix") { diff --git a/build/config/rust.gni b/build/config/rust.gni index 953935d..a8fec3f 100644 --- a/build/config/rust.gni +++ b/build/config/rust.gni @@ -77,7 +77,8 @@ declare_args() { # # TODO(crbug.com/40281834): Re-enable ThinLTO for Rust on LaCrOS # TODO(b/300937673): Re-enable ThinLTO for Rust on ash-chrome - toolchain_supports_rust_thin_lto = !is_chromeos + # toolchain_supports_rust_thin_lto = !is_chromeos + toolchain_supports_rust_thin_lto = false # Any extra std rlibs in your Rust toolchain, relative to the standard # Rust toolchain. Typically used with 'rust_sysroot_absolute'