Skip to content

Commit dfa3428

Browse files
committed
chromium: Forward port boringSSL patch to 117
Signed-off-by: Khem Raj <raj.khem@gmail.com>
1 parent 4b7bc47 commit dfa3428

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

meta-chromium/recipes-browser/chromium/files/boringssl_no_asm_config.patch

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ Upstream-Status: Inappropriate [Specific to armv8 minus crypto]
77
Signed-off-by: Khem Raj <raj.khem@gmail.com>
88
--- a/third_party/boringssl/BUILD.gn
99
+++ b/third_party/boringssl/BUILD.gn
10-
@@ -139,7 +139,7 @@ if (is_win && !is_msan && current_cpu !=
11-
public_configs = [ ":no_asm_config" ]
12-
}
13-
} else if (current_cpu == "arm64") {
14-
- if (is_linux || is_chromeos || is_android) {
15-
+ if (is_chromeos || is_android) {
16-
sources += crypto_sources_linux_aarch64
17-
} else if (is_apple) {
18-
sources += crypto_sources_apple_aarch64
10+
@@ -94,7 +94,7 @@ if (enable_rust_boringssl) {
11+
}
12+
}
13+
14+
-if (is_msan) {
15+
+if (is_msan || current_cpu == "arm64") {
16+
# MSan instrumentation is incompatible with assembly optimizations.
17+
# BoringSSL's GAS-compatible assembly knows how to detect MSan, but the NASM
18+
# assembly does not, so we check for MSan explicitly.

0 commit comments

Comments
 (0)