commit b8494591d1b1a143f3b192d845c238bbf3bc629d
author Kenny Root <kroot@google.com> Fri Sep 25 02:29:14 2015 +0000
committer Kenny Root <kroot@google.com> Fri Sep 25 02:29:14 2015 +0000
tree dd743d9d64af3145fe96b8d5fc2f3427544794bd
parent a04d78d392463df4e69a64360c952ffa5abd22f7

Revert "Revert "external/boringssl: sync with upstream.""

This reverts commit a04d78d392463df4e69a64360c952ffa5abd22f7.

Underlying issue was fixed.

Change-Id: I49685b653d16e728eb38e79e02b2c33ddeefed88

linux-arm/crypto/aes/aes-armv4.S

diff --git a/linux-arm/crypto/aes/aes-armv4.S b/linux-arm/crypto/aes/aes-armv4.S
index 1135020..c4d7065 100644
--- a/linux-arm/crypto/aes/aes-armv4.S
+++ b/linux-arm/crypto/aes/aes-armv4.S
@@ -1,3 +1,4 @@
+#if defined(__arm__)
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
@@ -33,7 +34,7 @@
 
 #if defined(__arm__)
 #ifndef __KERNEL__
-# include "arm_arch.h"
+# include <openssl/arm_arch.h>
 #else
 # define __ARM_ARCH__ __LINUX_ARM_ARCH__
 #endif
@@ -1196,3 +1197,4 @@
 .align	2
 
 #endif
+#endif
\ No newline at end of file