From acdd47c907fa8277c08c1cd0570fc967f7d9eef5 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sun, 11 Jul 2004 18:58:19 +0000
Subject: [PATCH]   * support varaiable_cpu

---
 utils/fpcm/fpcmmain.pp |  9 ++++++++-
 utils/fpcm/fpcmwr.pp   | 27 ++++++++++++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/utils/fpcm/fpcmmain.pp b/utils/fpcm/fpcmmain.pp
index 3e1c4c14fd..edaca413ac 100644
--- a/utils/fpcm/fpcmmain.pp
+++ b/utils/fpcm/fpcmmain.pp
@@ -918,6 +918,7 @@ implementation
           LoadRequires(t,c,ReqFPCMake);
           { Add the current requirements to our parents requirements }
           s:=Trim(ReqFPCMake.GetVariable('require_packages',true)+' '+
+                  ReqFPCMake.GetVariable('require_packages'+cpusuffix[c],true)+' '+
                   ReqFPCMake.GetVariable('require_packages'+targetsuffix[t],true)+' '+
                   ReqFPCMake.GetVariable('require_packages'+targetsuffix[t]+cpusuffix[c],true));
           SetVariable('require_packages'+targetsuffix[t]+cpusuffix[c],s,true);
@@ -939,6 +940,7 @@ implementation
       begin
         { packages }
         s:=Trim(FromFPCMake.GetVariable('require_packages',true)+' '+
+                FromFPCMake.GetVariable('require_packages'+CpuSuffix[c],true)+' '+
                 FromFPCMake.GetVariable('require_packages'+TargetSuffix[t],true)+' '+
                 FromFPCMake.GetVariable('require_packages'+TargetSuffix[t]+CpuSuffix[c],true));
         Verbose(FPCMakeDebug,'Required packages for '+TargetStr[t]+'-'+CpuStr[c]+': '+s);
@@ -968,6 +970,7 @@ implementation
         until false;
         { sub dirs }
         s:=Trim(FromFPCMake.GetVariable('target_dirs',true)+' '+
+                FromFPCMake.GetVariable('target_dirs'+CpuSuffix[c],true)+' '+
                 FromFPCMake.GetVariable('target_dirs'+TargetSuffix[t],true)+' '+
                 FromFPCMake.GetVariable('target_dirs'+TargetSuffix[t]+CpuSuffix[c],true));
         Verbose(FPCMakeDebug,'Required dirs for '+TargetStr[t]+'-'+CpuStr[c]+': '+s);
@@ -1055,6 +1058,7 @@ implementation
           i : integer;
         begin
           s:=Sec['packages']+' '+
+             Sec['packages'+CpuSuffix[c]]+' '+
              Sec['packages'+TargetSuffix[t]]+' '+
              Sec['packages'+TargetSuffix[t]+CpuSuffix[c]];
           repeat
@@ -1557,7 +1561,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.41  2004-06-29 19:20:49  marco
+  Revision 1.42  2004-07-11 18:58:19  peter
+    * support varaiable_cpu
+
+  Revision 1.41  2004/06/29 19:20:49  marco
    * rtl only autoadded if name<>rtl (+/- line 1030)
 
   Revision 1.40  2004/06/06 14:11:54  karoly
diff --git a/utils/fpcm/fpcmwr.pp b/utils/fpcm/fpcmwr.pp
index 549905eb5d..e28da9c7e9 100644
--- a/utils/fpcm/fpcmwr.pp
+++ b/utils/fpcm/fpcmwr.pp
@@ -351,6 +351,17 @@ implementation
             if not firsttarget then
              FOutput.Add('endif');
           end;
+         for c:=low(TCpu) to high(TCpu) do
+          if (c in FInput.IncludeCpus) then
+           begin
+             s:=FInput.GetVariable(IniVar+CpuSuffix[c],false);
+             if s<>'' then
+              begin
+                FOutput.Add('ifeq ($(CPU_TARGET),'+CpuStr[c]+')');
+                FOutput.Add('override '+FixVariable(IniVar)+'+='+s);
+                FOutput.Add('endif');
+              end;
+           end;
       end;
 
 
@@ -439,6 +450,17 @@ implementation
             if not firsttarget then
              FOutput.Add('endif');
           end;
+         for c:=low(TCpu) to high(TCpu) do
+          if (c in FInput.IncludeCpus) then
+           begin
+             s:=FInput.GetVariable(IniVar+TargetSuffix[t]+CpuSuffix[c],false);
+             if s<>'' then
+              begin
+                FOutput.Add('ifeq ($(CPU_TARGET),'+CpuStr[c]+')');
+                addtokens(s);
+                FOutput.Add('endif');
+              end;
+	   end;   
       end;
 
 
@@ -933,7 +955,10 @@ implementation
 end.
 {
   $Log$
-  Revision 1.30  2004-04-20 22:59:31  olle
+  Revision 1.31  2004-07-11 18:58:19  peter
+    * support varaiable_cpu
+
+  Revision 1.30  2004/04/20 22:59:31  olle
     * support for new fpcini section [defines]
 
   Revision 1.29  2004/04/01 12:26:56  olle