paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-21 04:29:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix check for generatenasmlib

Browse Source
This commit is contained in:
peter 2003-10-09 16:14:49 +00:00
parent d7dc302459
commit 94957bca12
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
compiler/systems/t_win32.pas
View File

@ -245,8 +245,7 @@ const
hp2:=twin32imported_item(hp1.imported_items.first); hp2:=twin32imported_item(hp1.imported_items.first);
while assigned(hp2) do while assigned(hp2) do
begin begin
if (aktoutputformat=as_i386_tasm) or if (aktoutputformat in [as_i386_tasm,as_i386_masm]) then
(aktoutputformat=as_i386_masm) then
p:=strpnew(#9+'EXTRN '+hp2.func^) p:=strpnew(#9+'EXTRN '+hp2.func^)
else else
p:=strpnew(#9+'EXTERN '+hp2.func^); p:=strpnew(#9+'EXTERN '+hp2.func^);
@ -260,9 +259,6 @@ const
end; end;
const
MainAsmFormats=[as_i386_pecoff,as_i386_pecoffwdosx];
procedure timportlibwin32.generatesmartlib; procedure timportlibwin32.generatesmartlib;
var var
hp1 : timportlist; hp1 : timportlist;
@ -276,7 +272,7 @@ const
lidata4,lidata5 : tasmlabel; lidata4,lidata5 : tasmlabel;
href : treference; href : treference;
begin begin
if not(aktoutputformat in MainAsmFormats)then if (aktoutputformat in [as_i386_masm,as_i386_tasm,as_i386_nasmwin32]) then
begin begin
generatenasmlib; generatenasmlib;
exit; exit;
@ -425,7 +421,7 @@ const
{$endif GDB} {$endif GDB}
href : treference; href : treference;
begin begin
if not(aktoutputformat in MainAsmFormats)then if (aktoutputformat in [as_i386_masm,as_i386_tasm,as_i386_nasmwin32]) then
begin begin
generatenasmlib; generatenasmlib;
exit; exit;
@ -654,11 +650,11 @@ const
address_table,name_table_pointers, address_table,name_table_pointers,
name_table,ordinal_table : TAAsmoutput; name_table,ordinal_table : TAAsmoutput;
begin begin
if not (aktoutputformat in MainAsmFormats)then if (aktoutputformat in [as_i386_masm,as_i386_tasm,as_i386_nasmwin32]) then
begin begin
generatenasmlib; generatenasmlib;
exit; exit;
end; end;
hp:=texported_item(current_module._exports.first); hp:=texported_item(current_module._exports.first);
if not assigned(hp) then if not assigned(hp) then
@ -1626,7 +1622,10 @@ initialization
end. end.
{ {
$Log$ $Log$
Revision 1.21 2003-10-03 14:16:48 marco Revision 1.22 2003-10-09 16:14:49 peter
* fix check for generatenasmlib
Revision 1.21 2003/10/03 14:16:48 marco
* -XP<prefix> support * -XP<prefix> support
Revision 1.20 2003/10/02 21:17:08 peter Revision 1.20 2003/10/02 21:17:08 peter