paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-12 02:59:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

* fixed the "Incompatible section options" error when using the omf internal linker to produce msdos executables

Browse Source 
git-svn-id: trunk@31347 -
This commit is contained in:
nickysn 2015-08-20 14:50:59 +00:00
parent a4c188ff01
commit 07fff73527
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
compiler/ogomf.pas
View File

@ -195,6 +195,13 @@ interface
property OverlayNumber: Word read FOverlayNumber write FOverlayNumber; property OverlayNumber: Word read FOverlayNumber write FOverlayNumber;
end; end;
{ TMZExeSection }
TMZExeSection=class(TExeSection)
public
procedure AddObjSection(objsec:TObjSection;ignoreprops:boolean=false);override;
end;
{ TMZExeOutput } { TMZExeOutput }
TMZExeOutput = class(TExeOutput) TMZExeOutput = class(TExeOutput)
@ -1638,6 +1645,17 @@ implementation
aWriter.WriteZeros(HeaderSizeInBytes-aWriter.Size); aWriter.WriteZeros(HeaderSizeInBytes-aWriter.Size);
end; end;
{****************************************************************************
TMZExeSection
****************************************************************************}
procedure TMZExeSection.AddObjSection(objsec: TObjSection; ignoreprops: boolean);
begin
{ allow mixing initialized and uninitialized data in the same section
=> set ignoreprops=true }
inherited AddObjSection(objsec,true);
end;
{**************************************************************************** {****************************************************************************
TMZExeOutput TMZExeOutput
****************************************************************************} ****************************************************************************}
@ -1657,6 +1675,7 @@ implementation
constructor TMZExeOutput.create; constructor TMZExeOutput.create;
begin begin
inherited create; inherited create;
CExeSection:=TMZExeSection;
CObjData:=TOmfObjData; CObjData:=TOmfObjData;
end; end;