paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-27 23:11:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Internal linker does not leave reference to .dll if no imports from it are used.

Browse Source 
* Internal linker writes FPC version to EXE header.
* Internal linker writes subsystem version 3.0 for wince.

git-svn-id: trunk@3760 -
This commit is contained in:
yury 2006-05-31 22:32:08 +00:00
parent 488d8ae766
commit ba04f1a147
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/ogcoff.pas
View File

@ -226,7 +226,8 @@ implementation
{$endif win32} {$endif win32}
cutils,verbose,globals, cutils,verbose,globals,
fmodule,aasmtai,aasmdata, fmodule,aasmtai,aasmdata,
ogmap ogmap,
version
; ;
const const
@ -2154,6 +2155,8 @@ const win32stub : array[0..131] of byte=(
begin begin
fillchar(peoptheader,sizeof(peoptheader),0); fillchar(peoptheader,sizeof(peoptheader),0);
peoptheader.magic:=COFF_OPT_MAGIC; peoptheader.magic:=COFF_OPT_MAGIC;
peoptheader.MajorLinkerVersion:=ord(version_nr)-ord('0');
peoptheader.MinorLinkerVersion:=(ord(release_nr)-ord('0'))*10 + (ord(patch_nr)-ord('0'));
peoptheader.tsize:=TextExeSec.Size; peoptheader.tsize:=TextExeSec.Size;
peoptheader.dsize:=DataExeSec.Size; peoptheader.dsize:=DataExeSec.Size;
peoptheader.bsize:=BSSExeSec.Size; peoptheader.bsize:=BSSExeSec.Size;
@ -2169,7 +2172,10 @@ const win32stub : array[0..131] of byte=(
peoptheader.MinorOperatingSystemVersion:=0; peoptheader.MinorOperatingSystemVersion:=0;
peoptheader.MajorImageVersion:=dllmajor; peoptheader.MajorImageVersion:=dllmajor;
peoptheader.MinorImageVersion:=dllminor; peoptheader.MinorImageVersion:=dllminor;
peoptheader.MajorSubsystemVersion:=4; if target_info.system in [system_arm_wince,system_i386_wince] then
peoptheader.MajorSubsystemVersion:=3
else
peoptheader.MajorSubsystemVersion:=4;
peoptheader.MinorSubsystemVersion:=0; peoptheader.MinorSubsystemVersion:=0;
peoptheader.Win32Version:=0; peoptheader.Win32Version:=0;
peoptheader.SizeOfImage:=Align(CurrMemPos,SectionMemAlign); peoptheader.SizeOfImage:=Align(CurrMemPos,SectionMemAlign);
@ -2380,16 +2386,20 @@ const win32stub : array[0..131] of byte=(
idata5objsection:=nil; idata5objsection:=nil;
idata6objsection:=nil; idata6objsection:=nil;
idata7objsection:=nil; idata7objsection:=nil;
StartImport(ExtLibrary.Name);
for j:=0 to ExtLibrary.ExternalSymbolList.Count-1 do for j:=0 to ExtLibrary.ExternalSymbolList.Count-1 do
begin begin
ExtSymbol:=TFPHashObject(ExtLibrary.ExternalSymbolList[j]); ExtSymbol:=TFPHashObject(ExtLibrary.ExternalSymbolList[j]);
exesym:=TExeSymbol(ExeSymbolList.Find(ExtSymbol.Name)); exesym:=TExeSymbol(ExeSymbolList.Find(ExtSymbol.Name));
if assigned(exesym) and if assigned(exesym) and
not assigned(exesym.objsymbol) then not assigned(exesym.objsymbol) then
exesym.objsymbol:=AddProcImport(ExtSymbol.Name); begin
if not assigned(idata2objsection) then
StartImport(ExtLibrary.Name);
exesym.objsymbol:=AddProcImport(ExtSymbol.Name);
end;
end; end;
EndImport; if assigned(idata2objsection) then
EndImport;
end; end;
end; end;