From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 25 Sep 2011 16:43:26 +0000 (+0000)
Subject: Win64 fixes.
X-Git-Tag: OpenSSL-fips-1_2_2~1
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=63fc9883c5920060f06b65b2c0762cee9e2a7796;p=oweals%2Fopenssl.git

Win64 fixes.
---

diff --git a/crypto/bn/asm/x86_64-mont.pl b/crypto/bn/asm/x86_64-mont.pl
index 6b33c7e9ea..c43b69592a 100755
--- a/crypto/bn/asm/x86_64-mont.pl
+++ b/crypto/bn/asm/x86_64-mont.pl
@@ -54,6 +54,7 @@ bn_mul_mont:
 	push	%r14
 	push	%r15
 
+	mov	${num}d,${num}d
 	lea	2($num),%rax
 	mov	%rsp,%rbp
 	neg	%rax
diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl
index af3569cff3..798a618949 100644
--- a/util/pl/VC-32.pl
+++ b/util/pl/VC-32.pl
@@ -149,7 +149,7 @@ if ($FLAVOR =~ /CE/)
 else
 	{
 	$ex_libs.=' gdi32.lib advapi32.lib user32.lib';
-	$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
+	$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
 	}
 
 # As native NT API is pure UNICODE, our WIN-NT build defaults to UNICODE,
@@ -331,7 +331,7 @@ sub do_lib_rule
 
 		if ($name eq "")
 			{
-			$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
+			$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
 			}
 		elsif ($FLAVOR =~ /CE/)
 			{
@@ -341,7 +341,7 @@ sub do_lib_rule
 			{
 			$ex.=' unicows.lib' if ($FLAVOR =~ /NT/);
 			$ex.=' wsock32.lib gdi32.lib advapi32.lib user32.lib';
-			$ex.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/);
+			$ex_libs.=' bufferoverflowu.lib' if ($FLAVOR =~ /WIN64/ and `cl 2>&1` =~ /14\.00\.4[0-9]{4}\./);
 			}
 		$ex.=" $zlib_lib" if $zlib_opt == 1 && $target =~ /O_CRYPTO/;