paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-05 18:07:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

* patch by Alfred Glänzer (manually "cherry picked"): Fix for internal error 200603061 on fixes, resolves #40758

Browse Source 
(cherry picked from commit ccb169b0f1)
This commit is contained in:
florian 2024-05-04 22:40:50 +02:00
parent 4f3b6199df
commit bff5cbd342
1 changed files with 47 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
compiler/ogbase.pas
View File

@ -2473,13 +2473,15 @@ implementation
j : longint;
hs : string;
exesym : TExeSymbol;
tmpsym,
objsym : TObjSymbol;
grp : TObjSectionGroup;
makeexternal : boolean;
begin
for j:=0 to ObjData.ObjSymbolList.Count-1 do
begin
objsym:=TObjSymbol(ObjData.ObjSymbolList[j]);
{ From the local symbols we are only interressed in the
{ From the local symbols we are only interested in the
VTENTRY and VTINHERIT symbols }
if objsym.bind=AB_LOCAL then
begin
@ -2532,25 +2534,20 @@ implementation
begin
exesym:=texesymbol.Create(FExeSymbolList,objsym.name);
exesym.ObjSymbol:=objsym;
end;
objsym.ExeSymbol:=exesym;
case objsym.bind of
AB_GLOBAL :
begin
if exesym.State<>symstate_defined then
begin
exesym.ObjSymbol:=objsym;
exesym.State:=symstate_defined;
end
else
end
else
begin
if assigned(objsym.objsection) and assigned(exesym.objsymbol.objsection) then
begin
if (oso_comdat in exesym.ObjSymbol.objsection.SecOptions) and
(oso_comdat in objsym.objsection.SecOptions) then
begin
if exesym.ObjSymbol.objsection.ComdatSelection=objsym.objsection.ComdatSelection then
begin
makeexternal:=true;
case objsym.objsection.ComdatSelection of
oscs_none:
Message1(link_e_duplicate_symbol,objsym.name);
makeexternal:=false;
oscs_any:
Message1(link_d_comdat_discard_any,objsym.name);
oscs_same_size:
@ -2565,22 +2562,52 @@ implementation
Message1(link_d_comdat_discard_content,objsym.name);
oscs_associative:
{ this is handled in a different way }
Message1(link_e_duplicate_symbol,objsym.name);
makeexternal:=false;
oscs_largest:
if objsym.size>exesym.ObjSymbol.size then
begin
Message1(link_d_comdat_replace_size,objsym.name);
exesym.ObjSymbol.exesymbol:=nil;
exesym.ObjSymbol:=objsym;
{ we swap the symbols and turn the smaller one to an external
symbol }
tmpsym:=exesym.objsymbol;
exesym.objsymbol:=objsym;
objsym.exesymbol:=exesym;
objsym:=tmpsym;
end;
end;
if makeexternal then
begin
{ Undefine the symbol, causing relocations to it from same
objdata to be redirected to the symbol that is actually
used }
if objsym.bind=AB_GLOBAL then
objsym.bind:=AB_EXTERNAL;
{ AB_WEAK_EXTERNAL remains unchanged }
objsym.objsection:=nil;
end;
end
else
Message1(link_e_comdat_selection_differs,objsym.name);
end
else
{ specific error if ComDat flags are different? }
Message1(link_e_duplicate_symbol,objsym.name);
end;
end;
end;
objsym.ExeSymbol:=exesym;
case objsym.bind of
AB_GLOBAL,
AB_PRIVATE_EXTERN:
begin
if exesym.State<>symstate_defined then
begin
exesym.ObjSymbol:=objsym;
exesym.State:=symstate_defined;
end
else
Message1(link_e_duplicate_symbol,objsym.name);
{ hidden symbols must become local symbols in the executable }
if objsym.bind=AB_PRIVATE_EXTERN then
objsym.bind:=AB_LOCAL;
end;
AB_EXTERNAL :
begin