diff options
| author | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-09-02 09:13:01 +0000 |
|---|---|---|
| committer | charlet <charlet@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-09-02 09:13:01 +0000 |
| commit | c2e114851469afad986c2d9107700e081579563f (patch) | |
| tree | ec9b26615a3bd8f8b4313b52af9e4618eda920ab /gcc/ada/prj-proc.adb | |
| parent | bb23e037c6b5308f05ec13dfdf9159d052ff3be8 (diff) | |
| download | ppe42-gcc-c2e114851469afad986c2d9107700e081579563f.tar.gz ppe42-gcc-c2e114851469afad986c2d9107700e081579563f.zip | |
2011-09-02 Pascal Obry <obry@adacore.com>
* prj-proc.adb, prj.adb, prj.ads, prj-dect.adb, prj-nmsc.adb,
prj-conf.adb, projects.texi: Add support for aggregate library projects.
2011-09-02 Hristian Kirtchev <kirtchev@adacore.com>
* exp_ch9.adb (Expand_N_Protected_Type_Declaration): Use
Dynamic_Interrupt_Protection as the proper protection type when
dynamic handler association is actually allowed.
2011-09-02 Robert Dewar <dewar@adacore.com>
* makeutl.ads: Minor reformatting
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@178446 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/ada/prj-proc.adb')
| -rw-r--r-- | gcc/ada/prj-proc.adb | 40 |
1 files changed, 37 insertions, 3 deletions
diff --git a/gcc/ada/prj-proc.adb b/gcc/ada/prj-proc.adb index b872d5aa838..e8ba9912978 100644 --- a/gcc/ada/prj-proc.adb +++ b/gcc/ada/prj-proc.adb @@ -2576,8 +2576,9 @@ package body Prj.Proc is List : Aggregated_Project_List; Loaded_Project : Prj.Tree.Project_Node_Id; Success : Boolean := True; + Tree : Project_Tree_Ref; begin - if Project.Qualifier /= Aggregate then + if Project.Qualifier not in Aggregate_Project then return; end if; @@ -2607,6 +2608,15 @@ package body Prj.Proc is Prj.Initialize (List.Tree); List.Tree.Shared := In_Tree.Shared; + -- In aggregate library, aggregated projects are parsed using + -- the aggregate library tree. + + if Project.Qualifier = Aggregate_Library then + Tree := In_Tree; + else + Tree := List.Tree; + end if; + -- We can only do the phase 1 of the processing, since we do -- not have access to the configuration file yet (this is -- called when doing phase 1 of the processing for the root @@ -2614,7 +2624,7 @@ package body Prj.Proc is if In_Tree.Is_Root_Tree then Process_Project_Tree_Phase_1 - (In_Tree => List.Tree, + (In_Tree => Tree, Project => List.Project, Success => Success, From_Project_Node => Loaded_Project, @@ -2625,7 +2635,7 @@ package body Prj.Proc is -- use the same environment as the rest of the aggregated -- projects, ie the one that was setup by the root aggregate Process_Project_Tree_Phase_1 - (In_Tree => List.Tree, + (In_Tree => Tree, Project => List.Project, Success => Success, From_Project_Node => Loaded_Project, @@ -2826,6 +2836,10 @@ package body Prj.Proc is if Project.Qualifier = Aggregate and then In_Tree.Is_Root_Tree then Initialize_And_Copy (Child_Env, Copy_From => Env); + elsif Project.Qualifier = Aggregate_Library then + -- The child environment is the same as the current one + Child_Env := Env; + else -- No need to initialize Child_Env, since it will not be -- used anyway by Process_Declarative_Items (only the root @@ -2866,6 +2880,26 @@ package body Prj.Proc is if Err_Vars.Total_Errors_Detected = 0 then Process_Aggregated_Projects; + + -- For an aggregate library we add the aggregated projects as + -- imported ones. This is necessary to give visibility to all + -- sources from the aggregates from the aggregated library + -- projects. + + if Project.Qualifier = Aggregate_Library then + declare + L : Aggregated_Project_List := + Project.Aggregated_Projects; + begin + while L /= null loop + Project.Imported_Projects := + new Project_List_Element' + (Project => L.Project, + Next => Project.Imported_Projects); + L := L.Next; + end loop; + end; + end if; end if; if Project.Qualifier = Aggregate and then In_Tree.Is_Root_Tree then |
