aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndy Polyakov <appro@openssl.org>2005-09-20 06:15:18 +0000
committerAndy Polyakov <appro@openssl.org>2005-09-20 06:15:18 +0000
commitcb59297438c954d152fc085fb36a76af93252924 (patch)
tree2d8e42a85f171155a2c7657431042c1754c58e99
parent5824f6bc06acc7e63a4d9c49c943bedff663a40a (diff)
downloadopenssl-cb59297438c954d152fc085fb36a76af93252924.tar.gz
Proper solution to nasm compilation problems in Borland context.
-rw-r--r--crypto/perlasm/x86nasm.pl11
-rw-r--r--util/pl/BC-32.pl2
2 files changed, 11 insertions, 2 deletions
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';