Switch to new uplink assembler.

[openssl.git] / ms / do_win64a.bat

diff --git a/ms/do_win64a.bat b/ms/do_win64a.bat
index 825c690221506be3d5c04b56671217287fe9c22e..2a63f85c885ccd8a15c967035cf246d313a80bdb 100755 (executable)
--- a/ms/do_win64a.bat
+++ b/ms/do_win64a.bat
@@ -1,7 +1,17 @@
-\r
 perl util\mkfiles.pl >MINFO\r
-perl ms\uplink.pl win64a > ms\uptable.asm\r
+\r
+cmd /c "nasm -f win64 -v" >NUL: 2>&1\r
+if %errorlevel% neq 0 goto ml64\r
+\r
+perl ms\uplink-x86_64.pl nasm > ms\uptable.asm\r
+nasm -f win64 -o ms\uptable.obj ms\uptable.asm\r
+goto proceed\r
+\r
+:ml64\r
+perl ms\uplink-x86_64.pl masm > ms\uptable.asm\r
 ml64 -c -Foms\uptable.obj ms\uptable.asm\r
+\r
+:proceed\r
 perl util\mk1mf.pl no-asm VC-WIN64A >ms\nt.mak\r
 perl util\mk1mf.pl dll no-asm VC-WIN64A >ms\ntdll.mak\r
 \r