Proper solution to nasm compilation problems in Borland context.
authorAndy Polyakov <appro@openssl.org>
Tue, 20 Sep 2005 06:13:06 +0000 (06:13 +0000)
committerAndy Polyakov <appro@openssl.org>
Tue, 20 Sep 2005 06:13:06 +0000 (06:13 +0000)
crypto/perlasm/x86nasm.pl
util/pl/BC-32.pl

index ab5b96c6c266bdc10a1aa1d39d67fa232e79654d..331f18bb2202477fe03a76d6ce5439dfc53c0298 100644 (file)
@@ -263,7 +263,16 @@ sub using486
 sub main'file
        {
        if ($main'mwerks)       { push(@out,".section\t.text\n"); }
 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
        }
 
 sub main'function_begin
index e83b3361908f9ae23ba577074e94ad9d2f1a1c8b..578808f0c14218057f5243b48f03b9852a1af45f 100644 (file)
@@ -51,7 +51,7 @@ $lfile='';
 $shlib_ex_obj="";
 $app_ex_obj="c0x32.obj"; 
 
 $shlib_ex_obj="";
 $app_ex_obj="c0x32.obj"; 
 
-$asm='nasmw -f obj';
+$asm='nasmw -f obj -d__omf__';
 $asm.=" /Zi" if $debug;
 $afile='-o';
 
 $asm.=" /Zi" if $debug;
 $afile='-o';