From: Andy Polyakov Date: Tue, 20 Sep 2005 06:13:06 +0000 (+0000) Subject: Proper solution to nasm compilation problems in Borland context. X-Git-Tag: OpenSSL_0_9_8k^2~1805 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=9ddeefe39d23ffe7559acc98722ab6dc5ed4f72d;p=oweals%2Fopenssl.git Proper solution to nasm compilation problems in Borland context. --- diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl index ab5b96c6c2..331f18bb22 100644 --- a/crypto/perlasm/x86nasm.pl +++ b/crypto/perlasm/x86nasm.pl @@ -263,7 +263,16 @@ sub using486 sub main'file { if ($main'mwerks) { push(@out,".section\t.text\n"); } - else { push(@out,"section\t.text use32\n"); } + else { + local $tmp=<<___; +%ifdef __omf__ +section code use32 class=code +%else +section .text +%endif +___ + push(@out,$tmp); + } } sub main'function_begin diff --git a/util/pl/BC-32.pl b/util/pl/BC-32.pl index e83b336190..578808f0c1 100644 --- a/util/pl/BC-32.pl +++ b/util/pl/BC-32.pl @@ -51,7 +51,7 @@ $lfile=''; $shlib_ex_obj=""; $app_ex_obj="c0x32.obj"; -$asm='nasmw -f obj'; +$asm='nasmw -f obj -d__omf__'; $asm.=" /Zi" if $debug; $afile='-o';