paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 18:24:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 182 via svnmerge from

Browse Source 
/trunk

git-svn-id: branches/fixes_2_0@277 -
This commit is contained in:
peter 2005-06-08 06:42:32 +00:00
parent 437410539e
commit bc237f7556
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/pexports.pas
View File

@ -28,7 +28,8 @@ interface
{ reads an exports statement in a library } { reads an exports statement in a library }
procedure read_exports; procedure read_exports;
var
BinaryContainsExports: boolean = false;
implementation implementation
uses uses
@ -77,6 +78,7 @@ implementation
end; end;
begin begin
BinaryContainsExports:=true;
DefString:=''; DefString:='';
InternalProcName:=''; InternalProcName:='';
consume(_EXPORTS); consume(_EXPORTS);

5
compiler/pmodules.pas
View File

@ -41,7 +41,7 @@ implementation
nbas,ncgutil, nbas,ncgutil,
link,assemble,import,export,gendef,ppu,comprsrc, link,assemble,import,export,gendef,ppu,comprsrc,
cresstr,procinfo, cresstr,procinfo,
dwarf, dwarf,pexports,
{$ifdef GDB} {$ifdef GDB}
gdb, gdb,
{$endif GDB} {$endif GDB}
@ -1487,7 +1487,7 @@ implementation
DLL will include the edata section } DLL will include the edata section }
if assigned(exportlib) and if assigned(exportlib) and
(target_info.system in [system_i386_win32,system_i386_wdosx]) and (target_info.system in [system_i386_win32,system_i386_wdosx]) and
assigned(current_module._exports.first) then BinaryContainsExports then
codesegment.concat(tai_const.create_sym(exportlib.edatalabel)); codesegment.concat(tai_const.create_sym(exportlib.edatalabel));
If ResourceStrings.ResStrCount>0 then If ResourceStrings.ResStrCount>0 then
@ -1619,6 +1619,7 @@ implementation
linker.MakeSharedLibrary linker.MakeSharedLibrary
else else
linker.MakeExecutable; linker.MakeExecutable;
BinaryContainsExports:=false;
end; end;
end; end;
end; end;