| Index: third_party/boringssl/update_gypi_and_asm.py
|
| diff --git a/third_party/boringssl/update_gypi_and_asm.py b/third_party/boringssl/update_gypi_and_asm.py
|
| index 41196a51392fbb2297ebd278cb735b7885f66909..751b2dbaf636b3a50420e2ee396ba45e6c67d570 100644
|
| --- a/third_party/boringssl/update_gypi_and_asm.py
|
| +++ b/third_party/boringssl/update_gypi_and_asm.py
|
| @@ -19,7 +19,7 @@ OS_ARCH_COMBOS = [
|
| ('mac', 'x86', 'macosx', ['-fPIC'], 'S'),
|
| ('mac', 'x86_64', 'macosx', [''], 'S'),
|
| ('win', 'x86', 'win32n', [''], 'asm'),
|
| - ('win', 'x86_64', 'masm', [''], 'asm'),
|
| + ('win', 'x86_64', 'nasm', [''], 'asm'),
|
| ]
|
|
|
| # NON_PERL_FILES enumerates assembly files that are not processed by the
|
| @@ -220,6 +220,9 @@ def main():
|
| 'sources': [
|
| '%s',
|
| ],
|
| + # TODO(davidben): Fix size_t truncations in BoringSSL.
|
| + # https://crbug.com/429039
|
| + 'msvs_disabled_warnings': [ 4267, ],
|
| },\n""" % (test_name, test))
|
| test_names.append(test_name)
|
|
|
|
|