mirror of
				https://gitlab.com/freepascal.org/fpc/source.git
				synced 2025-11-04 08:19:36 +01:00 
			
		
		
		
	* fixed the "Incompatible section options" error when using the omf internal linker to produce msdos executables
git-svn-id: trunk@31347 -
This commit is contained in:
		
							parent
							
								
									a4c188ff01
								
							
						
					
					
						commit
						07fff73527
					
				@ -195,6 +195,13 @@ interface
 | 
			
		||||
        property OverlayNumber: Word read FOverlayNumber write FOverlayNumber;
 | 
			
		||||
      end;
 | 
			
		||||
 | 
			
		||||
      { TMZExeSection }
 | 
			
		||||
 | 
			
		||||
      TMZExeSection=class(TExeSection)
 | 
			
		||||
      public
 | 
			
		||||
        procedure AddObjSection(objsec:TObjSection;ignoreprops:boolean=false);override;
 | 
			
		||||
      end;
 | 
			
		||||
 | 
			
		||||
      { TMZExeOutput }
 | 
			
		||||
 | 
			
		||||
      TMZExeOutput = class(TExeOutput)
 | 
			
		||||
@ -1638,6 +1645,17 @@ implementation
 | 
			
		||||
        aWriter.WriteZeros(HeaderSizeInBytes-aWriter.Size);
 | 
			
		||||
      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
 | 
			
		||||
****************************************************************************}
 | 
			
		||||
@ -1657,6 +1675,7 @@ implementation
 | 
			
		||||
    constructor TMZExeOutput.create;
 | 
			
		||||
      begin
 | 
			
		||||
        inherited create;
 | 
			
		||||
        CExeSection:=TMZExeSection;
 | 
			
		||||
        CObjData:=TOmfObjData;
 | 
			
		||||
      end;
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user