[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64 Regene...

[joerg <joerg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1e385341c617
branches:  trunk
changeset: 808660:1e385341c617
user:      joerg <joerg%NetBSD.org@localhost>
date:      Thu May 28 19:13:53 2015 +0000

description:
Regenerate.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S        |   4 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S |  10 ++----
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S        |   8 ++--
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S       |  15 ++++------
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S       |   2 +-
 5 files changed, 16 insertions(+), 23 deletions(-)

diffs (107 lines):

diff -r 261b724eb83d -r 1e385341c617 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S        Thu May 28 19:13:32 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S        Thu May 28 19:13:53 2015 +0000
@@ -1325,12 +1325,12 @@
        leaq    .LAES_Td(%rip),%r14
 .Lcbc_picked_te:
 
-       movl    OPENSSL_ia32cap_P@GOTPCREL(%rip),%r10d
+       movq    OPENSSL_ia32cap_P@GOTPCREL(%rip),%r10
        cmpq    $512,%rdx
        jb      .Lcbc_slow_prologue
        testq   $15,%rdx
        jnz     .Lcbc_slow_prologue
-       btl     $28,%r10d
+       bt      $28,(%r10)
        jc      .Lcbc_slow_prologue
 
 
diff -r 261b724eb83d -r 1e385341c617 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S Thu May 28 19:13:32 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S Thu May 28 19:13:53 2015 +0000
@@ -7,13 +7,9 @@
 .align 16
 aesni_cbc_sha1_enc:
 
-       movl    OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r10d
-       movl    OPENSSL_ia32cap_P+4@GOTPCREL(%rip),%r11d
-       andl    $268435456,%r11d
-       andl    $1073741824,%r10d
-       orl     %r11d,%r10d
-       cmpl    $1342177280,%r10d
-       je      aesni_cbc_sha1_enc_avx
+       movq    OPENSSL_ia32cap_P@GOTPCREL(%rip),%r10
+       bt      $28,4(%r10)
+       jc      aesni_cbc_sha1_enc_avx
        jmp     aesni_cbc_sha1_enc_ssse3
        .byte   0xf3,0xc3
 .size  aesni_cbc_sha1_enc,.-aesni_cbc_sha1_enc
diff -r 261b724eb83d -r 1e385341c617 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S        Thu May 28 19:13:32 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S        Thu May 28 19:13:53 2015 +0000
@@ -24,7 +24,7 @@
        movb    -4(%rdi),%cl
        cmpl    $-1,256(%rdi)
        je      .LRC4_CHAR
-       movl    OPENSSL_ia32cap_P@GOTPCREL(%rip),%r8d
+       movq    OPENSSL_ia32cap_P@GOTPCREL(%rip),%r8
        xorq    %rbx,%rbx
        incb    %r10b
        subq    %r10,%rbx
@@ -32,7 +32,7 @@
        movl    (%rdi,%r10,4),%eax
        testq   $-16,%r11
        jz      .Lloop1
-       btl     $30,%r8d
+       bt      $30,(%r8)
        jc      .Lintel
        andq    $7,%rbx
        leaq    1(%r10),%rsi
@@ -531,8 +531,8 @@
        xorq    %r10,%r10
        xorq    %r11,%r11
 
-       movl    OPENSSL_ia32cap_P@GOTPCREL(%rip),%r8d
-       btl     $20,%r8d
+       movq    OPENSSL_ia32cap_P@GOTPCREL(%rip),%r8
+       bt      $20,(%r8)
        jc      .Lc1stloop
        jmp     .Lw1stloop
 
diff -r 261b724eb83d -r 1e385341c617 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S       Thu May 28 19:13:32 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S       Thu May 28 19:13:53 2015 +0000
@@ -6,15 +6,12 @@
 .type  sha1_block_data_order,@function
 .align 16
 sha1_block_data_order:
-       movl    OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r9d
-       movl    OPENSSL_ia32cap_P+4@GOTPCREL(%rip),%r8d
-       testl   $512,%r8d
-       jz      .Lialu
-       andl    $268435456,%r8d
-       andl    $1073741824,%r9d
-       orl     %r9d,%r8d
-       cmpl    $1342177280,%r8d
-       je      _avx_shortcut
+       movq    OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r8
+       movl    4(%r8),%r8d
+       btl     $9,%r8d
+       jnc     .Lialu
+       btl     $28,%r8d
+       jc      _avx_shortcut
        jmp     _ssse3_shortcut
 
 .align 16
diff -r 261b724eb83d -r 1e385341c617 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S       Thu May 28 19:13:32 2015 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64-gf2m.S       Thu May 28 19:13:53 2015 +0000
@@ -203,7 +203,7 @@
 .align 16
 bn_GF2m_mul_2x2:
        movq    OPENSSL_ia32cap_P@GOTPCREL(%rip),%rax
-       btq     $33,%rax
+       bt      $1,4(%rax)
        jnc     .Lvanilla_mul_2x2
 
 .byte  102,72,15,110,198