Revert BoringSSL Roll

third_party/boringssl/linux-arm/crypto/aes/bsaes-armv7.S

 #if defined(__arm__)
 
 @ ====================================================================
 @ Written by Andy Polyakov <appro@openssl.org> for the OpenSSL
 @ project. The module is, however, dual licensed under OpenSSL and
 @ CRYPTOGAMS licenses depending on where you obtain it. For further
 @ details see http://www.openssl.org/~appro/cryptogams/.
 @
 @ Specific modes and adaptation for Linux kernel by Ard Biesheuvel
 @ <ard.biesheuvel@linaro.org>. Permission to use under GPL terms is
@@ skipping 29 matching lines @@
 @ bsaes-x86_64.pl for further details)...
 @
 @                                               <appro@openssl.org>
 
 @ April-August 2013
 @
 @ Add CBC, CTR and XTS subroutines, adapt for kernel use.
 @
 @                                       <ard.biesheuvel@linaro.org>
 
+#if defined(__arm__)
 #ifndef __KERNEL__
-# include <openssl/arm_arch.h>
+# include "arm_arch.h"
 
 # define VFP_ABI_PUSH   vstmdb  sp!,{d8-d15}
 # define VFP_ABI_POP    vldmia  sp!,{d8-d15}
 # define VFP_ABI_FRAME  0x40
 #else
 # define VFP_ABI_PUSH
 # define VFP_ABI_POP
 # define VFP_ABI_FRAME  0
 # define BSAES_ASM_EXTENDED_KEY
 # define XTS_CHAIN_TWEAK
@@ skipping 2506 matching lines @@
         mov     sp, r3
 #ifdef  XTS_CHAIN_TWEAK
         vst1.8  {q8}, [r1]
 #endif
         VFP_ABI_POP
         ldmia   sp!, {r4,r5,r6,r7,r8,r9,r10, pc}        @ return
 
 .size   bsaes_xts_decrypt,.-bsaes_xts_decrypt
 #endif
 #endif
+#endif