Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm Regen



details:   https://anonhg.NetBSD.org/src/rev/225aaf623ef8
branches:  trunk
changeset: 433724:225aaf623ef8
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Sep 29 19:45:18 2018 +0000

description:
Regen

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S          |   3 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S         |   7 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S         |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S         |   3 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S         |   5 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S         |  37 +++++----
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S         |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S        |   7 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S       |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv8.S       |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S |  29 ++++---
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ecp_nistz256-armv8.S |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghash-armv4.S        |   5 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/ghashv8-armx.S       |   7 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv4.S   |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/keccak1600-armv8.S   |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv4.S     |  11 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/poly1305-armv8.S     |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv4-large.S   |   3 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha1-armv8.S         |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha256-armv4.S       |   3 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv4.S       |   3 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/sha512-armv8.S       |   1 +
 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/vpaes-armv8.S        |   1 +
 24 files changed, 79 insertions(+), 55 deletions(-)

diffs (truncated from 666 to 300 lines):

diff -r ddd68cfcb0d6 -r 225aaf623ef8 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S    Sat Sep 29 19:44:57 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aes-armv4.S    Sat Sep 29 19:45:18 2018 +0000
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 @ Copyright 2007-2018 The OpenSSL Project Authors. All Rights Reserved.
 @
 @ Licensed under the OpenSSL license (the "License").  You may not use
@@ -708,7 +709,7 @@
        ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11,r12,lr}
 .Labrt:
 #if __ARM_ARCH__>=5
-       bx      lr                              @ .word 0xe12fff1e
+       RET                             @ .word 0xe12fff1e
 #else
        tst     lr,#1
        moveq   pc,lr                   @ be binary compatible with V4, yet
diff -r ddd68cfcb0d6 -r 225aaf623ef8 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S   Sat Sep 29 19:44:57 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/aesv8-armx.S   Sat Sep 29 19:45:18 2018 +0000
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 #include "arm_arch.h"
 
 #if __ARM_MAX_ARCH__>=7
@@ -179,7 +180,7 @@
 .Lenc_key_abort:
        mov     r0,r3                   @ return value
 
-       bx      lr
+       RET
 .size  aes_v8_set_encrypt_key,.-aes_v8_set_encrypt_key
 
 .globl aes_v8_set_decrypt_key
@@ -246,7 +247,7 @@
        veor    q2,q2,q0
 
        vst1.8  {q2},[r1]
-       bx      lr
+       RET
 .size  aes_v8_encrypt,.-aes_v8_encrypt
 .globl aes_v8_decrypt
 .type  aes_v8_decrypt,%function
@@ -275,7 +276,7 @@
        veor    q2,q2,q0
 
        vst1.8  {q2},[r1]
-       bx      lr
+       RET
 .size  aes_v8_decrypt,.-aes_v8_decrypt
 .globl aes_v8_cbc_encrypt
 .type  aes_v8_cbc_encrypt,%function
diff -r ddd68cfcb0d6 -r 225aaf623ef8 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S   Sat Sep 29 19:44:57 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm64cpuid.S   Sat Sep 29 19:45:18 2018 +0000
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 #include "arm_arch.h"
 
 .text
diff -r ddd68cfcb0d6 -r 225aaf623ef8 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S   Sat Sep 29 19:44:57 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-gf2m.S   Sat Sep 29 19:45:18 2018 +0000
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 #include "arm_arch.h"
 
 .text
@@ -211,7 +212,7 @@
        veor    q0, q0, q3
 
        vst1.32 {q0}, [r0]
-       bx      lr              @ bx lr
+       RET             @ bx lr
 #endif
 .size  bn_GF2m_mul_2x2,.-bn_GF2m_mul_2x2
 #if __ARM_MAX_ARCH__>=7
diff -r ddd68cfcb0d6 -r 225aaf623ef8 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S   Sat Sep 29 19:44:57 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4-mont.S   Sat Sep 29 19:45:18 2018 +0000
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 #include "arm_arch.h"
 
 .text
@@ -183,7 +184,7 @@
        mov     r0,#1
 .Labrt:
 #if __ARM_ARCH__>=5
-       bx      lr                              @ bx lr
+       RET                             @ bx lr
 #else
        tst     lr,#1
        moveq   pc,lr                   @ be binary compatible with V4, yet
@@ -942,7 +943,7 @@
        mov     sp,ip
        vldmia  sp!,{d8,d9,d10,d11,d12,d13,d14,d15}
        ldmia   sp!,{r4,r5,r6,r7,r8,r9,r10,r11}
-       bx      lr                                              @ bx lr
+       RET                                             @ bx lr
 .size  bn_mul8x_mont_neon,.-bn_mul8x_mont_neon
 #endif
 .byte  
77,111,110,116,103,111,109,101,114,121,32,109,117,108,116,105,112,108,105,99,97,116,105,111,110,32,102,111,114,32,65,82,77,118,52,47,78,69,79,78,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
diff -r ddd68cfcb0d6 -r 225aaf623ef8 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S   Sat Sep 29 19:44:57 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv4cpuid.S   Sat Sep 29 19:45:18 2018 +0000
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 #include "arm_arch.h"
 
 .text
@@ -20,7 +21,7 @@
        cmp     r2,#0
        bne     .Ladd
        mov     r0,r3
-       bx      lr
+       RET
 #else
        stmdb   sp!,{r4,r5,r6,lr}
        ldr     r2,.Lspinlock
@@ -42,7 +43,7 @@
        ldmia   sp!,{r4,r5,r6,lr}
        tst     lr,#1
        moveq   pc,lr
-.word  0xe12fff1e      @ bx    lr
+.word  0xe12fff1e      @ RET
 #endif
 .size  OPENSSL_atomic_add,.-OPENSSL_atomic_add
 
@@ -77,11 +78,11 @@
        bne     .Little
 .Lcleanse_done:
 #if __ARM_ARCH__>=5
-       bx      lr
+       RET
 #else
        tst     lr,#1
        moveq   pc,lr
-.word  0xe12fff1e      @ bx    lr
+.word  0xe12fff1e      @ RET
 #endif
 .size  OPENSSL_cleanse,.-OPENSSL_cleanse
 
@@ -107,11 +108,11 @@
        rsb     r0,ip,#0
        mov     r0,r0,lsr#31
 #if __ARM_ARCH__>=5
-       bx      lr
+       RET
 #else
        tst     lr,#1
        moveq   pc,lr
-.word  0xe12fff1e      @ bx    lr
+.word  0xe12fff1e      @ RET
 #endif
 .size  CRYPTO_memcmp,.-CRYPTO_memcmp
 
@@ -124,7 +125,7 @@
 .type  _armv7_neon_probe,%function
 _armv7_neon_probe:
        vorr    q0,q0,q0
-       bx      lr
+       RET
 .size  _armv7_neon_probe,.-_armv7_neon_probe
 
 .globl _armv7_tick
@@ -135,7 +136,7 @@
 #else
        mrrc    p15,1,r0,r1,c14         @ CNTVCT
 #endif
-       bx      lr
+       RET
 .size  _armv7_tick,.-_armv7_tick
 
 .globl _armv8_aes_probe
@@ -146,7 +147,7 @@
 #else
 .byte  0x00,0x03,0xb0,0xf3     @ aese.8        q0,q0
 #endif
-       bx      lr
+       RET
 .size  _armv8_aes_probe,.-_armv8_aes_probe
 
 .globl _armv8_sha1_probe
@@ -157,7 +158,7 @@
 #else
 .byte  0x40,0x0c,0x00,0xf2     @ sha1c.32      q0,q0,q0
 #endif
-       bx      lr
+       RET
 .size  _armv8_sha1_probe,.-_armv8_sha1_probe
 
 .globl _armv8_sha256_probe
@@ -168,7 +169,7 @@
 #else
 .byte  0x40,0x0c,0x00,0xf3     @ sha256h.32    q0,q0,q0
 #endif
-       bx      lr
+       RET
 .size  _armv8_sha256_probe,.-_armv8_sha256_probe
 .globl _armv8_pmull_probe
 .type  _armv8_pmull_probe,%function
@@ -178,7 +179,7 @@
 #else
 .byte  0x00,0x0e,0xa0,0xf2     @ vmull.p64     q0,d0,d0
 #endif
-       bx      lr
+       RET
 .size  _armv8_pmull_probe,.-_armv8_pmull_probe
 #endif
 
@@ -215,11 +216,11 @@
 #endif
        mov     r0,sp
 #if __ARM_ARCH__>=5
-       bx      lr
+       RET
 #else
        tst     lr,#1
        moveq   pc,lr
-.word  0xe12fff1e      @ bx    lr
+.word  0xe12fff1e      @ RET
 #endif
 .size  OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
 
@@ -228,11 +229,11 @@
 OPENSSL_instrument_bus:
        eor     r0,r0,r0
 #if __ARM_ARCH__>=5
-       bx      lr
+       RET
 #else
        tst     lr,#1
        moveq   pc,lr
-.word  0xe12fff1e      @ bx    lr
+.word  0xe12fff1e      @ RET
 #endif
 .size  OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
 
@@ -241,11 +242,11 @@
 OPENSSL_instrument_bus2:
        eor     r0,r0,r0
 #if __ARM_ARCH__>=5
-       bx      lr
+       RET
 #else
        tst     lr,#1
        moveq   pc,lr
-.word  0xe12fff1e      @ bx    lr
+.word  0xe12fff1e      @ RET
 #endif
 .size  OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
 
diff -r ddd68cfcb0d6 -r 225aaf623ef8 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S   Sat Sep 29 19:44:57 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/armv8-mont.S   Sat Sep 29 19:45:18 2018 +0000
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 .text
 
 .globl bn_mul_mont
diff -r ddd68cfcb0d6 -r 225aaf623ef8 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S  Sat Sep 29 19:44:57 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/bsaes-armv7.S  Sat Sep 29 19:45:18 2018 +0000
@@ -1,3 +1,4 @@
+#include "arm_asm.h"
 @ Copyright 2012-2018 The OpenSSL Project Authors. All Rights Reserved.
 @
 @ Licensed under the OpenSSL license (the "License").  You may not use
@@ -546,7 +547,7 @@
        veor    q5, q5, q8
        veor    q0, q0, q8
        veor    q1, q1, q8
-       bx      lr
+       RET
 .size  _bsaes_decrypt8,.-_bsaes_decrypt8
 
 .type  _bsaes_const,%object
@@ -1006,7 +1007,7 @@
        veor    q5, q5, q8
        veor    q0, q0, q8
        veor    q1, q1, q8
-       bx      lr
+       RET
 .size  _bsaes_encrypt8,.-_bsaes_encrypt8
 .type  _bsaes_key_convert,%function
 .align 4
@@ -1065,7 +1066,7 @@
 
        vmov.i8 q7,#0x63                        @ compose .L63
        @ don't save last round key
-       bx      lr
+       RET
 .size  _bsaes_key_convert,.-_bsaes_key_convert
 
 
diff -r ddd68cfcb0d6 -r 225aaf623ef8 crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S Sat Sep 29 19:44:57 2018 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/chacha-armv4.S Sat Sep 29 19:45:18 2018 +0000
@@ -1,3 +1,4 @@



Home | Main Index | Thread Index | Old Index