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/perlasm/x86_64-xlate.pl | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

diff --git a/src/lib/libcrypto/perlasm/x86_64-xlate.pl b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
index 50ff91e2f0..56d9b64b6f 100755
--- a/src/lib/libcrypto/perlasm/x86_64-xlate.pl
+++ b/src/lib/libcrypto/perlasm/x86_64-xlate.pl
@@ -215,8 +215,7 @@ my %globals;
 	undef	$ret;
 
 	# optional * ---vvv--- appears in indirect jmp/call
-	if ($line =~ /^(\*?)([^\(,]*)\(([%\w,]+)\)/ &&
-	    !($line =~ /^PIC_(GOT|PLT)/)) {
+	if ($line =~ /^(\*?)([^\(,]*)\(([%\w,]+)\)/) {
 	    $self->{asterisk} = $1;
 	    $self->{label} = $2;
 	    ($self->{base},$self->{index},$self->{scale})=split(/,/,$3);
@@ -773,8 +772,6 @@ my $rdrand = sub {
     }
 };
 
-print "#include <machine/asm.h>\n";
-
 if ($nasm) {
     print <<___;
 default	rel
-- 
cgit v1.2.3-55-g6feb