Commit fc86d6bd authored by davidben's avatar davidben Committed by Commit bot

Build BoringSSL without assembly if using MSan.

MSan requires all code be instrumented.

This also rolls BoringSSL. Summary of changes available at:
https://boringssl.googlesource.com/boringssl/+log/a07c0fc..9660032

BUG=488708

Review URL: https://codereview.chromium.org/1139263002

Cr-Commit-Position: refs/heads/master@{#330242}
parent 28b82f54
...@@ -74,7 +74,7 @@ vars = { ...@@ -74,7 +74,7 @@ vars = {
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling BoringSSL # the commit queue can handle CLs rolling BoringSSL
# and whatever else without interference from each other. # and whatever else without interference from each other.
'boringssl_revision': 'a07c0fc8f2181d086b1118712e2ceb0d1496fa0b', 'boringssl_revision': '966003273dc1a8b92f376aefa81232f14eecde8a',
# Three lines of non-changing comments so that # Three lines of non-changing comments so that
# the commit queue can handle CLs rolling nss # the commit queue can handle CLs rolling nss
# and whatever else without interference from each other. # and whatever else without interference from each other.
......
...@@ -25,7 +25,7 @@ gypi_values = ...@@ -25,7 +25,7 @@ gypi_values =
# Windows' assembly is built with Yasm. The other platforms use the platform # Windows' assembly is built with Yasm. The other platforms use the platform
# assembler. # assembler.
if (is_win) { if (is_win && !is_msan) {
import("//third_party/yasm/yasm_assemble.gni") import("//third_party/yasm/yasm_assemble.gni")
yasm_assemble("boringssl_asm") { yasm_assemble("boringssl_asm") {
if (current_cpu == "x64") { if (current_cpu == "x64") {
...@@ -70,7 +70,9 @@ component("boringssl") { ...@@ -70,7 +70,9 @@ component("boringssl") {
"src/crypto", "src/crypto",
] ]
if (current_cpu == "x64") { if (is_msan) {
defines += [ "OPENSSL_NO_ASM" ]
} else if (current_cpu == "x64") {
if (is_mac || is_ios) { if (is_mac || is_ios) {
sources += gypi_values.boringssl_mac_x86_64_sources sources += gypi_values.boringssl_mac_x86_64_sources
} else if (is_linux || is_android) { } else if (is_linux || is_android) {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
'BORINGSSL_SHARED_LIBRARY', 'BORINGSSL_SHARED_LIBRARY',
], ],
}], }],
['target_arch == "arm"', { ['target_arch == "arm" and msan == 0', {
'conditions': [ 'conditions': [
['OS == "linux" or OS == "android"', { ['OS == "linux" or OS == "android"', {
'sources': [ '<@(boringssl_linux_arm_sources)' ], 'sources': [ '<@(boringssl_linux_arm_sources)' ],
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
}], }],
], ],
}], }],
['target_arch == "arm64"', { ['target_arch == "arm64" and msan == 0', {
'conditions': [ 'conditions': [
['OS == "linux" or OS == "android"', { ['OS == "linux" or OS == "android"', {
'sources': [ '<@(boringssl_linux_aarch64_sources)' ], 'sources': [ '<@(boringssl_linux_aarch64_sources)' ],
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
}], }],
], ],
}], }],
['target_arch == "ia32"', { ['target_arch == "ia32" and msan == 0', {
'conditions': [ 'conditions': [
['OS == "mac" or OS == "ios"', { ['OS == "mac" or OS == "ios"', {
'sources': [ '<@(boringssl_mac_x86_sources)' ], 'sources': [ '<@(boringssl_mac_x86_sources)' ],
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
}], }],
] ]
}], }],
['target_arch == "x64"', { ['target_arch == "x64" and msan == 0', {
'conditions': [ 'conditions': [
['OS == "mac" or OS == "ios"', { ['OS == "mac" or OS == "ios"', {
'sources': [ '<@(boringssl_mac_x86_64_sources)' ], 'sources': [ '<@(boringssl_mac_x86_64_sources)' ],
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
}], }],
] ]
}], }],
['target_arch != "arm" and target_arch != "ia32" and target_arch != "x64" and target_arch != "arm64"', { ['msan == 1 or (target_arch != "arm" and target_arch != "ia32" and target_arch != "x64" and target_arch != "arm64")', {
'defines': [ 'OPENSSL_NO_ASM' ], 'defines': [ 'OPENSSL_NO_ASM' ],
}], }],
], ],
......
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment