Commit 63fc9883 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Win64 fixes.

parent d1321464

crypto/bn/asm/x86_64-mont.pl

+1 −0
Original line number Diff line number Diff line
@@ -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

util/pl/VC-32.pl

+3 −3
Original line number Diff line number Diff line
@@ -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/;