summaryrefslogtreecommitdiffstats
path: root/linux-arm/crypto/sha/sha256-armv4.S
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-09-24 22:57:25 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-24 22:57:25 +0000
commit3781a60670f92c3c6fca860cb4589495cefa2e56 (patch)
treedd743d9d64af3145fe96b8d5fc2f3427544794bd /linux-arm/crypto/sha/sha256-armv4.S
parent4ca36931e543512682d75e8e6d923144261dfd4d (diff)
parent1e4884f615b20946411a74e41eb9c6aa65e2d5f3 (diff)
downloadexternal_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.zip
external_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.tar.gz
external_boringssl-3781a60670f92c3c6fca860cb4589495cefa2e56.tar.bz2
am 1e4884f6: external/boringssl: sync with upstream.
* commit '1e4884f615b20946411a74e41eb9c6aa65e2d5f3': external/boringssl: sync with upstream.
Diffstat (limited to 'linux-arm/crypto/sha/sha256-armv4.S')
-rw-r--r--linux-arm/crypto/sha/sha256-armv4.S4
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