Module Name: src
Committed By: christos
Date: Thu Jul 26 21:22:47 UTC 2012
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: Makefile
aes-x86_64.S aesni-sha1-x86_64.S aesni-x86_64.S bsaes-x86_64.S
cmll-x86_64.S ghash-x86_64.S rc4-x86_64.S sha1-x86_64.S
sha512-x86_64.S vpaes-x86_64.S wp-x86_64.S
Log Message:
Don't do the PLTGOT for local labels, limit it to OPENSSL_ global symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S
cvs rdiff -u -r1.1 -r1.2 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile:1.3 Tue Jul 5 06:42:54 2011
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/Makefile Thu Jul 26 17:22:47 2012
@@ -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 @@ CRYPTODIST=${NETBSDSRCDIR}/crypto
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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S:1.3 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/cmll-x86_64.S Thu Jul 26 17:22:47 2012
@@ -29,7 +29,7 @@ Camellia_EncryptBlock_Rounds:
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 @@ Camellia_DecryptBlock_Rounds:
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 @@ Camellia_Ekeygen:
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 @@ Camellia_cbc_encrypt:
movq %rbp,48(%rsp)
.Lcbc_body:
- leaq .LCamellia_SBOX@GOTPCREL(%rip),%rbp
+ leaq .LCamellia_SBOX(%rip),%rbp
movl $32,%ecx
.align 4
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.4
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.3 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S Thu Jul 26 17:22:47 2012
@@ -1302,7 +1302,7 @@ _ssse3_shortcut:
shlq $6,%r10
addq %r9,%r10
- leaq K_XX_XX@GOTPCREL(%rip),%r11
+ leaq K_XX_XX(%rip),%r11
movl 0(%r8),%eax
movl 4(%r8),%ebx
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S:1.4 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aes-x86_64.S Thu Jul 26 17:22:47 2012
@@ -369,7 +369,7 @@ AES_encrypt:
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 @@ AES_decrypt:
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 @@ _x86_64_AES_set_encrypt_key:
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 @@ private_AES_set_decrypt_key:
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 @@ AES_cbc_encrypt:
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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S:1.4 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-x86_64.S Thu Jul 26 17:22:47 2012
@@ -744,8 +744,8 @@ aesni_ecb_encrypt:
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 @@ aesni_ccm64_decrypt_blocks:
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 @@ aesni_ctr32_encrypt_blocks:
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 @@ aesni_ctr32_encrypt_blocks:
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 @@ aesni_xts_encrypt:
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 @@ aesni_xts_decrypt:
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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S:1.4 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/rc4-x86_64.S Thu Jul 26 17:22:47 2012
@@ -593,7 +593,7 @@ private_RC4_set_key:
.type RC4_options,@function
.align 16
RC4_options:
- leaq .Lopts@GOTPCREL(%rip),%rax
+ leaq .Lopts(%rip),%rax
movl OPENSSL_ia32cap_P@GOTPCREL(%rip),%edx
btl $20,%edx
jc .L8xchar
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S:1.4 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha512-x86_64.S Thu Jul 26 17:22:47 2012
@@ -21,7 +21,7 @@ sha256_block_data_order:
movq %r11,64+24(%rsp)
.Lprologue:
- leaq K256@GOTPCREL(%rip),%rbp
+ leaq K256(%rip),%rbp
movl 0(%rdi),%eax
movl 4(%rdi),%ebx
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S:1.4 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/wp-x86_64.S Thu Jul 26 17:22:47 2012
@@ -23,7 +23,7 @@ whirlpool_block:
.Lprologue:
movq %r10,%rbx
- leaq .Ltable@GOTPCREL(%rip),%rbp
+ leaq .Ltable(%rip),%rbp
xorq %rcx,%rcx
xorq %rdx,%rdx
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S:1.1 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/aesni-sha1-x86_64.S Thu Jul 26 17:22:47 2012
@@ -37,7 +37,7 @@ aesni_cbc_sha1_enc_ssse3:
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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S:1.1 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/bsaes-x86_64.S Thu Jul 26 17:22:47 2012
@@ -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 @@ _bsaes_encrypt8_bitslice:
.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 @@ _bsaes_decrypt8:
.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 @@ bsaes_ctr32_encrypt_blocks:
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 @@ bsaes_ctr32_encrypt_blocks:
.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 @@ bsaes_ctr32_encrypt_blocks:
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 @@ bsaes_xts_encrypt:
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 @@ bsaes_xts_encrypt:
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 @@ bsaes_xts_decrypt:
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 @@ bsaes_xts_decrypt:
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 @@ bsaes_xts_decrypt:
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
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S:1.1 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/ghash-x86_64.S Thu Jul 26 17:22:47 2012
@@ -10,7 +10,7 @@ gcm_gmult_4bit:
.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 @@ gcm_ghash_4bit:
movq 8(%rdi),%r8
movq 0(%rdi),%r9
addq %r14,%r15
- leaq .Lrem_8bit@GOTPCREL(%rip),%r11
+ leaq .Lrem_8bit(%rip),%r11
jmp .Louter_loop
.align 16
.Louter_loop:
@@ -672,7 +672,7 @@ gcm_init_clmul:
por %xmm3,%xmm2
- pand .L0x1c2_polynomial@GOTPCREL(%rip),%xmm5
+ pand .L0x1c2_polynomial(%rip),%xmm5
pxor %xmm5,%xmm2
@@ -724,7 +724,7 @@ gcm_init_clmul:
.align 16
gcm_gmult_clmul:
movdqu (%rdi),%xmm0
- movdqa .Lbswap_mask@GOTPCREL(%rip),%xmm5
+ movdqa .Lbswap_mask(%rip),%xmm5
movdqu (%rsi),%xmm2
.byte 102,15,56,0,197
movdqa %xmm0,%xmm1
@@ -773,7 +773,7 @@ gcm_gmult_clmul:
.type gcm_ghash_clmul,@function
.align 16
gcm_ghash_clmul:
- movdqa .Lbswap_mask@GOTPCREL(%rip),%xmm5
+ movdqa .Lbswap_mask(%rip),%xmm5
movdqu (%rdi),%xmm0
movdqu (%rsi),%xmm2
Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S:1.2
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S:1.1 Thu Jul 26 15:58:42 2012
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/vpaes-x86_64.S Thu Jul 26 17:22:47 2012
@@ -22,18 +22,18 @@ _vpaes_encrypt_core:
movq $16,%r11
movl 240(%rdx),%eax
movdqa %xmm9,%xmm1
- movdqa .Lk_ipt@GOTPCREL(%rip),%xmm2
+ movdqa .Lk_ipt(%rip),%xmm2
pandn %xmm0,%xmm1
movdqu (%r9),%xmm5
psrld $4,%xmm1
pand %xmm9,%xmm0
.byte 102,15,56,0,208
- movdqa .Lk_ipt+16@GOTPCREL(%rip),%xmm0
+ movdqa .Lk_ipt+16(%rip),%xmm0
.byte 102,15,56,0,193
pxor %xmm5,%xmm2
pxor %xmm2,%xmm0
addq $16,%r9
- leaq .Lk_mc_backward@GOTPCREL(%rip),%r10
+ leaq .Lk_mc_backward(%rip),%r10
jmp .Lenc_entry
.align 16
@@ -111,7 +111,7 @@ _vpaes_decrypt_core:
movq %rdx,%r9
movl 240(%rdx),%eax
movdqa %xmm9,%xmm1
- movdqa .Lk_dipt@GOTPCREL(%rip),%xmm2
+ movdqa .Lk_dipt(%rip),%xmm2
pandn %xmm0,%xmm1
movq %rax,%r11
psrld $4,%xmm1
@@ -119,13 +119,13 @@ _vpaes_decrypt_core:
shlq $4,%r11
pand %xmm9,%xmm0
.byte 102,15,56,0,208
- movdqa .Lk_dipt+16@GOTPCREL(%rip),%xmm0
+ movdqa .Lk_dipt+16(%rip),%xmm0
xorq $48,%r11
- leaq .Lk_dsbd@GOTPCREL(%rip),%r10
+ leaq .Lk_dsbd(%rip),%r10
.byte 102,15,56,0,193
andq $48,%r11
pxor %xmm5,%xmm2
- movdqa .Lk_mc_forward+48@GOTPCREL(%rip),%xmm5
+ movdqa .Lk_mc_forward+48(%rip),%xmm5
pxor %xmm2,%xmm0
addq $16,%r9
addq %r10,%r11
@@ -221,16 +221,16 @@ _vpaes_schedule_core:
call _vpaes_preheat
- movdqa .Lk_rcon@GOTPCREL(%rip),%xmm8
+ movdqa .Lk_rcon(%rip),%xmm8
movdqu (%rdi),%xmm0
movdqa %xmm0,%xmm3
- leaq .Lk_ipt@GOTPCREL(%rip),%r11
+ leaq .Lk_ipt(%rip),%r11
call _vpaes_schedule_transform
movdqa %xmm0,%xmm7
- leaq .Lk_sr@GOTPCREL(%rip),%r10
+ leaq .Lk_sr(%rip),%r10
testq %rcx,%rcx
jnz .Lschedule_am_decrypting
@@ -355,19 +355,19 @@ _vpaes_schedule_core:
.align 16
.Lschedule_mangle_last:
- leaq .Lk_deskew@GOTPCREL(%rip),%r11
+ leaq .Lk_deskew(%rip),%r11
testq %rcx,%rcx
jnz .Lschedule_mangle_last_dec
movdqa (%r8,%r10,1),%xmm1
.byte 102,15,56,0,193
- leaq .Lk_opt@GOTPCREL(%rip),%r11
+ leaq .Lk_opt(%rip),%r11
addq $32,%rdx
.Lschedule_mangle_last_dec:
addq $-16,%rdx
- pxor .Lk_s63@GOTPCREL(%rip),%xmm0
+ pxor .Lk_s63(%rip),%xmm0
call _vpaes_schedule_transform
movdqu %xmm0,(%rdx)
@@ -452,7 +452,7 @@ _vpaes_schedule_low_round:
movdqa %xmm7,%xmm1
pslldq $8,%xmm7
pxor %xmm1,%xmm7
- pxor .Lk_s63@GOTPCREL(%rip),%xmm7
+ pxor .Lk_s63(%rip),%xmm7
movdqa %xmm9,%xmm1
@@ -537,13 +537,13 @@ _vpaes_schedule_transform:
.align 16
_vpaes_schedule_mangle:
movdqa %xmm0,%xmm4
- movdqa .Lk_mc_forward@GOTPCREL(%rip),%xmm5
+ movdqa .Lk_mc_forward(%rip),%xmm5
testq %rcx,%rcx
jnz .Lschedule_mangle_dec
addq $16,%rdx
- pxor .Lk_s63@GOTPCREL(%rip),%xmm4
+ pxor .Lk_s63(%rip),%xmm4
.byte 102,15,56,0,229
movdqa %xmm4,%xmm3
.byte 102,15,56,0,229
@@ -555,7 +555,7 @@ _vpaes_schedule_mangle:
.align 16
.Lschedule_mangle_dec:
- leaq .Lk_dksd@GOTPCREL(%rip),%r11
+ leaq .Lk_dksd(%rip),%r11
movdqa %xmm9,%xmm1
pandn %xmm4,%xmm1
psrld $4,%xmm1
@@ -712,7 +712,7 @@ vpaes_cbc_encrypt:
.type _vpaes_preheat,@function
.align 16
_vpaes_preheat:
- leaq .Lk_s0F@GOTPCREL(%rip),%r10
+ leaq .Lk_s0F(%rip),%r10
movdqa -32(%r10),%xmm10
movdqa -16(%r10),%xmm11
movdqa 0(%r10),%xmm9
