Merge r43603

------------------------------------------------------------------------
r43603 | pierre | 2019-11-28 13:47:47 +0000 (Thu, 28 Nov 2019) | 1 line

 Disable ucomplex and matrix units for i8086-embedded target, because no fpu is installed in RTL by default
------------------------------------------------------------------------
--- Merging r43603 into '.':
U    packages/rtl-extra/fpmake.pp
--- Recording mergeinfo for merge of r43603 into '.':
 U   .

git-svn-id: branches/fixes_3_2@43619 -

packages/rtl-extra/fpmake.pp

@@ -91,7 +91,10 @@ begin
     if Defaults.CPU<>jvm then
       T:=P.Targets.AddUnit('clocale.pp',[android]);
 
-    T:=P.Targets.AddUnit('ucomplex.pp',UComplexOSes);
+    { Ideally, we should check if rtl contians math unit,
+      I do know how that can be checked. PM 2019/11/27 }
+    if (Defaults.CPU<>i8086) or (Defaults.OS<>embedded) then
+      T:=P.Targets.AddUnit('ucomplex.pp',UComplexOSes);
 
     T:=P.Targets.AddUnit('objects.pp',ObjectsOSes);
 
@@ -99,12 +102,17 @@ begin
     T.Dependencies.AddInclude('printerh.inc',PrinterOSes);
     T.Dependencies.AddInclude('printer.inc',PrinterOSes);
 
-    T:=P.Targets.AddUnit('matrix.pp',MatrixOSes);
-    with T.Dependencies do
-     begin
-       AddInclude('mvecimp.inc');
-       AddInclude('mmatimp.inc');
-     end;
+    { Ideally, we should check if rtl contians math unit,
+      I do know how that can be checked. PM 2019/11/27 }
+    if (Defaults.CPU<>i8086) or (Defaults.OS<>embedded) then
+      begin
+        T:=P.Targets.AddUnit('matrix.pp',MatrixOSes);
+        with T.Dependencies do
+          begin
+            AddInclude('mvecimp.inc');
+            AddInclude('mmatimp.inc');
+          end;
+      end;
     T:=P.Targets.AddUnit('winsock.pp',WinSockOSes);
     with T.Dependencies do
      begin