* 41intnam.ads, 42intnam.ads, 4aintnam.ads, 4cintnam.ads,

	4dintnam.ads, 4gintnam.ads, 4hintnam.ads, 4lintnam.ads,
	4mintnam.ads, 4pintnam.ads, 4rintnam.ads, 4sintnam.ads,
	4uintnam.ads, 4vcalend.adb, 4zintnam.ads, 52system.ads,
	5amastop.adb, 5asystem.ads, 5ataprop.adb, 5atpopsp.adb,
	5avxwork.ads, 5bosinte.adb, 5bsystem.ads, 5esystem.ads,
	5fsystem.ads, 5ftaprop.adb, 5ginterr.adb, 5gmastop.adb,
	5gsystem.ads, 5gtaprop.adb, 5gtasinf.adb, 5gtasinf.ads,
	5hparame.ads, 5hsystem.ads, 5htaprop.adb, 5htraceb.adb,
	5itaprop.adb, 5ksystem.ads, 5kvxwork.ads, 5lintman.adb,
	5lsystem.ads, 5mvxwork.ads, 5ninmaop.adb, 5nosinte.ads,
	5ntaprop.adb, 5ointerr.adb, 5omastop.adb, 5oosinte.adb,
	5osystem.ads, 5otaprop.adb, 5otaspri.ads, 5pvxwork.ads,
	5qtaprop.adb, 5sintman.adb, 5ssystem.ads, 5staprop.adb,
	5stpopse.adb, 5svxwork.ads, 5tosinte.ads, 5uintman.adb,
	5vasthan.adb, 5vinmaop.adb, 5vinterr.adb, 5vintman.adb,
	5vmastop.adb, 5vparame.ads, 5vsystem.ads, 5vtaprop.adb,
	5vtpopde.adb, 5wmemory.adb, 5wsystem.ads, 5wtaprop.adb,
	5ysystem.ads, 5zinterr.adb, 5zintman.adb, 5zosinte.adb,
	5zosinte.ads, 5zsystem.ads, 5ztaprop.adb, 6vcpp.adb, 6vcstrea.adb,
	7sintman.adb, 7staprop.adb, 7stpopsp.adb, 9drpc.adb,
	Make-lang.in, Makefile.in, a-caldel.adb, a-comlin.ads,
	a-dynpri.adb, a-except.adb, a-except.ads, a-finali.adb,
	a-ncelfu.ads, a-reatim.adb, a-retide.adb, a-stream.ads,
	a-ststio.adb, a-ststio.ads, a-stwifi.adb, a-tags.adb, a-tasatt.adb,
	a-textio.adb, a-tideau.adb, a-tiflau.adb, a-tigeau.adb,
	a-tigeau.ads, a-tiinau.adb, a-timoau.adb, a-witeio.adb,
	a-wtdeau.adb, a-wtenau.adb, a-wtflau.adb, a-wtgeau.adb,
	a-wtgeau.ads, a-wtinau.adb, a-wtmoau.adb, ada-tree.def, ada-tree.h,
	adaint.c, adaint.h, ali-util.adb, ali.adb, ali.ads, atree.adb,
	atree.ads, atree.h, back_end.adb, bcheck.adb, bindgen.adb,
	bindusg.adb, checks.adb, comperr.adb, config-lang.in, csets.adb,
	csets.ads, cstand.adb, cstreams.c, debug.adb, debug.ads, decl.c,
	einfo.adb, einfo.ads, einfo.h, elists.h, errout.adb, errout.ads,
	eval_fat.adb, exp_aggr.adb, exp_attr.adb, exp_ch11.adb,
	exp_ch12.adb, exp_ch13.adb, exp_ch2.adb, exp_ch3.adb, exp_ch3.ads,
	exp_ch4.adb, exp_ch5.adb, exp_ch6.adb, exp_ch7.adb, exp_ch7.ads,
	exp_ch9.adb, exp_ch9.ads, exp_dbug.adb, exp_dbug.ads, exp_disp.ads,
	exp_dist.adb, exp_fixd.adb, exp_intr.adb, exp_pakd.adb,
	exp_prag.adb, exp_strm.adb, exp_util.adb, exp_util.ads,
	expander.adb, expect.c, fe.h, fmap.adb, fmap.ads, fname-uf.adb,
	freeze.adb, frontend.adb, g-awk.adb, g-cgideb.adb, g-comlin.adb,
	g-comlin.ads, g-debpoo.adb, g-dirope.adb, g-dirope.ads,
	g-dyntab.adb, g-expect.adb, g-expect.ads, g-io.ads, g-io_aux.adb,
	g-io_aux.ads, g-locfil.adb, g-locfil.ads, g-os_lib.adb,
	g-os_lib.ads, g-regexp.adb, g-regpat.adb, g-socket.adb,
	g-socket.ads, g-spipat.adb, g-table.adb, g-trasym.adb,
	g-trasym.ads, gigi.h, gmem.c, gnat1drv.adb, gnatbind.adb, gnatbl.c,
	gnatchop.adb, gnatcmd.adb, gnatdll.adb, gnatfind.adb, gnatlbr.adb,
	gnatlink.adb, gnatls.adb, gnatmem.adb, gnatprep.adb, gnatvsn.ads,
	gnatxref.adb, hlo.adb, hostparm.ads, i-cobol.adb, i-cpp.adb,
	i-cstrea.ads, i-cstrin.adb, i-pacdec.adb, i-vxwork.ads,
	impunit.adb, init.c, inline.adb, io-aux.c, layout.adb, lib-load.adb,
	lib-util.adb, lib-writ.adb, lib-writ.ads, lib-xref.adb,
	lib-xref.ads, lib.adb, lib.ads, make.adb, makeusg.adb, mdll.adb,
	memroot.adb, misc.c, mlib-tgt.adb, mlib-utl.adb, mlib-utl.ads,
	mlib.adb, namet.adb, namet.ads, namet.h, nlists.h, nmake.adb,
	nmake.ads, nmake.adt, opt.adb, opt.ads, osint.adb, osint.ads,
	output.adb, output.ads, par-ch2.adb, par-ch3.adb, par-ch5.adb,
	par-prag.adb, par-tchk.adb, par-util.adb, par.adb, prj-attr.adb,
	prj-dect.adb, prj-env.adb, prj-env.ads, prj-nmsc.adb, prj-part.adb,
	prj-proc.adb, prj-strt.adb, prj-tree.adb, prj-tree.ads, prj.adb,
	prj.ads, raise.c, raise.h, repinfo.adb, restrict.adb, restrict.ads,
	rident.ads, rtsfind.adb, rtsfind.ads, s-arit64.adb, s-asthan.adb,
	s-atacco.adb, s-atacco.ads, s-auxdec.adb, s-crc32.adb, s-crc32.ads,
	s-direio.adb, s-fatgen.adb, s-fileio.adb, s-finimp.adb,
	s-gloloc.adb, s-gloloc.ads, s-interr.adb, s-mastop.adb,
	s-mastop.ads, s-memory.adb, s-parame.ads, s-parint.adb,
	s-pooglo.adb, s-pooloc.adb, s-rpc.adb, s-secsta.adb, s-sequio.adb,
	s-shasto.adb, s-soflin.adb, s-soflin.ads, s-stache.adb,
	s-taasde.adb, s-taasde.ads, s-tadeca.adb, s-tadeca.ads,
	s-tadert.adb, s-tadert.ads, s-taenca.adb, s-taenca.ads,
	s-taprob.adb, s-taprop.ads, s-tarest.adb, s-tasdeb.adb,
	s-tasini.adb, s-tasini.ads, s-taskin.adb, s-taskin.ads,
	s-tasque.adb, s-tasque.ads, s-tasren.adb, s-tasren.ads,
	s-tassta.adb, s-tasuti.adb, s-tasuti.ads, s-tataat.adb,
	s-tataat.ads, s-tpoben.adb, s-tpoben.ads, s-tpobop.adb,
	s-tposen.adb, s-tposen.ads, s-traceb.adb, s-traceb.ads,
	s-unstyp.ads, s-widenu.adb, scn-nlit.adb, scn.adb, sem.adb,
	sem_aggr.adb, sem_attr.adb, sem_attr.ads, sem_case.adb,
	sem_ch10.adb, sem_ch11.adb, sem_ch11.ads, sem_ch12.adb,
	sem_ch13.adb, sem_ch13.ads, sem_ch2.adb, sem_ch3.adb, sem_ch3.ads,
	sem_ch4.adb, sem_ch5.adb, sem_ch6.adb, sem_ch6.ads, sem_ch7.adb,
	sem_ch8.adb, sem_ch8.ads, sem_ch9.adb, sem_disp.adb, sem_dist.adb,
	sem_elab.adb, sem_elim.adb, sem_elim.ads, sem_eval.adb,
	sem_intr.adb, sem_mech.adb, sem_prag.adb, sem_res.adb,
	sem_type.adb, sem_util.adb, sem_util.ads, sem_vfpt.adb,
	sem_warn.adb, sinfo.adb, sinfo.ads, sinfo.h, sinput-l.adb,
	sinput-l.ads, sinput.adb, sinput.ads, snames.adb, snames.ads,
	snames.h, sprint.adb, sprint.ads, stringt.adb, stringt.ads,
	stringt.h, style.adb, switch.adb, switch.ads, sysdep.c, system.ads,
	table.adb, targparm.adb, targparm.ads, targtyps.c, tbuild.adb,
	tbuild.ads, tracebak.c, trans.c, tree_gen.adb, tree_io.adb,
	treepr.adb, treepr.ads, treeprs.ads, treeprs.adt, ttypes.ads,
	types.adb, types.ads, types.h, uintp.ads, urealp.ads, usage.adb,
	utils.c, utils2.c, validsw.adb, xnmake.adb, xr_tabls.adb,
	xr_tabls.ads, xref_lib.adb, xref_lib.ads : Merge in ACT changes.

	* 1ssecsta.adb, 1ssecsta.ads, a-chlat9.ads, a-cwila9.ads,
	g-enblsp.adb, g-md5.adb, g-md5.ads, gnatname.adb, gnatname.ads,
	mkdir.c, osint-b.adb, osint-b.ads, osint-c.adb, osint-c.ads,
	osint-l.adb, osint-l.ads, osint-m.adb, osint-m.ads : New files

	* 3lsoccon.ads, 5qparame.ads, 5qvxwork.ads, 5smastop.adb,
	5zparame.ads, gnatmain.adb, gnatmain.ads, gnatpsys.adb : Removed

	* mdllfile.adb, mdllfile.ads, mdlltool.adb, mdlltool.ads : Renamed
	to mdll-fil.ad[bs] and mdll-util.ad[bs]

	* mdll-fil.adb, mdll-fil.ads, mdll-utl.adb, mdll-utl.ads : Renamed
	from mdllfile.ad[bs] and mdlltool.ad[bs]


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

1 files changed, 121 insertions, 85 deletions

diff --git a/gcc/ada/prj-env.adb b/gcc/ada/prj-env.adb
index fd5109bb05c..82cb70a22e0 100644
--- a/gcc/ada/prj-env.adb
+++ b/gcc/ada/prj-env.adb
@@ -8,7 +8,7 @@
 --                                                                          --
 --                            $Revision$
 --                                                                          --
---             Copyright (C) 2001 Free Software Foundation, Inc.            --
+--          Copyright (C) 2001-2002 Free Software Foundation, Inc.          --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -40,7 +40,6 @@ with Table;
 package body Prj.Env is
 
    type Naming_Id is new Nat;
-   No_Naming : constant Naming_Id := 0;
 
    Ada_Path_Buffer : String_Access := new String (1 .. 1_000);
    --  A buffer where values for ADA_INCLUDE_PATH
@@ -62,6 +61,8 @@ package body Prj.Env is
    Global_Configuration_Pragmas : Name_Id;
    Local_Configuration_Pragmas  : Name_Id;
 
+   Fill_Mapping_File : Boolean := True;
+
    -----------------------
    -- Local Subprograms --
    -----------------------
@@ -74,6 +75,10 @@ package body Prj.Env is
    --  Returns the path name of the spec of a unit.
    --  Compute it first, if necessary.
 
+   procedure Add_To_Path (Source_Dirs : String_List_Id);
+   --  Add to Ada_Path_Buffer all the source directories in string list
+   --  Source_Dirs, if any. Increment Ada_Path_Length.
+
    procedure Add_To_Path (Path : String);
    --  Add Path to global variable Ada_Path_Buffer
    --  Increment Ada_Path_Length
@@ -85,12 +90,10 @@ package body Prj.Env is
    function Ada_Include_Path (Project : Project_Id) return String_Access is
 
       procedure Add (Project : Project_Id);
-      --  Add all the source directories of a project to the path,
-      --  only if this project has not been visited.
-      --  Call itself recursively for projects being modified,
-      --  and imported projects.
-      --  Add the project to the list Seen if this is the first time
-      --  we call Add for this project.
+      --  Add all the source directories of a project to the path only if
+      --  this project has not been visited. Calls itself recursively for
+      --  projects being modified, and imported projects. Adds the project
+      --  to the list Seen if this is the call to Add for this project.
 
       ---------
       -- Add --
@@ -98,8 +101,7 @@ package body Prj.Env is
 
       procedure Add (Project : Project_Id) is
       begin
-         --  If Seen is empty, then the project cannot have been
-         --  visited.
+         --  If Seen is empty, then the project cannot have been visited
 
          if not Projects.Table (Project).Seen then
             Projects.Table (Project).Seen := True;
@@ -108,29 +110,10 @@ package body Prj.Env is
                Data : Project_Data := Projects.Table (Project);
                List : Project_List := Data.Imported_Projects;
 
-               Current : String_List_Id := Data.Source_Dirs;
-               Source_Dir : String_Element;
-
             begin
                --  Add to path all source directories of this project
 
-               while Current /= Nil_String loop
-                  if Ada_Path_Length > 0 then
-                     Add_To_Path (Path => (1 => Path_Separator));
-                  end if;
-
-                  Source_Dir := String_Elements.Table (Current);
-                  String_To_Name_Buffer (Source_Dir.Value);
-
-                  declare
-                     New_Path : constant String :=
-                       Name_Buffer (1 .. Name_Len);
-                  begin
-                     Add_To_Path (New_Path);
-                  end;
-
-                  Current := Source_Dir.Next;
-               end loop;
+               Add_To_Path (Data.Source_Dirs);
 
                --  Call Add to the project being modified, if any
 
@@ -146,7 +129,6 @@ package body Prj.Env is
                end loop;
             end;
          end if;
-
       end Add;
 
    --  Start of processing for Ada_Include_Path
@@ -170,6 +152,21 @@ package body Prj.Env is
       return Projects.Table (Project).Include_Path;
    end Ada_Include_Path;
 
+   function Ada_Include_Path
+     (Project   : Project_Id;
+      Recursive : Boolean)
+      return      String
+   is
+   begin
+      if Recursive then
+         return Ada_Include_Path (Project).all;
+      else
+         Ada_Path_Length := 0;
+         Add_To_Path (Projects.Table (Project).Source_Dirs);
+         return Ada_Path_Buffer (1 .. Ada_Path_Length);
+      end if;
+   end Ada_Include_Path;
+
    ----------------------
    -- Ada_Objects_Path --
    ----------------------
@@ -177,15 +174,13 @@ package body Prj.Env is
    function Ada_Objects_Path
      (Project             : Project_Id;
       Including_Libraries : Boolean := True)
-     return String_Access is
-
+      return                String_Access
+   is
       procedure Add (Project : Project_Id);
-      --  Add all the object directory of a project to the path,
-      --  only if this project has not been visited.
-      --  Call itself recursively for projects being modified,
-      --  and imported projects.
-      --  Add the project to the list Seen if this is the first time
-      --  we call Add for this project.
+      --  Add all the object directories of a project to the path only if
+      --  this project has not been visited. Calls itself recursively for
+      --  projects being modified, and imported projects. Adds the project
+      --  to the list Seen if this is the first call to Add for this project.
 
       ---------
       -- Add --
@@ -193,7 +188,6 @@ package body Prj.Env is
 
       procedure Add (Project : Project_Id) is
       begin
-
          --  If this project has not been seen yet
 
          if not Projects.Table (Project).Seen then
@@ -281,6 +275,30 @@ package body Prj.Env is
    -- Add_To_Path --
    -----------------
 
+   procedure Add_To_Path (Source_Dirs : String_List_Id) is
+      Current    : String_List_Id := Source_Dirs;
+      Source_Dir : String_Element;
+
+   begin
+      while Current /= Nil_String loop
+         if Ada_Path_Length > 0 then
+            Add_To_Path (Path => (1 => Path_Separator));
+         end if;
+
+         Source_Dir := String_Elements.Table (Current);
+         String_To_Name_Buffer (Source_Dir.Value);
+
+         declare
+            New_Path : constant String :=
+              Name_Buffer (1 .. Name_Len);
+         begin
+            Add_To_Path (New_Path);
+         end;
+
+         Current := Source_Dir.Next;
+      end loop;
+   end Add_To_Path;
+
    procedure Add_To_Path (Path : String) is
    begin
       --  If Ada_Path_Buffer is too small, double it
@@ -654,13 +672,11 @@ package body Prj.Env is
          Last : Natural;
 
       begin
-         --  Add an ASCII.LF to the string. As this gnat.adc
-         --  is supposed to be used only by the compiler, we don't
-         --  care about the characters for the end of line.
-         --  The truth is we could have put a space, but it is
-         --  more convenient to be able to read gnat.adc during
-         --  development. And the development was done under UNIX.
-         --  Hence the ASCII.LF.
+         --  Add an ASCII.LF to the string. As this gnat.adc is supposed to
+         --  be used only by the compiler, we don't care about the characters
+         --  for the end of line. In fact we could have put a space, but
+         --  it is more convenient to be able to read gnat.adc during
+         --  development, for which the ASCII.LF is fine.
 
          S0 (1 .. S'Length) := S;
          S0 (S0'Last) := ASCII.LF;
@@ -678,7 +694,6 @@ package body Prj.Env is
    --  Start of processing for Create_Config_Pragmas_File
 
    begin
-
       if not Projects.Table (For_Project).Config_Checked then
 
          --  Remove any memory of processed naming schemes, if any
@@ -744,11 +759,11 @@ package body Prj.Env is
          end if;
 
          if Global_Attribute_Present then
-
             if File /= Invalid_FD
               or else Local_Attribute_Present
             then
                Copy_File (Global_Attribute.Value);
+
             else
                String_To_Name_Buffer (Global_Attribute.Value);
                Projects.Table (For_Project).Config_File_Name := Name_Find;
@@ -756,7 +771,6 @@ package body Prj.Env is
          end if;
 
          if Local_Attribute_Present then
-
             if File /= Invalid_FD then
                Copy_File (Local_Attribute.Value);
 
@@ -764,7 +778,6 @@ package body Prj.Env is
                String_To_Name_Buffer (Local_Attribute.Value);
                Projects.Table (For_Project).Config_File_Name := Name_Find;
             end if;
-
          end if;
 
          if File /= Invalid_FD then
@@ -783,9 +796,7 @@ package body Prj.Env is
          end if;
 
          Projects.Table (For_Project).Config_Checked := True;
-
       end if;
-
    end Create_Config_Pragmas_File;
 
    -------------------------
@@ -797,8 +808,8 @@ package body Prj.Env is
       The_Unit_Data : Unit_Data;
       Data          : File_Name_Data;
 
-      procedure Put (S : String);
-      --  Put a line in the mapping file
+      procedure Put_Name_Buffer;
+      --  Put the line contained in the Name_Buffer in the mapping file
 
       procedure Put_Data (Spec : Boolean);
       --  Put the mapping of the spec or body contained in Data in the file
@@ -808,16 +819,18 @@ package body Prj.Env is
       -- Put --
       ---------
 
-      procedure Put (S : String) is
+      procedure Put_Name_Buffer is
          Last : Natural;
 
       begin
-         Last := Write (File, S'Address, S'Length);
+         Name_Len := Name_Len + 1;
+         Name_Buffer (Name_Len) := ASCII.LF;
+         Last := Write (File, Name_Buffer (1)'Address, Name_Len);
 
-         if Last /= S'Length then
+         if Last /= Name_Len then
             Osint.Fail ("Disk full");
          end if;
-      end Put;
+      end Put_Name_Buffer;
 
       --------------
       -- Put_Data --
@@ -825,19 +838,31 @@ package body Prj.Env is
 
       procedure Put_Data (Spec : Boolean) is
       begin
-         Put (Get_Name_String (The_Unit_Data.Name));
+         --  Line with the unit name
+
+         Get_Name_String (The_Unit_Data.Name);
+         Name_Len := Name_Len + 1;
+         Name_Buffer (Name_Len) := '%';
+         Name_Len := Name_Len + 1;
 
          if Spec then
-            Put ("%s");
+            Name_Buffer (Name_Len) := 's';
          else
-            Put ("%b");
+            Name_Buffer (Name_Len) := 'b';
          end if;
 
-         Put (S => (1 => ASCII.LF));
-         Put (Get_Name_String (Data.Name));
-         Put (S => (1 => ASCII.LF));
-         Put (Get_Name_String (Data.Path));
-         Put (S => (1 => ASCII.LF));
+         Put_Name_Buffer;
+
+         --  Line with the file nale
+
+         Get_Name_String (Data.Name);
+         Put_Name_Buffer;
+
+         --  Line with the path name
+
+         Get_Name_String (Data.Path);
+         Put_Name_Buffer;
+
       end Put_Data;
 
    --  Start of processing for Create_Mapping_File
@@ -855,32 +880,34 @@ package body Prj.Env is
          Write_Line ("""");
       end if;
 
-      --  For all units in table Units
+      if Fill_Mapping_File then
+         --  For all units in table Units
 
-      for Unit in 1 .. Units.Last loop
-         The_Unit_Data := Units.Table (Unit);
+         for Unit in 1 .. Units.Last loop
+            The_Unit_Data := Units.Table (Unit);
 
-         --  If the unit has a valid name
+            --  If the unit has a valid name
 
-         if The_Unit_Data.Name /= No_Name then
-            Data := The_Unit_Data.File_Names (Specification);
+            if The_Unit_Data.Name /= No_Name then
+               Data := The_Unit_Data.File_Names (Specification);
 
-            --  If there is a spec, put it mapping in the file
+               --  If there is a spec, put it mapping in the file
 
-            if Data.Name /= No_Name then
-               Put_Data (Spec => True);
-            end if;
+               if Data.Name /= No_Name then
+                  Put_Data (Spec => True);
+               end if;
 
-            Data := The_Unit_Data.File_Names (Body_Part);
+               Data := The_Unit_Data.File_Names (Body_Part);
 
-            --  If there is a body (or subunit) put its mapping in the file
+               --  If there is a body (or subunit) put its mapping in the file
 
-            if Data.Name /= No_Name then
-               Put_Data (Spec => False);
-            end if;
+               if Data.Name /= No_Name then
+                  Put_Data (Spec => False);
+               end if;
 
-         end if;
-      end loop;
+            end if;
+         end loop;
+      end if;
 
       GNAT.OS_Lib.Close (File);
 
@@ -1045,7 +1072,6 @@ package body Prj.Env is
                end if;
             end;
          end if;
-
       end loop;
 
       --  We don't know this file name, return an empty string
@@ -1324,6 +1350,7 @@ package body Prj.Env is
    procedure Initialize is
       Global : constant String := "global_configuration_pragmas";
       Local  : constant String :=  "local_configuration_pragmas";
+
    begin
       --  Put the standard GNAT naming scheme in the Namings table
 
@@ -1523,6 +1550,15 @@ package body Prj.Env is
       Write_Line ("end of List of Sources.");
    end Print_Sources;
 
+   ---------------------------------------------
+   -- Set_Mapping_File_Initial_State_To_Empty --
+   ---------------------------------------------
+
+   procedure Set_Mapping_File_Initial_State_To_Empty is
+   begin
+      Fill_Mapping_File := False;
+   end Set_Mapping_File_Initial_State_To_Empty;
+
    -----------------------
    -- Spec_Path_Name_Of --
    -----------------------