mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2026-02-19 19:36:26 +01:00
Merge branch source:main into main
This commit is contained in:
commit
9438768270
@ -883,7 +883,7 @@ implementation
|
||||
else
|
||||
write(t,', resultdef = <nil> ');
|
||||
printfileinfo(t,fileinfo);
|
||||
writeln(t,', loc = ',tcgloc2str[location.loc],
|
||||
write(t,', loc = ',tcgloc2str[location.loc],
|
||||
', expectloc = ',tcgloc2str[expectloc],
|
||||
', flags = [');
|
||||
first:=true;
|
||||
|
||||
@ -2218,8 +2218,8 @@ begin
|
||||
end;
|
||||
|
||||
{ monitor support? }
|
||||
if not(target_info.system in systems_aix+systems_bsd+systems_linux+
|
||||
systems_nativent+systems_solaris+systems_wasm+systems_all_windows+systems_darwin) then
|
||||
if not(target_info.system in systems_aix+systems_bsd+systems_linux+systems_android+
|
||||
systems_nativent+systems_solaris+systems_wasm+systems_all_windows-[system_i8086_win16]+systems_darwin) then
|
||||
Include(target_unsup_features,f_monitor);
|
||||
|
||||
if def then
|
||||
|
||||
@ -29,7 +29,7 @@ Const
|
||||
AllTargetsObjPas = DateUtilsOses +DateUtilOSes+
|
||||
VarutilsOses + ConvutilsOSes + ConvutilOSes + StdConvsOSes+
|
||||
FmtBCDOSes + StrUtilsOSes + UITypesOSes;
|
||||
MonitorOSes = [Win32,win64]+UnixLikes-[BeOS,Haiku]+[wasip1,wasip1threads];
|
||||
MonitorOSes = [Win32,win64,wince]+UnixLikes-[BeOS,Haiku]+[wasip1,wasip1threads];
|
||||
|
||||
Var
|
||||
P : TPackage;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user