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

* fixed linking with eVC++ object files (bug #8542).

Browse Source 
git-svn-id: trunk@7556 -
This commit is contained in:
yury 2007-06-02 22:14:35 +00:00
parent 36471608c1
commit 73b8fba64b
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/ogcoff.pas
View File

@ -125,6 +125,9 @@ interface
TCoffObjData = class(TObjData)
private
win32 : boolean;
{$ifdef arm}
eVCobj : boolean;
{$endif arm}
public
constructor createcoff(const n:string;awin32:boolean;acObjSection:TObjSectionClass);
destructor destroy;override;
@ -817,7 +820,7 @@ const pemagic : array[0..3] of byte = (
if (relocsec.objdata=objdata) then
dec(address,TCoffObjSection(relocsec).orgmempos);
{$ifdef arm}
if (relocsec.objdata=objdata) then
if (relocsec.objdata=objdata) and not TCoffObjData(objdata).eVCobj then
inc(address, relocsec.MemPos)
else
{$endif arm}
@ -880,7 +883,7 @@ const pemagic : array[0..3] of byte = (
dec(address,TCoffObjSection(relocsec).orgmempos);
end;
{$ifdef arm}
if (relocsec.objdata=objdata) then
if (relocsec.objdata=objdata) and not TCoffObjData(objdata).eVCobj then
inc(address, relocsec.MemPos)
else
{$endif arm}
@ -1763,6 +1766,9 @@ const pemagic : array[0..3] of byte = (
InputError('Illegal COFF Magic');
exit;
end;
{$ifdef arm}
eVCobj:=header.flag=$100;
{$endif arm}
{ Strings }
AReader.Seek(header.sympos+header.syms*sizeof(CoffSymbol));
if not AReader.Read(strsize,4) then