Skip to content

Commit

Permalink
Allow armv6 for Ultibo.
Browse files Browse the repository at this point in the history
  • Loading branch information
LongDirtyAnimAlf committed Jan 17, 2021
1 parent e976b76 commit 4310f21
Showing 1 changed file with 13 additions and 7 deletions.
20 changes: 13 additions & 7 deletions fpcupdeluxemainform.pas
Original file line number Diff line number Diff line change
Expand Up @@ -2207,7 +2207,7 @@ function TForm1.ButtonProcessCrossCompiler(Sender: TObject):boolean;
if radgrpCPU.ItemIndex<>-1 then
begin
s:=radgrpCPU.Items[radgrpCPU.ItemIndex];
if (s=GetCPU(TCPU.arm)) OR (s=GetCPU(TCPU.aarch64)) then
if (s=GetCPU(TCPU.arm)) OR (s=GetCPU(TCPU.aarch64)) OR (s='armv6') then
success:=true;
end;
end;
Expand Down Expand Up @@ -2294,14 +2294,14 @@ function TForm1.ButtonProcessCrossCompiler(Sender: TObject):boolean;
if radgrpOS.ItemIndex<>-1 then
begin
s:=radgrpOS.Items[radgrpOS.ItemIndex];
if (s=GetOS(TOS.linux)) then success:=true;
if (s=GetOS(TOS.linux)) OR (s=GetOS(TOS.ultibo)) then success:=true;
end;
end;
end;

if (NOT success) then
begin
if Sender<>nil then ShowMessage('ARMV6 is [only available] for [RPi] Linux.');
if Sender<>nil then ShowMessage('ARMV6 is [only available] for [RPi] Linux and Ultibo.');
exit;
end;

Expand Down Expand Up @@ -2772,10 +2772,16 @@ function TForm1.ButtonProcessCrossCompiler(Sender: TObject):boolean;
if (FPCupManager.CrossCPU_Target=TCPU.arm) then
begin
FPCupManager.FPCOPT:='-dFPC_ARMHF ';
FPCupManager.CrossOPT:='-CpARMV7A -CfVFPV3 -CIARM -CaEABIHF -OoFASTMATH ';
FPCupManager.CrossOS_SubArch:='armv7a';
//FPCupManager.CrossOPT:='-CpARMV6 -CfVFPV2 -CIARM -CaEABIHF -OoFASTMATH ';
//FPCupManager.CrossOS_SubArch:='armv6';
if (radgrpCPU.ItemIndex<>-1) AND (radgrpCPU.Items[radgrpCPU.ItemIndex]='armv6') then
begin
FPCupManager.CrossOPT:='-CpARMV6 -CfVFPV2 -CIARM -CaEABIHF -OoFASTMATH ';
FPCupManager.CrossOS_SubArch:='armv6';
end
else
begin
FPCupManager.CrossOPT:='-CpARMV7A -CfVFPV3 -CIARM -CaEABIHF -OoFASTMATH ';
FPCupManager.CrossOS_SubArch:='armv7a';
end;
end;
end;

Expand Down

0 comments on commit 4310f21

Please sign in to comment.