x86nasm.pl update: use pre-defined macros and allow for /safeseh link.

diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl
index 38910426efc01413e4d9c00f28d9477ccb915ae3..dadbfe0c2cce16e25be3714e6355682e51b91979 100644 (file)
--- a/crypto/perlasm/x86nasm.pl
+++ b/crypto/perlasm/x86nasm.pl
@@ -4,7 +4,7 @@ package x86nasm;
 
 *out=\@::out;
 
 
 *out=\@::out;
 

-$::lbdecor="\@L";              # local label decoration
+$::lbdecor="L\$";              # local label decoration

 $nmdecor=$::netware?"":"_";    # external name decoration
 $drdecor=$::mwerks?".":"";     # directive decoration
 
 $nmdecor=$::netware?"":"_";    # external name decoration
 $drdecor=$::mwerks?".":"";     # directive decoration
 


@@ -75,12 +75,13 @@ sub ::file
 {   if ($::mwerks)     { push(@out,".section\t.text,64\n"); }
     else
     { my $tmp=<<___;
 {   if ($::mwerks)     { push(@out,".section\t.text,64\n"); }
     else
     { my $tmp=<<___;

-%ifdef __omf__
+%ifidn __OUTPUT_FORMAT__,obj

 section        code    use32 class=code align=64
 section        code    use32 class=code align=64

-%elifdef __coff__
-section        .text   code
-%else
+%elifidn __OUTPUT_FORMAT__,win32
+\$\@feat.00 equ 1

 section        .text   code align=64
 section        .text   code align=64

+%else
+section        .text   code

 %endif
 ___
        push(@out,$tmp);
 %endif
 ___
        push(@out,$tmp);