diff options
author | Dr. Stephen Henson <steve@openssl.org> | 1999-07-12 18:12:43 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 1999-07-12 18:12:43 +0000 |
commit | bbdb543844cd4f8f787b678e33466afc12eccd96 (patch) | |
tree | 6910cfcd6aa9f6c6fa01acdd31a410900cf9be14 /util | |
parent | 5059658219465c2e3e15f45c5ca3a0d251cd5fba (diff) |
More NASM support code it still doesn't work but it doesn't work less than it
didn't work before :-)
Diffstat (limited to 'util')
-rwxr-xr-x | util/mk1mf.pl | 2 | ||||
-rw-r--r-- | util/pl/VC-32.pl | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index c9b5b2c502..0afc3c6736 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -58,6 +58,7 @@ and [options] can be one of no-ssl2 no-ssl3 - Skip this version of SSL just-ssl - remove all non-ssl keys/digest no-asm - No x86 asm + nasm - Use NASM for x86 asm no-socks - No socket code no-err - No error strings dll/shlib - Build shared libraries (MS) @@ -813,6 +814,7 @@ sub read_options elsif (/^no-dh$/) { $no_dh=1; } elsif (/^no-hmac$/) { $no_hmac=1; } elsif (/^no-asm$/) { $no_asm=1; } + elsif (/^nasm$/) { $nasm=1; } elsif (/^no-ssl2$/) { $no_ssl2=1; } elsif (/^no-ssl3$/) { $no_ssl3=1; } elsif (/^no-err$/) { $no_err=1; } diff --git a/util/pl/VC-32.pl b/util/pl/VC-32.pl index 8082d2ef3c..6db1c9fe23 100644 --- a/util/pl/VC-32.pl +++ b/util/pl/VC-32.pl @@ -49,10 +49,14 @@ $lfile='/out:'; $shlib_ex_obj=""; $app_ex_obj="setargv.obj"; - -$asm='ml /Cp /coff /c /Cx'; -$asm.=" /Zi" if $debug; -$afile='/Fo'; +if ($nasm) { + $asm='nasmw -f win32'; + $afile='-o '; +} else { + $asm='ml /Cp /coff /c /Cx'; + $asm.=" /Zi" if $debug; + $afile='/Fo'; +} $bn_asm_obj=''; $bn_asm_src=''; |