diff options
| author | Kenny Root <kroot@google.com> | 2015-09-25 00:44:37 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 00:44:37 +0000 |
| commit | e246de8f184e644debf965ecdca552f006b56881 (patch) | |
| tree | dc62c249d595198e0d99e43890019d21e901fbec /linux-arm/crypto/sha/sha256-armv4.S | |
| parent | c737bc23bc868fff21e5c1b95940813f709ea550 (diff) | |
| parent | 00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872 (diff) | |
| download | external_boringssl-e246de8f184e644debf965ecdca552f006b56881.zip external_boringssl-e246de8f184e644debf965ecdca552f006b56881.tar.gz external_boringssl-e246de8f184e644debf965ecdca552f006b56881.tar.bz2 | |
am 00bc53f6: am a04d78d3: Revert "external/boringssl: sync with upstream."
* commit '00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872':
Revert "external/boringssl: sync with upstream."
Diffstat (limited to 'linux-arm/crypto/sha/sha256-armv4.S')
| -rw-r--r-- | linux-arm/crypto/sha/sha256-armv4.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux-arm/crypto/sha/sha256-armv4.S b/linux-arm/crypto/sha/sha256-armv4.S index 9fc3e0b..114aa43 100644 --- a/linux-arm/crypto/sha/sha256-armv4.S +++ b/linux-arm/crypto/sha/sha256-armv4.S @@ -1,4 +1,3 @@ -#if defined(__arm__) @ ==================================================================== @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL @@ -38,7 +37,7 @@ @ Add ARMv8 code path performing at 2.0 cpb on Apple A7. #ifndef __KERNEL__ -# include <openssl/arm_arch.h> +# include "arm_arch.h" #else # define __ARM_ARCH__ __LINUX_ARM_ARCH__ # define __ARM_MAX_ARCH__ 7 @@ -2815,4 +2814,3 @@ sha256_block_data_order_armv8: .comm OPENSSL_armcap_P,4,4 .hidden OPENSSL_armcap_P #endif -#endif
\ No newline at end of file |