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