[multiple changes]

2016-04-19  Bob Duff  <duff@adacore.com>

	* sem_elab.adb (Check_A_Call): There are cases where we have No
	(Ent) after the Alias loop, even when there was no previous error,
	so we can't assert that there was an error.

2016-04-19  Ed Schonberg  <schonberg@adacore.com>

	* sem_attr.adb (Analyze_Access_Attribute, OK_Self_Reference):
	Reject use of type name as a prefix to 'access within an aggregate
	in a context that is not the declarative region of a type.

2016-04-19  Vincent Celier  <celier@adacore.com>

	* gnatcmd.adb: Make "gnat ls -P" invoke gprls Make "gnat bind
	-P" invoke "gprbuild -b" Make "gnat link -P" invoke "gprbuild
	-l" Fail if the invocation is "gnat find -P" or "gnat xref -P"
	Remove anything related to project files
	* g-mbdira.adb: minor whitespace cleanup
	* g-spipat.adb: minor removal of extra spaces after closing paren

2016-04-19  Ed Schonberg  <schonberg@adacore.com>

	* exp_ch6.adb (Expand_Actuals):  If post-statements are present
	and the enclosing context is a function call or indexing, build
	an Expression_With_Actions for the call.

2016-04-19  Hristian Kirtchev  <kirtchev@adacore.com>

	* lib-writ.adb (Write_With_Lines): Code cleanup. Do not generate
	a with line for an ignored Ghost unit.
	* sem_ch7.adb (Analyze_Package_Declaration): Add local constant
	Par. A child package is Ghost when its parent is Ghost.
	* sem_prag.adb (Analyze_Pragma): Pragma Ghost can now apply to
	a subprogram declaration that acts as a compilation unit.

From-SVN: r235191

1 files changed, 54 insertions, 1201 deletions

diff --git a/gcc/ada/gnatcmd.adb b/gcc/ada/gnatcmd.adb
index 451f202..0d36566 100644
--- a/gcc/ada/gnatcmd.adb
+++ b/gcc/ada/gnatcmd.adb
@@ -23,32 +23,13 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with GNAT.Directory_Operations; use GNAT.Directory_Operations;
-
-with Csets;
 with Gnatvsn;
-with Makeutl;  use Makeutl;
-with MLib.Tgt; use MLib.Tgt;
-with MLib.Utl;
 with Namet;    use Namet;
 with Opt;      use Opt;
 with Osint;    use Osint;
-with Output;   use Output;
-with Prj;      use Prj;
-with Prj.Env;
-with Prj.Ext;  use Prj.Ext;
-with Prj.Pars;
-with Prj.Tree; use Prj.Tree;
-with Prj.Util; use Prj.Util;
-with Sdefault;
-with Sinput.P;
-with Snames;   use Snames;
-with Stringt;
 with Switch;   use Switch;
 with Table;
 with Targparm; use Targparm;
-with Tempdir;
-with Types;    use Types;
 
 with Ada.Characters.Handling; use Ada.Characters.Handling;
 with Ada.Command_Line;        use Ada.Command_Line;
@@ -60,9 +41,7 @@ procedure GNATCmd is
    Gprbuild : constant String := "gprbuild";
    Gprclean : constant String := "gprclean";
    Gprname  : constant String := "gprname";
-
-   Normal_Exit : exception;
-   --  Raise this exception for normal program termination
+   Gprls    : constant String := "gprls";
 
    Error_Exit : exception;
    --  Raise this exception if error detected
@@ -103,25 +82,6 @@ procedure GNATCmd is
       Pp    => Pretty);
    --  Mapping of alternate commands to commands
 
-   Project_Node_Tree : Project_Node_Tree_Ref;
-   Project_File      : String_Access;
-   Project           : Prj.Project_Id;
-   Current_Verbosity : Prj.Verbosity := Prj.Default;
-   Tool_Package_Name : Name_Id       := No_Name;
-
-   Project_Tree : constant Project_Tree_Ref :=
-                    new Project_Tree_Data (Is_Root_Tree => True);
-   --  The project tree
-
-   Old_Project_File_Used : Boolean := False;
-   --  This flag indicates a switch -p (for gnatxref and gnatfind) for
-   --  an old fashioned project file. -p cannot be used in conjunction
-   --  with -P.
-
-   Temp_File_Name : Path_Name_Type := No_Path;
-   --  The name of the temporary text file to put a list of source/object
-   --  files to pass to a tool.
-
    package First_Switches is new Table.Table
      (Table_Component_Type => String_Access,
       Table_Index_Type     => Integer,
@@ -131,32 +91,6 @@ procedure GNATCmd is
       Table_Name           => "Gnatcmd.First_Switches");
    --  A table to keep the switches from the project file
 
-   package Carg_Switches is new Table.Table
-     (Table_Component_Type => String_Access,
-      Table_Index_Type     => Integer,
-      Table_Low_Bound      => 1,
-      Table_Initial        => 20,
-      Table_Increment      => 100,
-      Table_Name           => "Gnatcmd.Carg_Switches");
-   --  A table to keep the switches following -cargs for ASIS tools
-
-   package Rules_Switches is new Table.Table
-     (Table_Component_Type => String_Access,
-      Table_Index_Type     => Integer,
-      Table_Low_Bound      => 1,
-      Table_Initial        => 20,
-      Table_Increment      => 100,
-      Table_Name           => "Gnatcmd.Rules_Switches");
-   --  A table to keep the switches following -rules for gnatcheck
-
-   package Library_Paths is new Table.Table (
-     Table_Component_Type => String_Access,
-     Table_Index_Type     => Integer,
-     Table_Low_Bound      => 1,
-     Table_Initial        => 20,
-     Table_Increment      => 100,
-     Table_Name           => "Make.Library_Path");
-
    package Last_Switches is new Table.Table
      (Table_Component_Type => String_Access,
       Table_Index_Type     => Integer,
@@ -165,36 +99,6 @@ procedure GNATCmd is
       Table_Increment      => 100,
       Table_Name           => "Gnatcmd.Last_Switches");
 
-   --  Packages of project files to pass to Prj.Pars.Parse, depending on the
-   --  tool. We allocate objects because we cannot declare aliased objects
-   --  as we are in a procedure, not a library level package.
-
-   subtype SA is String_Access;
-
-   Naming_String      : constant SA := new String'("naming");
-   Binder_String      : constant SA := new String'("binder");
-   Finder_String      : constant SA := new String'("finder");
-   Linker_String      : constant SA := new String'("linker");
-   Gnatls_String      : constant SA := new String'("gnatls");
-   Xref_String        : constant SA := new String'("cross_reference");
-
-   Packages_To_Check_By_Binder   : constant String_List_Access :=
-     new String_List'((Naming_String, Binder_String));
-
-   Packages_To_Check_By_Finder    : constant String_List_Access :=
-     new String_List'((Naming_String, Finder_String));
-
-   Packages_To_Check_By_Linker    : constant String_List_Access :=
-     new String_List'((Naming_String, Linker_String));
-
-   Packages_To_Check_By_Gnatls    : constant String_List_Access :=
-     new String_List'((Naming_String, Gnatls_String));
-
-   Packages_To_Check_By_Xref      : constant String_List_Access :=
-     new String_List'((Naming_String, Xref_String));
-
-   Packages_To_Check : String_List_Access := Prj.All_Packages;
-
    ----------------------------------
    -- Declarations for GNATCMD use --
    ----------------------------------
@@ -208,14 +112,6 @@ procedure GNATCmd is
    My_Exit_Status : Exit_Status := Success;
    --  The exit status of the spawned tool
 
-   Current_Work_Dir : constant String := Get_Current_Dir;
-   --  The path of the working directory
-
-   All_Projects : Boolean := False;
-   --  Flag used for GNAT CHECK, GNAT PRETTY and GNAT METRIC to indicate that
-   --  the underlying tool (gnatcheck, gnatpp or gnatmetric) should be invoked
-   --  for all sources of all projects.
-
    type Command_Entry is record
       Cname : String_Access;
       --  Command name for GNAT xxx command
@@ -330,275 +226,12 @@ procedure GNATCmd is
    -- Local Subprograms --
    -----------------------
 
-   procedure Check_Files;
-   --  For GNAT LIST, GNAT PRETTY and GNAT METRIC, check if a project file
-   --  is specified, without any file arguments and without a switch -files=.
-   --  If it is the case, invoke the GNAT tool with the proper list of files,
-   --  derived from the sources of the project.
-
-   procedure Check_Relative_Executable (Name : in out String_Access);
-   --  Check if an executable is specified as a relative path. If it is, and
-   --  the path contains directory information, fail. Otherwise, prepend the
-   --  exec directory. This procedure is only used for GNAT LINK when a project
-   --  file is specified.
-
-   procedure Delete_Temp_Config_Files;
-   --  Delete all temporary config files. The caller is responsible for
-   --  ensuring that Keep_Temporary_Files is False.
-
-   procedure Ensure_Absolute_Path
-     (Switch : in out String_Access;
-      Parent : String);
-   --  Test if Switch is a relative search path switch. If it is and it
-   --  includes directory information, prepend the path with Parent. This
-   --  subprogram is only called when using project files.
-
    procedure Output_Version;
    --  Output the version of this program
 
    procedure Usage;
    --  Display usage
 
-   procedure Process_Link;
-   --  Process GNAT LINK, when there is a project file specified
-
-   procedure Set_Library_For
-     (Project           : Project_Id;
-      Tree              : Project_Tree_Ref;
-      Libraries_Present : in out Boolean);
-   --  If Project is a library project, add the correct -L and -l switches to
-   --  the linker invocation.
-
-   procedure Set_Libraries is new
-     For_Every_Project_Imported (Boolean, Set_Library_For);
-   --  Add the -L and -l switches to the linker for all the library projects
-
-   -----------------
-   -- Check_Files --
-   -----------------
-
-   procedure Check_Files is
-      Add_Sources : Boolean := True;
-      Unit        : Prj.Unit_Index;
-      Subunit     : Boolean := False;
-      FD          : File_Descriptor := Invalid_FD;
-      Status      : Integer;
-      Success     : Boolean;
-
-      procedure Add_To_Response_File
-        (File_Name  : String;
-         Check_File : Boolean := True);
-      --  Include the file name passed as parameter in the response file for
-      --  the tool being called. If the response file can not be written then
-      --  the file name is passed in the parameter list of the tool. If the
-      --  Check_File parameter is True then the procedure verifies the
-      --  existence of the file before adding it to the response file.
-
-      --------------------------
-      -- Add_To_Response_File --
-      --------------------------
-
-      procedure Add_To_Response_File
-        (File_Name  : String;
-         Check_File : Boolean := True)
-      is
-      begin
-         Name_Len := 0;
-
-         Add_Str_To_Name_Buffer (File_Name);
-
-         if not Check_File or else
-           Is_Regular_File (Name_Buffer (1 .. Name_Len))
-         then
-            if FD /= Invalid_FD then
-               Name_Len := Name_Len + 1;
-               Name_Buffer (Name_Len) := ASCII.LF;
-
-               Status := Write (FD, Name_Buffer (1)'Address, Name_Len);
-
-               if Status /= Name_Len then
-                  Osint.Fail ("disk full");
-               end if;
-            else
-               Last_Switches.Increment_Last;
-               Last_Switches.Table (Last_Switches.Last) :=
-                 new String'(File_Name);
-            end if;
-         end if;
-      end Add_To_Response_File;
-
-   --  Start of processing for Check_Files
-
-   begin
-      --  Check if there is at least one argument that is not a switch
-
-      for Index in 1 .. Last_Switches.Last loop
-         if Last_Switches.Table (Index) (1) /= '-'
-           or else (Last_Switches.Table (Index).all'Length > 7
-                     and then Last_Switches.Table (Index) (1 .. 7) = "-files=")
-         then
-            Add_Sources := False;
-            exit;
-         end if;
-      end loop;
-
-      --  If all arguments are switches and there is no switch -files=, add the
-      --  path names of all the sources of the main project.
-
-      if Add_Sources then
-         Tempdir.Create_Temp_File (FD, Temp_File_Name);
-         Last_Switches.Increment_Last;
-         Last_Switches.Table (Last_Switches.Last) :=
-           new String'("-files=" & Get_Name_String (Temp_File_Name));
-
-         Unit := Units_Htable.Get_First (Project_Tree.Units_HT);
-         while Unit /= No_Unit_Index loop
-
-            --  We only need to put the library units, body or spec, but not
-            --  the subunits.
-
-            if Unit.File_Names (Impl) /= null
-              and then not Unit.File_Names (Impl).Locally_Removed
-            then
-               --  There is a body, check if it is for this project
-
-               if All_Projects
-                 or else Unit.File_Names (Impl).Project = Project
-               then
-                  Subunit := False;
-
-                  if Unit.File_Names (Spec) = null
-                    or else Unit.File_Names (Spec).Locally_Removed
-                  then
-                     --  We have a body with no spec: we need to check if
-                     --  this is a subunit, because gnatls will complain
-                     --  about subunits.
-
-                     declare
-                        Src_Ind : constant Source_File_Index :=
-                                    Sinput.P.Load_Project_File
-                                      (Get_Name_String
-                                         (Unit.File_Names (Impl).Path.Name));
-                     begin
-                        Subunit := Sinput.P.Source_File_Is_Subunit (Src_Ind);
-                     end;
-                  end if;
-
-                  if not Subunit then
-                     Add_To_Response_File
-                       (Get_Name_String (Unit.File_Names (Impl).Display_File),
-                        Check_File => False);
-                  end if;
-               end if;
-
-            elsif Unit.File_Names (Spec) /= null
-              and then not Unit.File_Names (Spec).Locally_Removed
-            then
-               --  We have a spec with no body. Check if it is for this project
-
-               if All_Projects
-                 or else Unit.File_Names (Spec).Project = Project
-               then
-                  Add_To_Response_File
-                    (Get_Name_String (Unit.File_Names (Spec).Display_File),
-                     Check_File => False);
-               end if;
-            end if;
-
-            Unit := Units_Htable.Get_Next (Project_Tree.Units_HT);
-         end loop;
-
-         if FD /= Invalid_FD then
-            Close (FD, Success);
-
-            if not Success then
-               Osint.Fail ("disk full");
-            end if;
-         end if;
-      end if;
-   end Check_Files;
-
-   -------------------------------
-   -- Check_Relative_Executable --
-   -------------------------------
-
-   procedure Check_Relative_Executable (Name : in out String_Access) is
-      Exec_File_Name : constant String := Name.all;
-
-   begin
-      if not Is_Absolute_Path (Exec_File_Name) then
-         for Index in Exec_File_Name'Range loop
-            if Exec_File_Name (Index) = Directory_Separator then
-               Fail ("relative executable (""" & Exec_File_Name
-                     & """) with directory part not allowed "
-                     & "when using project files");
-            end if;
-         end loop;
-
-         Get_Name_String (Project.Exec_Directory.Name);
-
-         if Name_Buffer (Name_Len) /= Directory_Separator then
-            Name_Len := Name_Len + 1;
-            Name_Buffer (Name_Len) := Directory_Separator;
-         end if;
-
-         Name_Buffer (Name_Len + 1 .. Name_Len + Exec_File_Name'Length) :=
-           Exec_File_Name;
-         Name_Len := Name_Len + Exec_File_Name'Length;
-         Name := new String'(Name_Buffer (1 .. Name_Len));
-      end if;
-   end Check_Relative_Executable;
-
-   ------------------------------
-   -- Delete_Temp_Config_Files --
-   ------------------------------
-
-   procedure Delete_Temp_Config_Files is
-      Success : Boolean;
-      Proj    : Project_List;
-      pragma Warnings (Off, Success);
-
-   begin
-      --  This should only be called if Keep_Temporary_Files is False
-
-      pragma Assert (not Keep_Temporary_Files);
-
-      if Project /= No_Project then
-         Proj := Project_Tree.Projects;
-         while Proj /= null loop
-            if Proj.Project.Config_File_Temp then
-               Delete_Temporary_File
-                 (Project_Tree.Shared, Proj.Project.Config_File_Name);
-            end if;
-
-            Proj := Proj.Next;
-         end loop;
-      end if;
-
-      --  If a temporary text file that contains a list of files for a tool
-      --  has been created, delete this temporary file.
-
-      if Temp_File_Name /= No_Path then
-         Delete_Temporary_File (Project_Tree.Shared, Temp_File_Name);
-      end if;
-   end Delete_Temp_Config_Files;
-
-   ---------------------------
-   -- Ensure_Absolute_Path --
-   ---------------------------
-
-   procedure Ensure_Absolute_Path
-     (Switch : in out String_Access;
-      Parent : String)
-   is
-   begin
-      Makeutl.Ensure_Absolute_Path
-        (Switch, Parent,
-         Do_Fail              => Osint.Fail'Access,
-         Including_Non_Switch => False,
-         Including_RTS        => True);
-   end Ensure_Absolute_Path;
-
    --------------------
    -- Output_Version --
    --------------------
@@ -628,7 +261,6 @@ procedure GNATCmd is
       New_Line;
 
       for C in Command_List'Range loop
-
          if Targparm.AAMP_On_Target then
             Put ("gnaampcmd ");
          else
@@ -654,361 +286,20 @@ procedure GNATCmd is
       end loop;
 
       New_Line;
-      Put_Line ("Commands bind, find, link, list and xref "
-                & "accept project file switches -vPx, -Pprj, -Xnam=val,"
-                & "--subdirs= and -eL");
-      New_Line;
    end Usage;
 
-   ------------------
-   -- Process_Link --
-   ------------------
-
-   procedure Process_Link is
-      Look_For_Executable : Boolean := True;
-      Libraries_Present   : Boolean := False;
-      Path_Option         : constant String_Access :=
-                              MLib.Linker_Library_Path_Option;
-      Prj                 : Project_Id := Project;
-      Arg                 : String_Access;
-      Last                : Natural := 0;
-      Skip_Executable     : Boolean := False;
-
-   begin
-      --  Add the default search directories, to be able to find libgnat in
-      --  call to MLib.Utl.Lib_Directory.
-
-      Add_Default_Search_Dirs;
-
-      Library_Paths.Set_Last (0);
-
-      --  Check if there are library project files
-
-      if MLib.Tgt.Support_For_Libraries /= None then
-         Set_Libraries (Project, Project_Tree, Libraries_Present);
-      end if;
-
-      --  If there are, add the necessary additional switches
-
-      if Libraries_Present then
-
-         --  Add -Wl,-rpath,<lib_dir>
-
-         --  If Path_Option is not null, create the switch ("-Wl,-rpath," or
-         --  equivalent) with all the library dirs plus the standard GNAT
-         --  library dir.
-
-         if Path_Option /= null then
-            declare
-               Option  : String_Access;
-               Length  : Natural := Path_Option'Length;
-               Current : Natural;
-
-            begin
-               if MLib.Separate_Run_Path_Options then
-
-                  --  We are going to create one switch of the form
-                  --  "-Wl,-rpath,dir_N" for each directory to consider.
-
-                  --  One switch for each library directory
-
-                  for Index in
-                    Library_Paths.First .. Library_Paths.Last
-                  loop
-                     Last_Switches.Increment_Last;
-                     Last_Switches.Table
-                       (Last_Switches.Last) := new String'
-                       (Path_Option.all &
-                        Last_Switches.Table (Index).all);
-                  end loop;
-
-                  --  One switch for the standard GNAT library dir
-
-                  Last_Switches.Increment_Last;
-                  Last_Switches.Table
-                    (Last_Switches.Last) := new String'
-                    (Path_Option.all & MLib.Utl.Lib_Directory);
-
-               else
-                  --  First, compute the exact length for the switch
-
-                  for Index in Library_Paths.First .. Library_Paths.Last loop
-
-                     --  Add the length of the library dir plus one for the
-                     --  directory separator.
-
-                     Length :=
-                       Length +
-                         Library_Paths.Table (Index)'Length + 1;
-                  end loop;
-
-                  --  Finally, add the length of the standard GNAT library dir
-
-                  Length := Length + MLib.Utl.Lib_Directory'Length;
-                  Option := new String (1 .. Length);
-                  Option (1 .. Path_Option'Length) := Path_Option.all;
-                  Current := Path_Option'Length;
-
-                  --  Put each library dir followed by a dir separator
-
-                  for Index in
-                    Library_Paths.First .. Library_Paths.Last
-                  loop
-                     Option
-                       (Current + 1 ..
-                        Current + Library_Paths.Table (Index)'Length) :=
-                       Library_Paths.Table (Index).all;
-                     Current :=
-                       Current + Library_Paths.Table (Index)'Length + 1;
-                     Option (Current) := Path_Separator;
-                  end loop;
-
-                  --  Finally put the standard GNAT library dir
-
-                  Option
-                    (Current + 1 .. Current + MLib.Utl.Lib_Directory'Length) :=
-                      MLib.Utl.Lib_Directory;
-
-                  --  And add the switch to the last switches
-
-                  Last_Switches.Increment_Last;
-                  Last_Switches.Table (Last_Switches.Last) := Option;
-               end if;
-            end;
-         end if;
-      end if;
-
-      --  Check if the first ALI file specified can be found, either in the
-      --  object directory of the main project or in an object directory of a
-      --  project file extended by the main project. If the ALI file can be
-      --  found, replace its name with its absolute path.
-
-      Skip_Executable := False;
-
-      Switch_Loop : for J in 1 .. Last_Switches.Last loop
-
-         --  If we have an executable just reset the flag
-
-         if Skip_Executable then
-            Skip_Executable := False;
-
-         --  If -o, set flag so that next switch is not processed
-
-         elsif Last_Switches.Table (J).all = "-o" then
-            Skip_Executable := True;
-
-         --  Normal case
-
-         else
-            declare
-               Switch    : constant String := Last_Switches.Table (J).all;
-               ALI_File  : constant String (1 .. Switch'Length + 4) :=
-                             Switch & ".ali";
-
-               Test_Existence : Boolean := False;
-
-            begin
-               Last := Switch'Length;
-
-               --  Skip real switches
-
-               if Switch'Length /= 0
-                 and then Switch (Switch'First) /= '-'
-               then
-                  --  Append ".ali" if file name does not end with it
-
-                  if Switch'Length <= 4
-                    or else Switch (Switch'Last - 3 .. Switch'Last) /= ".ali"
-                  then
-                     Last := ALI_File'Last;
-                  end if;
-
-                  --  If file name includes directory information, stop if ALI
-                  --  file exists.
-
-                  if Is_Absolute_Path (ALI_File (1 .. Last)) then
-                     Test_Existence := True;
-
-                  else
-                     for K in Switch'Range loop
-                        if Is_Directory_Separator (Switch (K)) then
-                           Test_Existence := True;
-                           exit;
-                        end if;
-                     end loop;
-                  end if;
-
-                  if Test_Existence then
-                     if Is_Regular_File (ALI_File (1 .. Last)) then
-                        exit Switch_Loop;
-                     end if;
-
-                  --  Look in object directories if ALI file exists
-
-                  else
-                     Project_Loop : loop
-                        declare
-                           Dir : constant String :=
-                                   Get_Name_String (Prj.Object_Directory.Name);
-                        begin
-                           if Is_Regular_File (Dir & ALI_File (1 .. Last)) then
-
-                              --  We have found the correct project, so we
-                              --  replace the file with the absolute path.
-
-                              Last_Switches.Table (J) :=
-                                new String'(Dir & ALI_File (1 .. Last));
-
-                              --  And we are done
-
-                              exit Switch_Loop;
-                           end if;
-                        end;
-
-                        --  Go to the project being extended, if any
-
-                        Prj := Prj.Extends;
-                        exit Project_Loop when Prj = No_Project;
-                     end loop Project_Loop;
-                  end if;
-               end if;
-            end;
-         end if;
-      end loop Switch_Loop;
-
-      --  If a relative path output file has been specified, we add the exec
-      --  directory.
-
-      for J in reverse 1 .. Last_Switches.Last - 1 loop
-         if Last_Switches.Table (J).all = "-o" then
-            Check_Relative_Executable (Name => Last_Switches.Table (J + 1));
-            Look_For_Executable := False;
-            exit;
-         end if;
-      end loop;
-
-      if Look_For_Executable then
-         for J in reverse 1 .. First_Switches.Last - 1 loop
-            if First_Switches.Table (J).all = "-o" then
-               Look_For_Executable := False;
-               Check_Relative_Executable
-                 (Name => First_Switches.Table (J + 1));
-               exit;
-            end if;
-         end loop;
-      end if;
-
-      --  If no executable is specified, then find the name of the first ALI
-      --  file on the command line and issue a -o switch with the absolute path
-      --  of the executable in the exec directory.
-
-      if Look_For_Executable then
-         for J in 1 .. Last_Switches.Last loop
-            Arg  := Last_Switches.Table (J);
-            Last := 0;
-
-            if Arg'Length /= 0 and then Arg (Arg'First) /= '-' then
-               if Arg'Length > 4
-                 and then Arg (Arg'Last - 3 .. Arg'Last) = ".ali"
-               then
-                  Last := Arg'Last - 4;
-
-               elsif Is_Regular_File (Arg.all & ".ali") then
-                  Last := Arg'Last;
-               end if;
-
-               if Last /= 0 then
-                  Last_Switches.Increment_Last;
-                  Last_Switches.Table (Last_Switches.Last) :=
-                    new String'("-o");
-                  Get_Name_String (Project.Exec_Directory.Name);
-                  Last_Switches.Increment_Last;
-                  Last_Switches.Table (Last_Switches.Last) :=
-                    new String'(Name_Buffer (1 .. Name_Len) &
-                                Executable_Name
-                                  (Base_Name (Arg (Arg'First .. Last))));
-                  exit;
-               end if;
-            end if;
-         end loop;
-      end if;
-   end Process_Link;
-
-   ---------------------
-   -- Set_Library_For --
-   ---------------------
-
-   procedure Set_Library_For
-     (Project           : Project_Id;
-      Tree              : Project_Tree_Ref;
-      Libraries_Present : in out Boolean)
-   is
-      pragma Unreferenced (Tree);
-
-      Path_Option : constant String_Access := MLib.Linker_Library_Path_Option;
-
-   begin
-      --  Case of library project
-
-      if Project.Library then
-         Libraries_Present := True;
-
-         --  Add the -L switch
-
-         Last_Switches.Increment_Last;
-         Last_Switches.Table (Last_Switches.Last) :=
-           new String'("-L" & Get_Name_String (Project.Library_Dir.Name));
-
-         --  Add the -l switch
-
-         Last_Switches.Increment_Last;
-         Last_Switches.Table (Last_Switches.Last) :=
-           new String'("-l" & Get_Name_String (Project.Library_Name));
-
-         --  Add the directory to table Library_Paths, to be processed later
-         --  if library is not static and if Path_Option is not null.
-
-         if Project.Library_Kind /= Static
-           and then Path_Option /= null
-         then
-            Library_Paths.Increment_Last;
-            Library_Paths.Table (Library_Paths.Last) :=
-              new String'(Get_Name_String (Project.Library_Dir.Name));
-         end if;
-      end if;
-   end Set_Library_For;
-
    procedure Check_Version_And_Help is new Check_Version_And_Help_G (Usage);
 
 --  Start of processing for GNATCmd
 
 begin
-   --  All output from GNATCmd is debugging or error output: send to stderr
-
-   Set_Standard_Error;
-
    --  Initializations
 
-   Csets.Initialize;
-   Snames.Initialize;
-   Stringt.Initialize;
-
-   Prj.Tree.Initialize (Root_Environment, Gnatmake_Flags);
-
-   Project_Node_Tree := new Project_Node_Tree_Data;
-   Prj.Tree.Initialize (Project_Node_Tree);
-
-   Prj.Initialize (Project_Tree);
-
    Last_Switches.Init;
    Last_Switches.Set_Last (0);
 
    First_Switches.Init;
    First_Switches.Set_Last (0);
-   Carg_Switches.Init;
-   Carg_Switches.Set_Last (0);
-   Rules_Switches.Init;
-   Rules_Switches.Set_Last (0);
 
    --  Set AAMP_On_Target from command name, for testing in Osint.Program_Name
    --  to handle the mapping of GNAAMP tool names. We don't extract it from
@@ -1171,6 +462,7 @@ begin
 
    begin
       if The_Command = Stack then
+
          --  Never call gnatstack with a prefix
 
          Program := new String'(Command_List (The_Command).Unixcmd.all);
@@ -1182,12 +474,15 @@ begin
          --  If we want to invoke gnatmake/gnatclean with -P, then check if
          --  gprbuild/gprclean is available; if it is, use gprbuild/gprclean
          --  instead of gnatmake/gnatclean.
-         --  Ditto for gnatname -> gprname.
+         --  Ditto for gnatname -> gprname and gnatls -> gprls.
 
          if The_Command = Make
-            or else The_Command = Compile
-            or else The_Command = Clean
-            or else The_Command = Name
+           or else The_Command = Compile
+           or else The_Command = Bind
+           or else The_Command = Link
+           or else The_Command = Clean
+           or else The_Command = Name
+           or else The_Command = List
          then
             declare
                Project_File_Used : Boolean := False;
@@ -1196,8 +491,8 @@ begin
             begin
                for J in 1 .. Last_Switches.Last loop
                   Switch := Last_Switches.Table (J);
-                  if Switch'Length >= 2 and then
-                    Switch (Switch'First .. Switch'First + 1) = "-P"
+                  if Switch'Length >= 2
+                    and then Switch (Switch'First .. Switch'First + 1) = "-P"
                   then
                      Project_File_Used := True;
                      exit;
@@ -1206,10 +501,26 @@ begin
 
                if Project_File_Used then
                   case The_Command is
-                     when Make | Compile =>
+                     when Make | Compile | Bind | Link =>
                         if Locate_Exec_On_Path (Gprbuild) /= null  then
-                           Program := new String'(Gprbuild);
+                           Program    := new String'(Gprbuild);
                            Get_Target := True;
+
+                           if The_Command = Bind then
+                              First_Switches.Append (new String'("-b"));
+                           elsif The_Command = Link then
+                              First_Switches.Append (new String'("-l"));
+                           end if;
+
+                        elsif The_Command = Bind then
+                           Fail
+                             ("'gnat bind -P' is no longer supported;" &
+                              " use 'gprbuild -b' instead.");
+
+                        elsif The_Command = Link then
+                           Fail
+                             ("'gnat Link -P' is no longer supported;" &
+                              " use 'gprbuild -l' instead.");
                         end if;
 
                      when Clean =>
@@ -1224,6 +535,12 @@ begin
                            Get_Target := True;
                         end if;
 
+                     when List =>
+                        if Locate_Exec_On_Path (Gprls) /= null then
+                           Program := new String'(Gprls);
+                           Get_Target := True;
+                        end if;
+
                      when others =>
                         null;
                   end case;
@@ -1242,15 +559,6 @@ begin
          end if;
       end if;
 
-      --  For the tools where the GNAT driver processes the project files,
-      --  allow shared library projects to import projects that are not shared
-      --  library projects, to avoid adding a switch for these tools. For the
-      --  builder (gnatmake), if a shared library project imports a project
-      --  that is not a shared library project and the appropriate switch is
-      --  not specified, the invocation of gnatmake will fail.
-
-      Opt.Unchecked_Shared_Lib_Imports := True;
-
       --  Locate the executable for the command
 
       Exec_Path := Locate_Exec_On_Path (Program.all);
@@ -1270,465 +578,35 @@ begin
          end loop;
       end if;
 
-      --  For BIND, FIND, LINK, LIST and XREF, look for project file related
-      --  switches.
-
-      case The_Command is
-         when Bind =>
-            Tool_Package_Name := Name_Binder;
-            Packages_To_Check := Packages_To_Check_By_Binder;
-         when Find =>
-            Tool_Package_Name := Name_Finder;
-            Packages_To_Check := Packages_To_Check_By_Finder;
-         when Link =>
-            Tool_Package_Name := Name_Linker;
-            Packages_To_Check := Packages_To_Check_By_Linker;
-         when List =>
-            Tool_Package_Name := Name_Gnatls;
-            Packages_To_Check := Packages_To_Check_By_Gnatls;
-         when Xref =>
-            Tool_Package_Name := Name_Cross_Reference;
-            Packages_To_Check := Packages_To_Check_By_Xref;
-         when others =>
-            Tool_Package_Name := No_Name;
-      end case;
-
-      if Tool_Package_Name /= No_Name then
-
-         --  Check that the switches are consistent. Detect project file
-         --  related switches.
-
-         Inspect_Switches : declare
-            Arg_Num : Positive := 1;
-            Argv    : String_Access;
-
-            procedure Remove_Switch (Num : Positive);
-            --  Remove a project related switch from table Last_Switches
-
-            -------------------
-            -- Remove_Switch --
-            -------------------
-
-            procedure Remove_Switch (Num : Positive) is
-            begin
-               Last_Switches.Table (Num .. Last_Switches.Last - 1) :=
-                 Last_Switches.Table (Num + 1 .. Last_Switches.Last);
-               Last_Switches.Decrement_Last;
-            end Remove_Switch;
-
-         --  Start of processing for Inspect_Switches
+      --  For FIND and XREF, look for switch -P. If it is specified, then
+      --  report an error indicating that the command is no longer supporting
+      --  project files.
 
+      if The_Command = Find or else  The_Command = Xref then
+         declare
+            Argv    : String_Access;
          begin
-            while Arg_Num <= Last_Switches.Last loop
+            for Arg_Num in 1 .. Last_Switches.Last loop
                Argv := Last_Switches.Table (Arg_Num);
 
-               if Argv (Argv'First) = '-' then
-                  if Argv'Length = 1 then
-                     Fail ("switch character cannot be followed by a blank");
-                  end if;
-
-                  --  The two style project files (-p and -P) cannot be used
-                  --  together
-
-                  if (The_Command = Find or else The_Command = Xref)
-                    and then Argv (2) = 'p'
-                  then
-                     Old_Project_File_Used := True;
-                     if Project_File /= null then
-                        Fail ("-P and -p cannot be used together");
-                     end if;
-                  end if;
-
-                  --  --subdirs=... Specify Subdirs
-
-                  if Argv'Length > Makeutl.Subdirs_Option'Length
-                    and then
-                      Argv
-                       (Argv'First ..
-                        Argv'First + Makeutl.Subdirs_Option'Length - 1) =
-                                                        Makeutl.Subdirs_Option
-                  then
-                     Subdirs :=
-                       new String'
-                         (Argv (Argv'First + Makeutl.Subdirs_Option'Length ..
-                                Argv'Last));
-
-                     Remove_Switch (Arg_Num);
-
-                  --  -aPdir  Add dir to the project search path
-
-                  elsif Argv'Length > 3
-                    and then Argv (Argv'First + 1 .. Argv'First + 2) = "aP"
-                  then
-                     Prj.Env.Add_Directories
-                       (Root_Environment.Project_Path,
-                        Argv (Argv'First + 3 .. Argv'Last));
-
-                     --  Pass -aPdir to gnatls, but not to other tools
-
-                     if The_Command = List then
-                        Arg_Num := Arg_Num + 1;
-                     else
-                        Remove_Switch (Arg_Num);
-                     end if;
-
-                  --  -eL  Follow links for files
-
-                  elsif Argv.all = "-eL" then
-                     Follow_Links_For_Files := True;
-                     Follow_Links_For_Dirs  := True;
-
-                     Remove_Switch (Arg_Num);
-
-                  --  -vPx  Specify verbosity while parsing project files
-
-                  elsif Argv'Length >= 3
-                    and then  Argv (Argv'First + 1 .. Argv'First + 2) = "vP"
-                  then
-                     if Argv'Length = 4
-                       and then Argv (Argv'Last) in '0' .. '2'
-                     then
-                        case Argv (Argv'Last) is
-                           when '0' =>
-                              Current_Verbosity := Prj.Default;
-                           when '1' =>
-                              Current_Verbosity := Prj.Medium;
-                           when '2' =>
-                              Current_Verbosity := Prj.High;
-                           when others =>
-
-                              --  Cannot happen
-
-                              raise Program_Error;
-                        end case;
-                     else
-                        Fail ("invalid verbosity level: "
-                              & Argv (Argv'First + 3 .. Argv'Last));
-                     end if;
-
-                     Remove_Switch (Arg_Num);
-
-                  --  -Pproject_file  Specify project file to be used
-
-                  elsif Argv (Argv'First + 1) = 'P' then
-
-                     --  Only one -P switch can be used
-
-                     if Project_File /= null then
-                        Fail
-                          (Argv.all
-                           & ": second project file forbidden (first is """
-                           & Project_File.all & """)");
-
-                     --  The two style project files (-p and -P) cannot be
-                     --  used together.
-
-                     elsif Old_Project_File_Used then
-                        Fail ("-p and -P cannot be used together");
-
-                     elsif Argv'Length = 2 then
-
-                        --  There is space between -P and the project file
-                        --  name. -P cannot be the last option.
-
-                        if Arg_Num = Last_Switches.Last then
-                           Fail ("project file name missing after -P");
-
-                        else
-                           Remove_Switch (Arg_Num);
-                           Argv := Last_Switches.Table (Arg_Num);
-
-                           --  After -P, there must be a project file name,
-                           --  not another switch.
-
-                           if Argv (Argv'First) = '-' then
-                              Fail ("project file name missing after -P");
-
-                           else
-                              Project_File := new String'(Argv.all);
-                           end if;
-                        end if;
-
-                     else
-                        --  No space between -P and project file name
-
-                        Project_File :=
-                          new String'(Argv (Argv'First + 2 .. Argv'Last));
-                     end if;
-
-                     Remove_Switch (Arg_Num);
-
-                  --  -Xexternal=value Specify an external reference to be
-                  --                   used in project files
-
-                  elsif Argv'Length >= 5
-                    and then Argv (Argv'First + 1) = 'X'
-                  then
-                     if not Check (Root_Environment.External,
-                                    Argv (Argv'First + 2 .. Argv'Last))
-                     then
-                        Fail
-                          (Argv.all & " is not a valid external assignment.");
-                     end if;
-
-                     Remove_Switch (Arg_Num);
-
-                  elsif
-                    The_Command = List
-                    and then Argv'Length = 2
-                    and then Argv (2) = 'U'
-                  then
-                     All_Projects := True;
-                     Remove_Switch (Arg_Num);
-
+               if Argv'Length >= 2 and then
+                  Argv (Argv'First .. Argv'First + 1) = "-P"
+               then
+                  if The_Command = Find then
+                     Fail ("'gnat find -P' is no longer supported;");
                   else
-                     Arg_Num := Arg_Num + 1;
+                     Fail ("'gnat xref -P' is no longer supported;");
                   end if;
-
-               else
-                  Arg_Num := Arg_Num + 1;
                end if;
             end loop;
-         end Inspect_Switches;
-      end if;
-
-      --  Add the default project search directories now, after the directories
-      --  that have been specified by switches -aP<dir>.
-
-      Prj.Env.Initialize_Default_Project_Path
-        (Root_Environment.Project_Path,
-         Target_Name => Sdefault.Target_Name.all);
-
-      --  If there is a project file specified, parse it, get the switches
-      --  for the tool and setup PATH environment variables.
-
-      if Project_File /= null then
-         Prj.Pars.Set_Verbosity (To => Current_Verbosity);
-
-         Prj.Pars.Parse
-           (Project           => Project,
-            In_Tree           => Project_Tree,
-            In_Node_Tree      => Project_Node_Tree,
-            Project_File_Name => Project_File.all,
-            Env               => Root_Environment,
-            Packages_To_Check => Packages_To_Check);
-
-         --  Prj.Pars.Parse calls Set_Standard_Output, reset to stderr
-
-         Set_Standard_Error;
-
-         if Project = Prj.No_Project then
-            Fail ("""" & Project_File.all & """ processing failed");
-
-         elsif Project.Qualifier = Aggregate then
-            Fail ("aggregate projects are not supported");
-
-         elsif Aggregate_Libraries_In (Project_Tree) then
-            Fail ("aggregate library projects are not supported");
-         end if;
-
-         --  Check if a package with the name of the tool is in the project
-         --  file and if there is one, get the switches, if any, and scan them.
-
-         declare
-            Pkg : constant Prj.Package_Id :=
-                    Prj.Util.Value_Of
-                      (Name        => Tool_Package_Name,
-                       In_Packages => Project.Decl.Packages,
-                       Shared      => Project_Tree.Shared);
-
-            Element : Package_Element;
-
-            Switches_Array : Array_Element_Id;
-
-            The_Switches : Prj.Variable_Value;
-            Current      : Prj.String_List_Id;
-            The_String   : String_Element;
-
-            Main : String_Access := null;
-
-         begin
-            if Pkg /= No_Package then
-               Element := Project_Tree.Shared.Packages.Table (Pkg);
-
-               --  Package Gnatls has a single attribute Switches, that is not
-               --  an associative array.
-
-               if The_Command = List then
-                  The_Switches :=
-                    Prj.Util.Value_Of
-                    (Variable_Name => Snames.Name_Switches,
-                     In_Variables  => Element.Decl.Attributes,
-                     Shared        => Project_Tree.Shared);
-
-               --  Packages Binder (for gnatbind), Cross_Reference (for
-               --  gnatxref), Linker (for gnatlink), Finder (for gnatfind),
-               --  have an attributed Switches, an associative array, indexed
-               --  by the name of the file.
-
-               --  They also have an attribute Default_Switches, indexed by the
-               --  name of the programming language.
-
-               else
-                  --  First check if there is a single main
-
-                  for J in 1 .. Last_Switches.Last loop
-                     if Last_Switches.Table (J) (1) /= '-' then
-                        if Main = null then
-                           Main := Last_Switches.Table (J);
-                        else
-                           Main := null;
-                           exit;
-                        end if;
-                     end if;
-                  end loop;
-
-                  if Main /= null then
-                     Switches_Array :=
-                       Prj.Util.Value_Of
-                         (Name      => Name_Switches,
-                          In_Arrays => Element.Decl.Arrays,
-                          Shared    => Project_Tree.Shared);
-                     Name_Len := 0;
-
-                     --  If the single main has been specified as an absolute
-                     --  path, use only the simple file name. If the absolute
-                     --  path is incorrect, an error will be reported by the
-                     --  underlying tool and it does not make a difference
-                     --  what switches are used.
-
-                     if Is_Absolute_Path (Main.all) then
-                        Add_Str_To_Name_Buffer (File_Name (Main.all));
-                     else
-                        Add_Str_To_Name_Buffer (Main.all);
-                     end if;
-
-                     The_Switches := Prj.Util.Value_Of
-                       (Index     => Name_Find,
-                        Src_Index => 0,
-                        In_Array  => Switches_Array,
-                        Shared    => Project_Tree.Shared);
-                  end if;
-
-                  if The_Switches.Kind = Prj.Undefined then
-                     Switches_Array :=
-                       Prj.Util.Value_Of
-                         (Name      => Name_Default_Switches,
-                          In_Arrays => Element.Decl.Arrays,
-                          Shared    => Project_Tree.Shared);
-                     The_Switches := Prj.Util.Value_Of
-                       (Index     => Name_Ada,
-                        Src_Index => 0,
-                        In_Array  => Switches_Array,
-                        Shared    => Project_Tree.Shared);
-                  end if;
-               end if;
-
-               --  If there are switches specified in the package of the
-               --  project file corresponding to the tool, scan them.
-
-               case The_Switches.Kind is
-                  when Prj.Undefined =>
-                     null;
-
-                  when Prj.Single =>
-                     declare
-                        Switch : constant String :=
-                                   Get_Name_String (The_Switches.Value);
-                     begin
-                        if Switch'Length > 0 then
-                           First_Switches.Increment_Last;
-                           First_Switches.Table (First_Switches.Last) :=
-                             new String'(Switch);
-                        end if;
-                     end;
-
-                  when Prj.List =>
-                     Current := The_Switches.Values;
-                     while Current /= Prj.Nil_String loop
-                        The_String := Project_Tree.Shared.String_Elements.
-                                        Table (Current);
-
-                        declare
-                           Switch : constant String :=
-                                      Get_Name_String (The_String.Value);
-                        begin
-                           if Switch'Length > 0 then
-                              First_Switches.Increment_Last;
-                              First_Switches.Table (First_Switches.Last) :=
-                                new String'(Switch);
-                           end if;
-                        end;
-
-                        Current := The_String.Next;
-                     end loop;
-               end case;
-            end if;
          end;
-
-         if The_Command = Bind or else The_Command = Link then
-            if Project.Object_Directory.Name = No_Path then
-               Fail ("project " & Get_Name_String (Project.Display_Name)
-                     & " has no object directory");
-            end if;
-
-            Change_Dir (Get_Name_String (Project.Object_Directory.Name));
-         end if;
-
-         --  Set up the env vars for project path files
-
-         Prj.Env.Set_Ada_Paths
-           (Project, Project_Tree, Including_Libraries => True);
-
-         --  For gnatcheck, gnatstub, gnatmetric, gnatpp and gnatelim, create
-         --  a configuration pragmas file, if necessary.
-
-         if The_Command = Link then
-            Process_Link;
-         end if;
-
-         if The_Command = Link or else The_Command = Bind then
-
-            --  For files that are specified as relative paths with directory
-            --  information, we convert them to absolute paths, with parent
-            --  being the current working directory if specified on the command
-            --  line and the project directory if specified in the project
-            --  file. This is what gnatmake is doing for linker and binder
-            --  arguments.
-
-            for J in 1 .. Last_Switches.Last loop
-               GNATCmd.Ensure_Absolute_Path
-                 (Last_Switches.Table (J), Current_Work_Dir);
-            end loop;
-
-            Get_Name_String (Project.Directory.Name);
-
-            declare
-               Project_Dir : constant String := Name_Buffer (1 .. Name_Len);
-            begin
-               for J in 1 .. First_Switches.Last loop
-                  GNATCmd.Ensure_Absolute_Path
-                    (First_Switches.Table (J), Project_Dir);
-               end loop;
-            end;
-         end if;
-
-         --  For gnat list, if no file has been put on the command line, call
-         --  tool with all the sources of the main project.
-
-         if The_Command = List then
-            Check_Files;
-         end if;
       end if;
 
       --  Gather all the arguments and invoke the executable
 
       declare
          The_Args : Argument_List
-                      (1 .. First_Switches.Last +
-                            Last_Switches.Last +
-                            Carg_Switches.Last +
-                            Rules_Switches.Last);
+                      (1 .. First_Switches.Last + Last_Switches.Last);
          Arg_Num  : Natural := 0;
 
       begin
@@ -1742,47 +620,22 @@ begin
             The_Args (Arg_Num) := Last_Switches.Table (J);
          end loop;
 
-         for J in 1 .. Carg_Switches.Last loop
-            Arg_Num := Arg_Num + 1;
-            The_Args (Arg_Num) := Carg_Switches.Table (J);
-         end loop;
-
-         for J in 1 .. Rules_Switches.Last loop
-            Arg_Num := Arg_Num + 1;
-            The_Args (Arg_Num) := Rules_Switches.Table (J);
-         end loop;
-
          if Verbose_Mode then
-            Output.Write_Str (Exec_Path.all);
+            Put (Exec_Path.all);
 
             for Arg in The_Args'Range loop
-               Output.Write_Char (' ');
-               Output.Write_Str (The_Args (Arg).all);
+               Put (" " & The_Args (Arg).all);
             end loop;
 
-            Output.Write_Eol;
+            New_Line;
          end if;
 
-         My_Exit_Status :=
-           Exit_Status (Spawn (Exec_Path.all, The_Args));
-         raise Normal_Exit;
+         My_Exit_Status := Exit_Status (Spawn (Exec_Path.all, The_Args));
+         Set_Exit_Status (My_Exit_Status);
       end;
    end;
 
 exception
    when Error_Exit =>
-      if not Keep_Temporary_Files then
-         Prj.Delete_All_Temp_Files (Project_Tree.Shared);
-         Delete_Temp_Config_Files;
-      end if;
-
       Set_Exit_Status (Failure);
-
-   when Normal_Exit =>
-      if not Keep_Temporary_Files then
-         Prj.Delete_All_Temp_Files (Project_Tree.Shared);
-         Delete_Temp_Config_Files;
-      end if;
-
-      Set_Exit_Status (My_Exit_Status);
 end GNATCmd;