Revert BoringSSL Roll

third_party/boringssl/linux-arm/crypto/aes/aesv8-armx32.S

 #if defined(__arm__)
-#include <openssl/arm_arch.h>
+#include "arm_arch.h"
 
 #if __ARM_MAX_ARCH__>=7
 .text
 .arch   armv7-a
 .fpu    neon
 .code   32
 .align  5
 .Lrcon:
 .long   0x01,0x01,0x01,0x01
 .long   0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d,0x0c0f0e0d     @ rotate-n-splat
 .long   0x1b,0x1b,0x1b,0x1b
 
 .globl  aes_v8_set_encrypt_key
-.hidden aes_v8_set_encrypt_key
 .type   aes_v8_set_encrypt_key,%function
 .align  5
 aes_v8_set_encrypt_key:
 .Lenc_key:
         mov     r3,#-1
         cmp     r0,#0
         beq     .Lenc_key_abort
         cmp     r2,#0
         beq     .Lenc_key_abort
         mov     r3,#-2
@@ skipping 150 matching lines @@
         str     r12,[r2]
         mov     r3,#0
 
 .Lenc_key_abort:
         mov     r0,r3                   @ return value
 
         bx      lr
 .size   aes_v8_set_encrypt_key,.-aes_v8_set_encrypt_key
 
 .globl  aes_v8_set_decrypt_key
-.hidden aes_v8_set_decrypt_key
 .type   aes_v8_set_decrypt_key,%function
 .align  5
 aes_v8_set_decrypt_key:
         stmdb   sp!,{r4,lr}
         bl      .Lenc_key
 
         cmp     r0,#0
         bne     .Ldec_key_abort
 
         sub     r2,r2,#240              @ restore original r2
@@ skipping 17 matching lines @@
 
         vld1.32 {q0},[r2]
 .byte   0xc0,0x03,0xb0,0xf3     @ aesimc q0,q0
         vst1.32 {q0},[r0]
 
         eor     r0,r0,r0                @ return value
 .Ldec_key_abort:
         ldmia   sp!,{r4,pc}
 .size   aes_v8_set_decrypt_key,.-aes_v8_set_decrypt_key
 .globl  aes_v8_encrypt
-.hidden aes_v8_encrypt
 .type   aes_v8_encrypt,%function
 .align  5
 aes_v8_encrypt:
         ldr     r3,[r2,#240]
         vld1.32 {q0},[r2]!
         vld1.8  {q2},[r0]
         sub     r3,r3,#2
         vld1.32 {q1},[r2]!
 
 .Loop_enc:
 .byte   0x00,0x43,0xb0,0xf3     @ aese q2,q0
 .byte   0x84,0x43,0xb0,0xf3     @ aesmc q2,q2
         vld1.32 {q0},[r2]!
         subs    r3,r3,#2
 .byte   0x02,0x43,0xb0,0xf3     @ aese q2,q1
 .byte   0x84,0x43,0xb0,0xf3     @ aesmc q2,q2
         vld1.32 {q1},[r2]!
         bgt     .Loop_enc
 
 .byte   0x00,0x43,0xb0,0xf3     @ aese q2,q0
 .byte   0x84,0x43,0xb0,0xf3     @ aesmc q2,q2
         vld1.32 {q0},[r2]
 .byte   0x02,0x43,0xb0,0xf3     @ aese q2,q1
         veor    q2,q2,q0
 
         vst1.8  {q2},[r1]
         bx      lr
 .size   aes_v8_encrypt,.-aes_v8_encrypt
 .globl  aes_v8_decrypt
-.hidden aes_v8_decrypt
 .type   aes_v8_decrypt,%function
 .align  5
 aes_v8_decrypt:
         ldr     r3,[r2,#240]
         vld1.32 {q0},[r2]!
         vld1.8  {q2},[r0]
         sub     r3,r3,#2
         vld1.32 {q1},[r2]!
 
 .Loop_dec:
 .byte   0x40,0x43,0xb0,0xf3     @ aesd q2,q0
 .byte   0xc4,0x43,0xb0,0xf3     @ aesimc q2,q2
         vld1.32 {q0},[r2]!
         subs    r3,r3,#2
 .byte   0x42,0x43,0xb0,0xf3     @ aesd q2,q1
 .byte   0xc4,0x43,0xb0,0xf3     @ aesimc q2,q2
         vld1.32 {q1},[r2]!
         bgt     .Loop_dec
 
 .byte   0x40,0x43,0xb0,0xf3     @ aesd q2,q0
 .byte   0xc4,0x43,0xb0,0xf3     @ aesimc q2,q2
         vld1.32 {q0},[r2]
 .byte   0x42,0x43,0xb0,0xf3     @ aesd q2,q1
         veor    q2,q2,q0
 
         vst1.8  {q2},[r1]
         bx      lr
 .size   aes_v8_decrypt,.-aes_v8_decrypt
 .globl  aes_v8_cbc_encrypt
-.hidden aes_v8_cbc_encrypt
 .type   aes_v8_cbc_encrypt,%function
 .align  5
 aes_v8_cbc_encrypt:
         mov     ip,sp
         stmdb   sp!,{r4,r5,r6,r7,r8,lr}
         vstmdb  sp!,{d8,d9,d10,d11,d12,d13,d14,d15}            @ ABI specification says so
         ldmia   ip,{r4,r5}              @ load remaining args
         subs    r2,r2,#16
         mov     r8,#16
         blo     .Lcbc_abort
@@ skipping 272 matching lines @@
         vorr    q6,q11,q11
         vst1.8  {q5},[r1]!
 
 .Lcbc_done:
         vst1.8  {q6},[r4]
 .Lcbc_abort:
         vldmia  sp!,{d8,d9,d10,d11,d12,d13,d14,d15}
         ldmia   sp!,{r4,r5,r6,r7,r8,pc}
 .size   aes_v8_cbc_encrypt,.-aes_v8_cbc_encrypt
 .globl  aes_v8_ctr32_encrypt_blocks
-.hidden aes_v8_ctr32_encrypt_blocks
 .type   aes_v8_ctr32_encrypt_blocks,%function
 .align  5
 aes_v8_ctr32_encrypt_blocks:
         mov     ip,sp
         stmdb   sp!,{r4,r5,r6,r7,r8,r9,r10,lr}
         vstmdb  sp!,{d8,d9,d10,d11,d12,d13,d14,d15}            @ ABI specification says so
         ldr     r4, [ip]                @ load remaining arg
         ldr     r5,[r3,#240]
 
         ldr     r8, [r4, #12]
@@ skipping 163 matching lines @@
         veor    q3,q3,q1
         vst1.8  {q2},[r1]!
         beq     .Lctr32_done
         vst1.8  {q3},[r1]
 
 .Lctr32_done:
         vldmia  sp!,{d8,d9,d10,d11,d12,d13,d14,d15}
         ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,pc}
 .size   aes_v8_ctr32_encrypt_blocks,.-aes_v8_ctr32_encrypt_blocks
 #endif
-#endif
+#endif