Skip to content

Commit 81d037b

Browse files
chromium: Drop patches that are specific to clang < 17 (#801)
Given that we have decided not to support kirkstone until it uses a more recent version of clang, we can now drop all patches that are only needed to fix errors with clang < 17 (as nanbield uses clang 17). This also updates LAYERSERIES_COMPAT, dropping kirkstone, as well as the EOL'd mickledore and langdale. Signed-off-by: Max Ihlenfeldt <[email protected]>
1 parent 9269270 commit 81d037b

17 files changed

+38
-1547
lines changed

meta-chromium/conf/layer.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ BBFILE_PATTERN_chromium-browser-layer := "^${LAYERDIR}/"
99
BBFILE_PRIORITY_chromium-browser-layer = "7"
1010

1111
LAYERVERSION_chromium-browser-layer = "1"
12-
LAYERSERIES_COMPAT_chromium-browser-layer = "kirkstone langdale mickledore nanbield scarthgap"
12+
LAYERSERIES_COMPAT_chromium-browser-layer = "nanbield scarthgap"
1313

1414
LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,11 @@ SRC_URI += "\
2727
file://0003-wrapper-extra-flags.patch \
2828
file://0004-Delete-compiler-options-not-available-in-release-ver.patch \
2929
file://0005-avoid-link-latomic-failure-on-CentOS-8-host.patch \
30-
file://0006-Revert-__attribute__-and-alignas-changes.patch \
31-
file://0007-Add-missing-typename-s.patch \
32-
file://0008-Don-t-pass-unknown-LLVM-options.patch \
33-
file://0009-Avoid-capturing-structured-bindings.patch \
34-
file://0010-Revert-Reland-Reland-mte-refactor-the-tagging-functi.patch \
35-
file://0011-Avoid-parenthesized-initialization-of-aggregates.patch \
36-
file://0012-Fix-constexpr-variable-cannot-have-non-literal-type-.patch \
37-
file://0013-Fix-undefined-symbol-PaintOpWriter-SerializedSize-un.patch \
38-
file://0014-Fix-implicitly-deleted-default-constructor-build-err.patch \
39-
file://0015-Don-t-delete-CrashKeyWithName-dtor.patch \
40-
file://0016-Use-base-ranges-instead-of-std-ranges.patch \
41-
file://0017-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
42-
file://0018-Adjust-the-Rust-build-to-our-needs.patch \
43-
file://0019-Don-t-require-profiler_builtins.rlib.patch \
30+
file://0006-Don-t-pass-unknown-LLVM-options.patch \
31+
file://0007-Fix-constexpr-variable-must-be-initialized-by-a-cons.patch \
32+
file://0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch \
33+
file://0009-Adjust-the-Rust-build-to-our-needs.patch \
34+
file://0010-Don-t-require-profiler_builtins.rlib.patch \
4435
"
4536
# ARM/AArch64-specific patches.
4637
SRC_URI:append:arm = "\

meta-chromium/recipes-browser/chromium/files/0008-Don-t-pass-unknown-LLVM-options.patch renamed to meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ Subject: [PATCH] Don't pass unknown LLVM options
55

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

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

2019
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
2120
index 93c9bfc..94e40fa 100644
@@ -46,17 +45,3 @@ index 93c9bfc..94e40fa 100644
4645
# TODO(crbug.com/1235145): Investigate why/if this should be needed.
4746
if (is_win) {
4847
cflags += [ "/clang:-ffp-contract=off" ]
49-
@@ -800,13 +782,6 @@ config("compiler") {
50-
if (is_apple) {
51-
ldflags += [ "-Wcrl,object_path_lto" ]
52-
}
53-
- if (!is_chromeos) {
54-
- # TODO(https://crbug.com/972449): turn on for ChromeOS when that
55-
- # toolchain has this flag.
56-
- # We only use one version of LLVM within a build so there's no need to
57-
- # upgrade debug info, which can be expensive since it runs the verifier.
58-
- ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
59-
- }
60-
}
61-
62-
# TODO(https://crbug.com/1211155): investigate why this isn't effective on

meta-chromium/recipes-browser/chromium/files/0006-Revert-__attribute__-and-alignas-changes.patch

Lines changed: 0 additions & 153 deletions
This file was deleted.

0 commit comments

Comments
 (0)