Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion meta-chromium/conf/layer.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ BBFILE_PATTERN_chromium-browser-layer := "^${LAYERDIR}/"
BBFILE_PRIORITY_chromium-browser-layer = "7"

LAYERVERSION_chromium-browser-layer = "1"
LAYERSERIES_COMPAT_chromium-browser-layer = "kirkstone langdale mickledore nanbield scarthgap"
LAYERSERIES_COMPAT_chromium-browser-layer = "nanbield scarthgap"

LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"
19 changes: 5 additions & 14 deletions meta-chromium/recipes-browser/chromium/chromium-gn.inc
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,11 @@ SRC_URI += "\
file://0003-wrapper-extra-flags.patch \
file://0004-Delete-compiler-options-not-available-in-release-ver.patch \
file://0005-avoid-link-latomic-failure-on-CentOS-8-host.patch \
file://0006-Revert-__attribute__-and-alignas-changes.patch \
file://0007-Add-missing-typename-s.patch \
file://0008-Don-t-pass-unknown-LLVM-options.patch \
file://0009-Avoid-capturing-structured-bindings.patch \
file://0010-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch \
file://0011-Avoid-parenthesized-initialization-of-aggregates.patch \
file://0012-Fix-constexpr-variable-cannot-have-non-literal-type-.patch \
file://0013-Fix-undefined-symbol-PaintOpWriter-SerializedSize-un.patch \
file://0014-Fix-implicitly-deleted-default-constructor-build-err.patch \
file://0015-Don-t-delete-CrashKeyWithName-dtor.patch \
file://0016-Use-base-ranges-instead-of-std-ranges.patch \
file://0017-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
file://0018-Adjust-the-Rust-build-to-our-needs.patch \
file://0019-Don-t-require-profiler_builtins.rlib.patch \
file://0006-Don-t-pass-unknown-LLVM-options.patch \
file://0007-Fix-constexpr-variable-must-be-initialized-by-a-cons.patch \
file://0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
file://0009-Adjust-the-Rust-build-to-our-needs.patch \
file://0010-Don-t-require-profiler_builtins.rlib.patch \
"
# ARM/AArch64-specific patches.
SRC_URI:append:arm = "\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Subject: [PATCH] Don't pass unknown LLVM options

Because we compile and link with an older LLVM version than upstream, we
need to drop the following LLVM options that aren't available yet:
* disable-auto-upgrade-debug-info
* split-threshold-for-reg-with-hint

Trying to pass them anyways will lead to an "Unknown command line
Expand All @@ -14,8 +13,8 @@ argument" error.
Upstream-Status: Inappropriate [specific to older versions of LLVM]
Signed-off-by: Max Ihlenfeldt <[email protected]>
---
build/config/compiler/BUILD.gn | 25 -------------------------
1 file changed, 25 deletions(-)
build/config/compiler/BUILD.gn | 18 ------------------
1 file changed, 18 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 93c9bfc..94e40fa 100644
Expand Down Expand Up @@ -46,17 +45,3 @@ index 93c9bfc..94e40fa 100644
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
if (is_win) {
cflags += [ "/clang:-ffp-contract=off" ]
@@ -800,13 +782,6 @@ config("compiler") {
if (is_apple) {
ldflags += [ "-Wcrl,object_path_lto" ]
}
- if (!is_chromeos) {
- # TODO(https://crbug.com/972449): turn on for ChromeOS when that
- # toolchain has this flag.
- # We only use one version of LLVM within a build so there's no need to
- # upgrade debug info, which can be expensive since it runs the verifier.
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
- }
}

# TODO(https://crbug.com/1211155): investigate why this isn't effective on

This file was deleted.

Loading