diff options
| author | Pete Bentley <prb@google.com> | 2019-08-13 09:32:23 +0100 |
|---|---|---|
| committer | Pete Bentley <prb@google.com> | 2019-08-13 10:27:15 +0100 |
| commit | 0c61efe6da4dd29556e9d2bf7321d2f9283a4e13 (patch) | |
| tree | 207a60c135efaef5dfec5f7b3343034555943fc0 /linux-arm/crypto/fipsmodule/sha256-armv4.S | |
| parent | dd42a613176ed39d12be02cf21aeae057d9ef6e6 (diff) | |
| download | boringssl-0c61efe6da4dd29556e9d2bf7321d2f9283a4e13.tar.gz | |
external/boringssl: Sync to bc2a2013e03754a89a701739a7b58c422391efa2.
Third time's the charm.
This includes the following changes:
https://boringssl.googlesource.com/boringssl/+log/c9827e073f64e353c4891ecc2c73721882543ee0..bc2a2013e03754a89a701739a7b58c422391efa2
Test: atest CtsLibcoreTestCases
Test: atest CtsLibcoreOkHttpTestCases
Change-Id: I7943c83d12237ec6e4dc54fb3d5a9cecb909e6e7
Diffstat (limited to 'linux-arm/crypto/fipsmodule/sha256-armv4.S')
| -rw-r--r-- | linux-arm/crypto/fipsmodule/sha256-armv4.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/linux-arm/crypto/fipsmodule/sha256-armv4.S b/linux-arm/crypto/fipsmodule/sha256-armv4.S index 4f5739a7..19280753 100644 --- a/linux-arm/crypto/fipsmodule/sha256-armv4.S +++ b/linux-arm/crypto/fipsmodule/sha256-armv4.S @@ -1,11 +1,12 @@ // This file is generated from a similarly-named Perl script in the BoringSSL // source tree. Do not edit by hand. -#if defined(__has_feature) +#if !defined(__has_feature) +#define __has_feature(x) 0 +#endif #if __has_feature(memory_sanitizer) && !defined(OPENSSL_NO_ASM) #define OPENSSL_NO_ASM #endif -#endif #if !defined(OPENSSL_NO_ASM) #if defined(__arm__) |