BoringSSL: Roll generated files forward.

linux-arm/crypto/sha/sha256-armv4.S

 #if defined(__arm__)
+@ Copyright 2007-2016 The OpenSSL Project Authors. All Rights Reserved.
+@
+@ Licensed under the OpenSSL license (the "License").  You may not use
+@ this file except in compliance with the License.  You can obtain a copy
+@ in the file LICENSE in the source distribution or at
+@ https://www.openssl.org/source/license.html
+
 
 @ ====================================================================
 @ 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/.
 @
 @ Permission to use under GPL terms is granted.
 @ ====================================================================
 
@@ skipping 26 matching lines @@
 @ Add ARMv8 code path performing at 2.0 cpb on Apple A7.
 
 #ifndef __KERNEL__
 # include <openssl/arm_arch.h>
 #else
 # define __ARM_ARCH__ __LINUX_ARM_ARCH__
 # define __ARM_MAX_ARCH__ 7
 #endif
 
 .text
-#if __ARM_ARCH__<7
+#if defined(__thumb2__)
+.syntax unified
+.thumb
+#else
 .code   32
-#else
-.syntax unified
-# if defined(__thumb2__) && !defined(__APPLE__)
-#  define adrl adr
-.thumb
-# else
-.code   32
-# endif
 #endif
 
 .type   K256,%object
 .align  5
 K256:
 .word   0x428a2f98,0x71374491,0xb5c0fbcf,0xe9b5dba5
 .word   0x3956c25b,0x59f111f1,0x923f82a4,0xab1c5ed5
 .word   0xd807aa98,0x12835b01,0x243185be,0x550c7dc3
 .word   0x72be5d74,0x80deb1fe,0x9bdc06a7,0xc19bf174
 .word   0xe49b69c1,0xefbe4786,0x0fc19dc6,0x240ca1cc
@@ skipping 14 matching lines @@
 .LOPENSSL_armcap:
 .word   OPENSSL_armcap_P-.Lsha256_block_data_order
 #endif
 .align  5
 
 .globl  sha256_block_data_order
 .hidden sha256_block_data_order
 .type   sha256_block_data_order,%function
 sha256_block_data_order:
 .Lsha256_block_data_order:
-#if __ARM_ARCH__<7
+#if __ARM_ARCH__<7 && !defined(__thumb2__)
         sub     r3,pc,#8                @ sha256_block_data_order
 #else
-        adr     r3,sha256_block_data_order
+        adr     r3,.Lsha256_block_data_order
 #endif
 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
         ldr     r12,.LOPENSSL_armcap
         ldr     r12,[r3,r12]            @ OPENSSL_armcap_P
 #ifdef  __APPLE__
         ldr     r12,[r12]
 #endif
         tst     r12,#ARMV8_SHA256
         bne     .LARMv8
         tst     r12,#ARMV7_NEON
@@ skipping 1765 matching lines @@
 .word   0xe12fff1e                      @ interoperable with Thumb ISA:-)
 #endif
 .size   sha256_block_data_order,.-sha256_block_data_order
 #if __ARM_MAX_ARCH__>=7
 .arch   armv7-a
 .fpu    neon
 
 .globl  sha256_block_data_order_neon
 .hidden sha256_block_data_order_neon
 .type   sha256_block_data_order_neon,%function
-.align  4
+.align  5
+.skip   16
 sha256_block_data_order_neon:
 .LNEON:
         stmdb   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
 
         sub     r11,sp,#16*4+16
-        adrl    r14,K256
+        adr     r14,K256
         bic     r11,r11,#15             @ align for 128-bit stores
         mov     r12,sp
         mov     sp,r11                  @ alloca
         add     r2,r1,r2,lsl#6  @ len to point at the end of inp
 
         vld1.8  {q0},[r1]!
         vld1.8  {q1},[r1]!
         vld1.8  {q2},[r1]!
         vld1.8  {q3},[r1]!
         vld1.32 {q8},[r14,:128]!
@@ skipping 755 matching lines @@
         ldreq   sp,[sp,#76]                     @ restore original sp
         itt     ne
         eorne   r3,r5,r6
         bne     .L_00_48
 
         ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,pc}
 .size   sha256_block_data_order_neon,.-sha256_block_data_order_neon
 #endif
 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 
-# if defined(__thumb2__) && !defined(__APPLE__)
+# if defined(__thumb2__)
 #  define INST(a,b,c,d) .byte   c,d|0xc,a,b
 # else
 #  define INST(a,b,c,d) .byte   a,b,c,d
 # endif
 
 .type   sha256_block_data_order_armv8,%function
 .align  5
 sha256_block_data_order_armv8:
 .LARMv8:
         vld1.32 {q0,q1},[r0]
-# ifdef __APPLE__
         sub     r3,r3,#256+32
-# elif  defined(__thumb2__)
-        adr     r3,.LARMv8
-        sub     r3,r3,#.LARMv8-K256
-# else
-        adrl    r3,K256
-# endif
         add     r2,r1,r2,lsl#6  @ len to point at the end of inp
+        b       .Loop_v8
 
+.align  4
 .Loop_v8:
         vld1.8  {q8,q9},[r1]!
         vld1.8  {q10,q11},[r1]!
         vld1.32 {q12},[r3]!
         vrev32.8        q8,q8
         vrev32.8        q9,q9
         vrev32.8        q10,q10
         vrev32.8        q11,q11
         vmov    q14,q0  @ offload
         vmov    q15,q1
@@ skipping 117 matching lines @@
 .size   sha256_block_data_order_armv8,.-sha256_block_data_order_armv8
 #endif
 .byte   83,72,65,50,53,54,32,98,108,111,99,107,32,116,114,97,110,115,102,111,114,109,32,102,111,114,32,65,82,77,118,52,47,78,69,79,78,47,65,82,77,118,56,44,32,67,82,89,80,84,79,71,65,77,83,32,98,121,32,60,97,112,112,114,111,64,111,112,101,110,115,115,108,46,111,114,103,62,0
 .align  2
 .align  2
 #if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
 .comm   OPENSSL_armcap_P,4,4
 .hidden OPENSSL_armcap_P
 #endif
 #endif