diff --git a/DEPS b/DEPS index f3f2ed7ef790ae..8bb883be8f2b68 100644 --- a/DEPS +++ b/DEPS @@ -137,7 +137,7 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling BoringSSL # and whatever else without interference from each other. - 'boringssl_revision': 'ce00828c89df3d4c40de7d715b1a032eb03c525c', + 'boringssl_revision': '2d98d49cf712ca7dc6f4b23b9c5f5542385d8dbe', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling google-toolbox-for-mac # and whatever else without interference from each other. diff --git a/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha1-armv8.S b/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha1-armv8.S index 61a5a80baa651f..17e1a569760cca 100644 --- a/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha1-armv8.S +++ b/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha1-armv8.S @@ -1230,4 +1230,5 @@ LOPENSSL_armcap_P: .align 2 .align 2 .comm _OPENSSL_armcap_P,4,4 +.private_extern _OPENSSL_armcap_P #endif // !OPENSSL_NO_ASM diff --git a/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha256-armv8.S b/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha256-armv8.S index 08c8ea2c884149..9076eeb0641e78 100644 --- a/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha256-armv8.S +++ b/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha256-armv8.S @@ -1208,5 +1208,6 @@ Loop_hw: #endif #ifndef __KERNEL__ .comm _OPENSSL_armcap_P,4,4 +.private_extern _OPENSSL_armcap_P #endif #endif // !OPENSSL_NO_ASM diff --git a/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha512-armv8.S b/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha512-armv8.S index 0343672c8a1158..d4fd317556a385 100644 --- a/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha512-armv8.S +++ b/third_party/boringssl/ios-aarch64/crypto/fipsmodule/sha512-armv8.S @@ -1080,5 +1080,6 @@ LOPENSSL_armcap_P: .align 2 #ifndef __KERNEL__ .comm _OPENSSL_armcap_P,4,4 +.private_extern _OPENSSL_armcap_P #endif #endif // !OPENSSL_NO_ASM diff --git a/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S b/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S index 5cd02b7ee42840..3b6cf6a6b02d3f 100644 --- a/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S +++ b/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha1-armv8.S @@ -1231,5 +1231,6 @@ sha1_block_armv8: .align 2 .align 2 .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif #endif // !OPENSSL_NO_ASM diff --git a/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S b/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S index aefcc88c466a1a..8bb535c079d10d 100644 --- a/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S +++ b/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha256-armv8.S @@ -1209,6 +1209,7 @@ sha256_block_armv8: #endif #ifndef __KERNEL__ .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif #endif #endif // !OPENSSL_NO_ASM diff --git a/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S b/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S index 18f909abb5b282..ac9d5f0f728df1 100644 --- a/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S +++ b/third_party/boringssl/linux-aarch64/crypto/fipsmodule/sha512-armv8.S @@ -1081,6 +1081,7 @@ sha512_block_data_order: .align 2 #ifndef __KERNEL__ .comm OPENSSL_armcap_P,4,4 +.hidden OPENSSL_armcap_P #endif #endif #endif // !OPENSSL_NO_ASM