From e05982c56ef9dbde368df8fe35a8458f34b76f76 Mon Sep 17 00:00:00 2001
From: kettenis <>
Date: Wed, 31 Oct 2012 11:19:35 +0000
Subject: On amd64 OPENSSL_cpuid_setup and OPENSSL_ia32cap_P are now hidden so
 we don't have to go through the PLT/GOT to get at them anymore.  In fact
 going through the GOT now fails since we no longer have a GOT entry for
 OPENSSL_ia32cap_P.

Fixes the problem spotted by jasper@ and sthen@.  Based on a diff from mikeb@
who did most of the actual work of tracking down the issue.

ok millert@, mikeb@
---
 src/lib/libcrypto/aes/asm/aes-x86_64.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/libcrypto/aes')

diff --git a/src/lib/libcrypto/aes/asm/aes-x86_64.pl b/src/lib/libcrypto/aes/asm/aes-x86_64.pl
index 027b4ae2e5..48fa857d5b 100755
--- a/src/lib/libcrypto/aes/asm/aes-x86_64.pl
+++ b/src/lib/libcrypto/aes/asm/aes-x86_64.pl
@@ -1678,7 +1678,7 @@ AES_cbc_encrypt:
 	lea	.LAES_Td(%rip),$sbox
 .Lcbc_picked_te:
 
-	mov	PIC_GOT(OPENSSL_ia32cap_P),%r10d
+	mov	OPENSSL_ia32cap_P(%rip),%r10d
 	cmp	\$$speed_limit,%rdx
 	jb	.Lcbc_slow_prologue
 	test	\$15,%rdx
-- 
cgit v1.2.3-55-g6feb