diff options
| author | Adam Langley <agl@google.com> | 2015-09-24 23:03:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-24 23:03:06 +0000 |
| commit | c737bc23bc868fff21e5c1b95940813f709ea550 (patch) | |
| tree | dd743d9d64af3145fe96b8d5fc2f3427544794bd /linux-arm/crypto/sha/sha1-armv4-large.S | |
| parent | 0267d647a4d272af8b9e7c91063d374f7e2775bb (diff) | |
| parent | 3781a60670f92c3c6fca860cb4589495cefa2e56 (diff) | |
| download | external_boringssl-c737bc23bc868fff21e5c1b95940813f709ea550.zip external_boringssl-c737bc23bc868fff21e5c1b95940813f709ea550.tar.gz external_boringssl-c737bc23bc868fff21e5c1b95940813f709ea550.tar.bz2 | |
am 3781a606: am 1e4884f6: external/boringssl: sync with upstream.
* commit '3781a60670f92c3c6fca860cb4589495cefa2e56':
external/boringssl: sync with upstream.
Diffstat (limited to 'linux-arm/crypto/sha/sha1-armv4-large.S')
| -rw-r--r-- | linux-arm/crypto/sha/sha1-armv4-large.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/linux-arm/crypto/sha/sha1-armv4-large.S b/linux-arm/crypto/sha/sha1-armv4-large.S index 52c99bf..66d0ef3 100644 --- a/linux-arm/crypto/sha/sha1-armv4-large.S +++ b/linux-arm/crypto/sha/sha1-armv4-large.S @@ -1,4 +1,5 @@ -#include "arm_arch.h" +#if defined(__arm__) +#include <openssl/arm_arch.h> .text .code 32 @@ -1458,3 +1459,4 @@ sha1_block_data_order_armv8: .comm OPENSSL_armcap_P,4,4 .hidden OPENSSL_armcap_P #endif +#endif
\ No newline at end of file |