Skip to content
This repository was archived by the owner on Oct 25, 2024. It is now read-only.

Commit 97e16f5

Browse files
authored
Roll clang llvmorg-18-init-12938-geb1d5065. (#738)
Fixes #737.
1 parent eba71b7 commit 97e16f5

File tree

3 files changed

+82
-1
lines changed

3 files changed

+82
-1
lines changed

scripts/prepare_dev.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
('0006-Fix-FFMPEG-config-for-MSVC-build.patch', FFMPEG_PATH),
4141
('0007-Getting-install-build-deps-to-work-on-Ubuntu-22.04-L.patch', BUILD_PATH),
4242
('0008-Allow-ffmpeg_branding-OWT.patch', FFMPEG_PATH),
43-
('0009-Add-an-GN-variable-for-using-BoringSSL.patch', LIBSRTP_PATH)
43+
('0009-Add-an-GN-variable-for-using-BoringSSL.patch', LIBSRTP_PATH),
44+
('0010-Roll-clang-llvmorg-18-init-12938-geb1d5065.patch', TOOL_PATH),
45+
('0011-Suppress-some-warnings-for-clang-18.patch', BUILD_PATH),
4446
]
4547

4648
def _patch(ignoreFailures=False):
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
From bcf270ff675649edabbf2389d62ae0ea22886e3b Mon Sep 17 00:00:00 2001
2+
From: Jianjun Zhu <[email protected]>
3+
Date: Thu, 7 Dec 2023 09:58:10 +0800
4+
Subject: [PATCH] Roll clang llvmorg-18-init-12938-geb1d5065.
5+
6+
---
7+
clang/scripts/update.py | 4 ++--
8+
1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+
diff --git a/clang/scripts/update.py b/clang/scripts/update.py
11+
index 2e56c78afd..5d37c5e7a4 100755
12+
--- a/clang/scripts/update.py
13+
+++ b/clang/scripts/update.py
14+
@@ -35,11 +35,11 @@ import zlib
15+
# https://chromium.googlesource.com/chromium/src/+/main/docs/updating_clang.md
16+
# Reverting problematic clang rolls is safe, though.
17+
# This is the output of `git describe` and is usable as a commit-ish.
18+
-CLANG_REVISION = 'llvmorg-16-init-6578-g0d30e92f'
19+
+CLANG_REVISION = 'llvmorg-18-init-12938-geb1d5065'
20+
CLANG_SUB_REVISION = 1
21+
22+
PACKAGE_VERSION = '%s-%s' % (CLANG_REVISION, CLANG_SUB_REVISION)
23+
-RELEASE_VERSION = '16.0.0'
24+
+RELEASE_VERSION = '18'
25+
26+
CDS_URL = os.environ.get('CDS_CLANG_BUCKET_OVERRIDE',
27+
'https://commondatastorage.googleapis.com/chromium-browser-clang')
28+
--
29+
2.43.0
30+
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
From 418bcfe0e92e30ab8f2e5528363f7d456ef8c67b Mon Sep 17 00:00:00 2001
2+
From: Jianjun Zhu <[email protected]>
3+
Date: Thu, 7 Dec 2023 10:18:43 +0800
4+
Subject: [PATCH] Suppress some warnings for clang 18.
5+
6+
---
7+
config/compiler/BUILD.gn | 12 ++++++++++++
8+
toolchain/toolchain.gni | 2 +-
9+
2 files changed, 13 insertions(+), 1 deletion(-)
10+
11+
diff --git a/config/compiler/BUILD.gn b/config/compiler/BUILD.gn
12+
index 75e3de46f..e0f215acf 100644
13+
--- a/config/compiler/BUILD.gn
14+
+++ b/config/compiler/BUILD.gn
15+
@@ -1576,6 +1576,18 @@ config("default_warnings") {
16+
17+
# TODO(crbug.com/1352183) Evaluate and possibly enable.
18+
"-Wno-bitfield-constant-conversion",
19+
+
20+
+ # TODO(crbug.com/1412713) Evaluate and possibly enable.
21+
+ "-Wno-deprecated-this-capture",
22+
+
23+
+ # TODO(https://crbug.com/1491833): Fix and re-enable.
24+
+ "-Wno-invalid-offsetof",
25+
+
26+
+ # TODO(crbug.com/1494809): Evaluate and possibly enable.
27+
+ "-Wno-vla-extension",
28+
+
29+
+ # TODO(https://crbug.com/1490607): Fix and re-enable.
30+
+ "-Wno-thread-safety-reference-return",
31+
]
32+
}
33+
}
34+
diff --git a/toolchain/toolchain.gni b/toolchain/toolchain.gni
35+
index 6a49c399e..3b8c7e2e4 100644
36+
--- a/toolchain/toolchain.gni
37+
+++ b/toolchain/toolchain.gni
38+
@@ -33,7 +33,7 @@ if (generate_linker_map) {
39+
}
40+
41+
declare_args() {
42+
- clang_version = "16.0.0"
43+
+ clang_version = "18"
44+
}
45+
46+
# Extension for shared library files (including leading dot).
47+
--
48+
2.43.0
49+

0 commit comments

Comments
 (0)