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

* x86-64: Workaround to permit CPU types in command line with dashes in names (e.g. X86-64-V3)

Browse Source
This commit is contained in:
J. Gareth "Curious Kit" Moreton 2024-07-06 17:38:53 +01:00 committed by FPK
parent 7cbf18c6f3
commit 0fadf3515e
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
compiler/options.pas
View File

@ -2669,7 +2669,34 @@ begin
s:=upper(copy(more,j+1));
{$ifdef cpucapabilities}
{ find first occurrence of + or - }
deletepos:=PosCharset(['+','-'],s);
{$ifdef x86_64}
{ Workaround - don't remove the "-" signs from ICELAKE-CLIENT,
ICELAKE-SERVER, SKYLAKE-X, X86-64 and X86-64-V1 etc. }
if (Copy(s,1,8)='ICELAKE-') and
(
(Copy(s,9,6)='CLIENT') or
(Copy(s,9,6)='SERVER')
) then
begin
extrasettings:=Copy(s,15,Length(s));
deletepos:=PosCharset(['+','-'],extrasettings);
end
else if (Copy(s,1,9)='SKYLAKE-X') or
((Copy(s,1,8)='X86-64-V') and (s[9] in ['1','2','3','4'])) then
begin
extrasettings:=Copy(s,10,Length(s));
deletepos:=PosCharset(['+','-'],extrasettings);
end
else if (Copy(s,1,6)='X86-64') then
begin
extrasettings:=Copy(s,7,Length(s));
deletepos:=PosCharset(['+','-'],extrasettings);
end
else
{$endif x86_64}
deletepos:=PosCharset(['+','-'],s);
if deletepos<>0 then
begin
extrasettings:=Copy(s,deletepos,Length(s));