Merged with trunk at revision 194958.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/cilkplus@194982 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 24 insertions, 0 deletions

diff --git a/gcc/ada/makeutl.ads b/gcc/ada/makeutl.ads
index 7848ed093cb..37e9f610775 100644
--- a/gcc/ada/makeutl.ads
+++ b/gcc/ada/makeutl.ads
@@ -44,6 +44,18 @@ package Makeutl is
    type Fail_Proc is access procedure (S : String);
    --  Pointer to procedure which outputs a failure message
 
+   Root_Environment : Prj.Tree.Environment;
+   --  The environment coming from environment variables and command line
+   --  switches. When we do not have an aggregate project, this is used for
+   --  parsing the project tree. When we have an aggregate project, this is
+   --  used to parse the aggregate project; the latter then generates another
+   --  environment (with additional external values and project path) to parse
+   --  the aggregated projects.
+
+   Default_Config_Name : constant String := "default.cgpr";
+   --  Name of the configuration file used by gprbuild and generated by
+   --  gprconfig by default.
+
    On_Windows : constant Boolean := Directory_Separator = '\';
    --  True when on Windows
 
@@ -67,6 +79,18 @@ package Makeutl is
    Create_Map_File_Switch : constant String := "--create-map-file";
    --  Switch to create a map file when an executable is linked
 
+   Load_Standard_Base : Boolean := True;
+   --  False when gprbuild is called with --db-
+
+   package Db_Switch_Args is new Table.Table
+     (Table_Component_Type => Name_Id,
+      Table_Index_Type     => Integer,
+      Table_Low_Bound      => 1,
+      Table_Initial        => 200,
+      Table_Increment      => 100,
+      Table_Name           => "Makegpr.Db_Switch_Args");
+   --  Table of all the arguments of --db switches of gprbuild
+
    package Directories is new Table.Table
      (Table_Component_Type => Path_Name_Type,
       Table_Index_Type     => Integer,