paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-04 17:50:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not add abi-call0 to linker options for esp8266

Browse Source
This commit is contained in:
ccrause 2024-12-25 13:03:48 +02:00 committed by FPK
parent bd1942eb90
commit 891e91590f
2 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
compiler/systems/t_embed.pas
View File

@ -106,10 +106,7 @@ begin
platformopt:=' -b elf32-xtensa-le -m elf32xtensa'
else
platformopt:=' -b elf32-xtensa-be -m elf32xtensa';
if target_info.abi=abi_xtensa_call0 then
platformopt:=platformopt+' --abi-call0'
else if target_info.abi=abi_xtensa_windowed then
platformopt:=platformopt+' --abi-windowed';
platformopt:=platformopt+' $PLATFORMABI';
{$else}
platformopt:='';
{$endif}
@ -1812,6 +1809,17 @@ begin
{ Call linker }
SplitBinCmd(Info.ExeCmd[1],binstr,cmdstr);
Replace(cmdstr,'$OPT',Info.ExtraOptions);
{$ifdef xtensa}
if target_info.abi=abi_xtensa_call0 then
begin
if current_settings.controllertype=ct_esp8266 then
Replace(cmdstr,'$PLATFORMABI','')
else
Replace(cmdstr,'$PLATFORMABI','--abi-call0');
end
else if target_info.abi=abi_xtensa_windowed then
Replace(cmdstr,'$PLATFORMABI','--abi-windowed');
{$endif}
if not(cs_link_on_target in current_settings.globalswitches) then
begin
Replace(cmdstr,'$EXE',FixedExeFileName);

16
compiler/systems/t_freertos.pas
View File

@ -81,10 +81,7 @@ begin
platformopt:=' -b elf32-xtensa-le -m elf32xtensa'
else
platformopt:=' -b elf32-xtensa-be -m elf32xtensa';
if target_info.abi=abi_xtensa_call0 then
platformopt:=platformopt+' --abi-call0'
else if target_info.abi=abi_xtensa_windowed then
platformopt:=platformopt+' --abi-windowed';
platformopt:=platformopt+' $PLATFORMABI';
{$else}
platformopt:='';
{$endif}
@ -1682,6 +1679,17 @@ begin
{ Call linker }
SplitBinCmd(Info.ExeCmd[1],binstr,cmdstr);
Replace(cmdstr,'$OPT',Info.ExtraOptions);
{$ifdef xtensa}
if target_info.abi=abi_xtensa_call0 then
begin
if current_settings.controllertype=ct_esp8266 then
Replace(cmdstr,'$PLATFORMABI','')
else
Replace(cmdstr,'$PLATFORMABI','--abi-call0');
end
else if target_info.abi=abi_xtensa_windowed then
Replace(cmdstr,'$PLATFORMABI','--abi-windowed');
{$endif}
if not(cs_link_on_target in current_settings.globalswitches) then
begin
Replace(cmdstr,'$EXE',FixedExeFileName);