From: Andy Polyakov <appro@openssl.org>
Date: Tue, 20 Sep 2005 06:21:39 +0000 (+0000)
Subject: Proper solution to nasm compilation problems in Borland context.
X-Git-Tag: OpenSSL_0_9_7h~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cd029eb6f0d59b4d390699ad7a84d0a8ec3f4c23;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 5009acb4b3..4bdb3fe180 100644
--- a/crypto/perlasm/x86nasm.pl
+++ b/crypto/perlasm/x86nasm.pl
@@ -221,7 +221,15 @@ sub using486
 
 sub main'file
 	{
-	push(@out, "segment .text use32\n");
+	local $tmp;
+	$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 897ae9d824..9de2d417d9 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';