[src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64 Don't ...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64 Don't ...
From: christos <christos%NetBSD.org@localhost>
Date: Mon, 06 Apr 2020 23:29:28 +0000
details:   https://anonhg.NetBSD.org/src/rev/5e46111afd92
branches:  trunk
changeset: 780479:5e46111afd92
user:      christos <christos%NetBSD.org@localhost>
date:      Thu Jul 26 21:22:47 2012 +0000

description:
Don't do the PLTGOT for local labels, limit it to OPENSSL_ global symbols.

diffstat:

 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile            |   4 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S        |  12 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S |   2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S      |  16 ++--
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S      |  22 +++---
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S       |  10 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S      |  10 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S        |   2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S       |   2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S     |   2 +-
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S      |  36 +++++-----
 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S         |   2 +-
 12 files changed, 60 insertions(+), 60 deletions(-)

diffs (truncated from 518 to 300 lines):

diff -r 93ba27a3d980 -r 5e46111afd92 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile    Thu Jul 26 20:50:44 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile    Thu Jul 26 21:22:47 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2011/07/05 10:42:54 spz Exp $
+#      $NetBSD: Makefile,v 1.4 2012/07/26 21:22:47 christos Exp $
 
 .include "bsd.own.mk"
 
@@ -8,6 +8,6 @@
 regen:
        for i in $$(find ${OPENSSLSRC} -name \*${MACHINE_ARCH}.pl) \
                ${OPENSSLSRC}/crypto/${MACHINE_ARCH}cpuid.pl ; do \
-                perl $$i elf | sed -e 's/(%rip)/@GOTPCREL(%rip)/' \
+                perl $$i elf | sed -e 's/\(OPENSSL[A-Za-z0-9_+]*\)(%rip)/\1@GOTPCREL(%rip)/' \
                > $$(basename $$i .pl).S; \
        done
diff -r 93ba27a3d980 -r 5e46111afd92 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 Jul 26 20:50:44 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S        Thu Jul 26 21:22:47 2012 +0000
@@ -369,7 +369,7 @@
        movq    %rbp,8(%rsp)
 
 
-       leaq    .LAES_Te+2048@GOTPCREL(%rip),%r14
+       leaq    .LAES_Te+2048(%rip),%r14
        leaq    768(%rsp),%rbp
        subq    %r14,%rbp
        andq    $768,%rbp
@@ -817,7 +817,7 @@
        movq    %rbp,8(%rsp)
 
 
-       leaq    .LAES_Td+2048@GOTPCREL(%rip),%r14
+       leaq    .LAES_Td+2048(%rip),%r14
        leaq    768(%rsp),%rbp
        subq    %r14,%rbp
        andq    $768,%rbp
@@ -882,7 +882,7 @@
        testq   $-1,%rdi
        jz      .Lbadpointer
 
-       leaq    .LAES_Te@GOTPCREL(%rip),%rbp
+       leaq    .LAES_Te(%rip),%rbp
        leaq    2048+128(%rbp),%rbp
 
 
@@ -1147,7 +1147,7 @@
        cmpq    %rsi,%rdi
        jne     .Linvert
 
-       leaq    .LAES_Te+2048+1024@GOTPCREL(%rip),%rax
+       leaq    .LAES_Te+2048+1024(%rip),%rax
 
        movq    40(%rax),%rsi
        movq    48(%rax),%rdi
@@ -1318,10 +1318,10 @@
        cld
        movl    %r9d,%r9d
 
-       leaq    .LAES_Te@GOTPCREL(%rip),%r14
+       leaq    .LAES_Te(%rip),%r14
        cmpq    $0,%r9
        jne     .Lcbc_picked_te
-       leaq    .LAES_Td@GOTPCREL(%rip),%r14
+       leaq    .LAES_Td(%rip),%r14
 .Lcbc_picked_te:
 
        movl    OPENSSL_ia32cap_P@GOTPCREL(%rip),%r10d
diff -r 93ba27a3d980 -r 5e46111afd92 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 Jul 26 20:50:44 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S Thu Jul 26 21:22:47 2012 +0000
@@ -37,7 +37,7 @@
        movl    240(%r15),%r8d
        addq    %r10,%r14
 
-       leaq    K_XX_XX@GOTPCREL(%rip),%r11
+       leaq    K_XX_XX(%rip),%r11
        movl    0(%r9),%eax
        movl    4(%r9),%ebx
        movl    8(%r9),%ecx
diff -r 93ba27a3d980 -r 5e46111afd92 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S      Thu Jul 26 20:50:44 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S      Thu Jul 26 21:22:47 2012 +0000
@@ -744,8 +744,8 @@
 aesni_ccm64_encrypt_blocks:
        movl    240(%rcx),%eax
        movdqu  (%r8),%xmm9
-       movdqa  .Lincrement64@GOTPCREL(%rip),%xmm6
-       movdqa  .Lbswap_mask@GOTPCREL(%rip),%xmm7
+       movdqa  .Lincrement64(%rip),%xmm6
+       movdqa  .Lbswap_mask(%rip),%xmm7
 
        shrl    $1,%eax
        leaq    0(%rcx),%r11
@@ -802,8 +802,8 @@
        movl    240(%rcx),%eax
        movups  (%r8),%xmm9
        movdqu  (%r9),%xmm3
-       movdqa  .Lincrement64@GOTPCREL(%rip),%xmm6
-       movdqa  .Lbswap_mask@GOTPCREL(%rip),%xmm7
+       movdqa  .Lincrement64(%rip),%xmm6
+       movdqa  .Lbswap_mask(%rip),%xmm7
 
        movaps  %xmm9,%xmm2
        movl    %eax,%r10d
@@ -890,7 +890,7 @@
        je      .Lctr32_one_shortcut
 
        movdqu  (%r8),%xmm14
-       movdqa  .Lbswap_mask@GOTPCREL(%rip),%xmm15
+       movdqa  .Lbswap_mask(%rip),%xmm15
        xorl    %eax,%eax
 .byte  102,69,15,58,22,242,3
 .byte  102,68,15,58,34,240,3
@@ -949,7 +949,7 @@
        leaq    32(%r11),%rcx
        pxor    %xmm0,%xmm4
 .byte  102,15,56,220,217
-       movdqa  .Lincrement32@GOTPCREL(%rip),%xmm13
+       movdqa  .Lincrement32(%rip),%xmm13
        pxor    %xmm0,%xmm5
 .byte  102,15,56,220,225
        movdqa  -40(%rsp),%xmm12
@@ -1154,7 +1154,7 @@
        movq    %rdx,%r9
        andq    $-16,%rdx
 
-       movdqa  .Lxts_magic@GOTPCREL(%rip),%xmm8
+       movdqa  .Lxts_magic(%rip),%xmm8
        pxor    %xmm14,%xmm14
        pcmpgtd %xmm15,%xmm14
        pshufd  $19,%xmm14,%xmm9
@@ -1556,7 +1556,7 @@
        movq    %rdx,%r9
        andq    $-16,%rdx
 
-       movdqa  .Lxts_magic@GOTPCREL(%rip),%xmm8
+       movdqa  .Lxts_magic(%rip),%xmm8
        pxor    %xmm14,%xmm14
        pcmpgtd %xmm15,%xmm14
        pshufd  $19,%xmm14,%xmm9
diff -r 93ba27a3d980 -r 5e46111afd92 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S      Thu Jul 26 20:50:44 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S      Thu Jul 26 21:22:47 2012 +0000
@@ -6,7 +6,7 @@
 .type  _bsaes_encrypt8,@function
 .align 64
 _bsaes_encrypt8:
-       leaq    .LBS0@GOTPCREL(%rip),%r11
+       leaq    .LBS0(%rip),%r11
 
        movdqa  (%rax),%xmm8
        leaq    16(%rax),%rax
@@ -479,7 +479,7 @@
 .type  _bsaes_decrypt8,@function
 .align 64
 _bsaes_decrypt8:
-       leaq    .LBS0@GOTPCREL(%rip),%r11
+       leaq    .LBS0(%rip),%r11
 
        movdqa  (%rax),%xmm8
        leaq    16(%rax),%rax
@@ -1046,7 +1046,7 @@
 .type  _bsaes_key_convert,@function
 .align 16
 _bsaes_key_convert:
-       leaq    .Lmasks@GOTPCREL(%rip),%r11
+       leaq    .Lmasks(%rip),%r11
        movdqu  (%rcx),%xmm7
        leaq    16(%rcx),%rcx
        movdqa  0(%r11),%xmm0
@@ -1413,7 +1413,7 @@
        movdqa  %xmm7,(%rax)
 
        movdqa  (%rsp),%xmm8
-       leaq    .LADD1@GOTPCREL(%rip),%r11
+       leaq    .LADD1(%rip),%r11
        movdqa  32(%rbp),%xmm15
        movdqa  -32(%r11),%xmm7
 .byte  102,68,15,56,0,199
@@ -1458,7 +1458,7 @@
 .byte  102,15,56,0,231
        pxor    %xmm8,%xmm6
 .byte  102,15,56,0,239
-       leaq    .LBS0@GOTPCREL(%rip),%r11
+       leaq    .LBS0(%rip),%r11
 .byte  102,15,56,0,247
        movl    %ebx,%r10d
 
@@ -1492,7 +1492,7 @@
        movdqu  %xmm6,80(%r13)
        pxor    %xmm14,%xmm4
        movdqu  %xmm1,96(%r13)
-       leaq    .LADD1@GOTPCREL(%rip),%r11
+       leaq    .LADD1(%rip),%r11
        movdqu  %xmm4,112(%r13)
        leaq    128(%r13),%r13
        paddd   112(%r11),%xmm15
@@ -1619,7 +1619,7 @@
        movdqa  32(%rbp),%xmm6
 
        pxor    %xmm14,%xmm14
-       movdqa  .Lxts_magic@GOTPCREL(%rip),%xmm12
+       movdqa  .Lxts_magic(%rip),%xmm12
        pcmpgtd %xmm6,%xmm14
 
        subq    $128,%r14
@@ -1727,7 +1727,7 @@
 
        movdqa  112(%rsp),%xmm6
        pxor    %xmm14,%xmm14
-       movdqa  .Lxts_magic@GOTPCREL(%rip),%xmm12
+       movdqa  .Lxts_magic(%rip),%xmm12
        pcmpgtd %xmm6,%xmm14
        pshufd  $19,%xmm14,%xmm13
        pxor    %xmm14,%xmm14
@@ -2078,7 +2078,7 @@
        movdqa  32(%rbp),%xmm6
 
        pxor    %xmm14,%xmm14
-       movdqa  .Lxts_magic@GOTPCREL(%rip),%xmm12
+       movdqa  .Lxts_magic(%rip),%xmm12
        pcmpgtd %xmm6,%xmm14
 
        subq    $128,%r14
@@ -2186,7 +2186,7 @@
 
        movdqa  112(%rsp),%xmm6
        pxor    %xmm14,%xmm14
-       movdqa  .Lxts_magic@GOTPCREL(%rip),%xmm12
+       movdqa  .Lxts_magic(%rip),%xmm12
        pcmpgtd %xmm6,%xmm14
        pshufd  $19,%xmm14,%xmm13
        pxor    %xmm14,%xmm14
@@ -2443,7 +2443,7 @@
        jz      .Lxts_dec_ret
 
        pxor    %xmm14,%xmm14
-       movdqa  .Lxts_magic@GOTPCREL(%rip),%xmm12
+       movdqa  .Lxts_magic(%rip),%xmm12
        pcmpgtd %xmm6,%xmm14
        pshufd  $19,%xmm14,%xmm13
        movdqa  %xmm6,%xmm5
diff -r 93ba27a3d980 -r 5e46111afd92 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S       Thu Jul 26 20:50:44 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S       Thu Jul 26 21:22:47 2012 +0000
@@ -29,7 +29,7 @@
        movq    %rdx,%r14
 
        shll    $6,%edi
-       leaq    .LCamellia_SBOX@GOTPCREL(%rip),%rbp
+       leaq    .LCamellia_SBOX(%rip),%rbp
        leaq    (%r14,%rdi,1),%r15
 
        movl    0(%rsi),%r8d
@@ -298,7 +298,7 @@
        movq    %rdx,%r15
 
        shll    $6,%edi
-       leaq    .LCamellia_SBOX@GOTPCREL(%rip),%rbp
+       leaq    .LCamellia_SBOX(%rip),%rbp
        leaq    (%r15,%rdi,1),%r14
 
        movl    0(%rsi),%r8d
@@ -595,8 +595,8 @@
        xorl    12(%r13),%r10d
 
 .L1st128:
-       leaq    .LCamellia_SIGMA@GOTPCREL(%rip),%r14
-       leaq    .LCamellia_SBOX@GOTPCREL(%rip),%rbp
+       leaq    .LCamellia_SIGMA(%rip),%r14
+       leaq    .LCamellia_SBOX(%rip),%rbp
 
        movl    0(%r14),%ebx
        movl    4(%r14),%eax
@@ -1638,7 +1638,7 @@
        movq    %rbp,48(%rsp)
 
 .Lcbc_body:
-       leaq    .LCamellia_SBOX@GOTPCREL(%rip),%rbp
+       leaq    .LCamellia_SBOX(%rip),%rbp
 
        movl    $32,%ecx
 .align 4
diff -r 93ba27a3d980 -r 5e46111afd92 crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S
--- a/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S      Thu Jul 26 20:50:44 2012 +0000
+++ b/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S      Thu Jul 26 21:22:47 2012 +0000
@@ -10,7 +10,7 @@
 .Lgmult_prologue:
 
        movzbq  15(%rdi),%r8
-       leaq    .Lrem_4bit@GOTPCREL(%rip),%r11
+       leaq    .Lrem_4bit(%rip),%r11
        xorq    %rax,%rax
        xorq    %rbx,%rbx
        movb    %r8b,%al
@@ -301,7 +301,7 @@
        movq    8(%rdi),%r8
        movq    0(%rdi),%r9
Prev by Date: [src/trunk]: src/sys Revert, with intention of restoring in a less invasive w...
Next by Date: [src/trunk]: src/crypto/external/bsd/openssl/dist/crypto/rc4 make this compile.
Previous by Thread: [src/trunk]: src/sys Revert, with intention of restoring in a less invasive w...
Next by Thread: [src/trunk]: src/crypto/external/bsd/openssl/dist/crypto/rc4 make this compile.
Indexes:
Home | Main Index | Thread Index | Old Index