summaryrefslogtreecommitdiffstats
path: root/ms
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-05-07 01:47:23 +0200
committerDr. Stephen Henson <steve@openssl.org>2011-05-07 01:47:23 +0200
commit4fa3c4c3e9d417f04e2e26f41c45b8cdeab132f4 (patch)
tree53df9a4f57745bf49645807bb1afcb9cfca6d872 /ms
parentGet OPENSSL_FIPSSYMS from environment in fipsas.pl, include ppccap.c and .S (diff)
downloadopenssl-4fa3c4c3e9d417f04e2e26f41c45b8cdeab132f4.tar.xz
openssl-4fa3c4c3e9d417f04e2e26f41c45b8cdeab132f4.zip
Fixes for WIN64 FIPS build.
Diffstat (limited to 'ms')
-rw-r--r--ms/do_fips.bat11
1 files changed, 1 insertions, 10 deletions
diff --git a/ms/do_fips.bat b/ms/do_fips.bat
index 8071fbe06d..4df263c27b 100644
--- a/ms/do_fips.bat
+++ b/ms/do_fips.bat
@@ -31,10 +31,6 @@ goto compile
echo Auto Configuring for IA64
SET TARGET=VC-WIN64I
-perl ms\uplink.pl win64i > ms\uptable.asm
-if ERRORLEVEL 1 goto error
-ias -o ms\uptable.obj ms\uptable.asm
-if ERRORLEVEL 1 goto error
goto compile
@@ -42,13 +38,8 @@ goto compile
echo Auto Configuring for AMD64
SET TARGET=VC-WIN64A
-perl ms\uplink.pl win64a > ms\uptable.asm
-if ERRORLEVEL 1 goto error
-ml64 -c -Foms\uptable.obj ms\uptable.asm
-if ERRORLEVEL 1 goto error
-
if x%ASM% == xno-asm goto compile
-SET ASM=ml64
+SET ASM=nasm
:compile