From: Andy Polyakov <appro@openssl.org>
Date: Tue, 15 Jul 2008 12:50:44 +0000 (+0000)
Subject: x86nasm.pl update: use pre-defined macros and allow for /safeseh link.
X-Git-Tag: OpenSSL_0_9_8k^2~304
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=23dcb447ffbcdc252622a41dd1b8629f2df6b467;ds=sidebyside

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 38910426ef..dadbfe0c2c 100644
--- a/crypto/perlasm/x86nasm.pl
+++ b/crypto/perlasm/x86nasm.pl
@@ -4,7 +4,7 @@ package x86nasm;
 
 *out=\@::out;
 
-$::lbdecor="\@L";		# local label decoration
+$::lbdecor="L\$";		# local label 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=<<___;
-%ifdef __omf__
+%ifidn __OUTPUT_FORMAT__,obj
 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
+%else
+section	.text	code
 %endif
 ___
 	push(@out,$tmp);