* bindgen.adb: Minor reformatting

	* cstand.adb: Minor reformatting

	* fmap.adb: Minor reformatting
	Change name from Add for Add_To_File_Map (Add is much too generic)
	Change Path_Name_Of to Mapped_Path_Name
	Change File_Name_Of to Mapped_File_Name
	Fix copyright dates in header

	* fmap.ads:
	Change name from Add for Add_To_File_Map (Add is much too generic)
	Change Path_Name_Of to Mapped_Path_Name
	Change File_Name_Of to Mapped_File_Name
	Fix copyright dates in header

	* fname-uf.adb: Minor reformatting.  New names of stuff in Fmap.
	Add use clause for Fmap.

	* make.adb: Minor reformatting

	* osint.adb: Minor reformatting.  Change of names in Fmap.
	Add use clause for Fmap.

	* prj-env.adb: Minor reformatting

	* prj-env.ads: Minor reformatting

	* switch.adb: Minor reformatting.  Do proper raise of Bad_Switch if
	error found (there were odd exceptions to this general rule in
	-gnatec/-gnatem processing)

	* raise.c (__gnat_eh_personality): Exception handling personality
	routine for Ada.  Still in rough state, inspired from the C++ version
	and still containing a bunch of debugging artifacts.
	(parse_lsda_header, get_ttype_entry): Local (static) helpers, also
	inspired from the C++ library.

	* raise.c (eh_personality): Add comments. Part of work for the GCC 3
	exception handling integration.

	* Makefile.in: Remove use of 5smastop.adb which is obsolete.
	(HIE_SOURCES): Add s-secsta.ad{s,b}.
	(HIE_OBJS): Add s-fat*.o
	(RAVEN_SOURCES): Remove files that are no longer required. Add
	interrupt handling files.
	(RAVEN_MOD): Removed, no longer needed.

	* a-ngelfu.adb: Remove ??? comment for inappropriate Inline_Always
	Add 2001 to copyright date

	* g-regpat.adb: Change pragma Inline_Always to Inline. There is no
	need to force universal inlining for these cases.

	* s-taprob.adb: Minor clean ups so that this unit can be used in
	Ravenscar HI.

	* exp_ch7.adb: Allow use of secondary stack in HI mode.
	Disallow it when pragma Restrictions (No_Secondary_Stack) is specified.

	* prj-tree.ads (Project_Node_Record): Add comments for components
	Pkg_Id and Case_Insensitive.

	* g-socket.adb: Minor reformatting. Found while reading code.

	* prj-tree.ads: Minor reformatting


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

1 files changed, 6 insertions, 5 deletions

diff --git a/gcc/ada/fname-uf.adb b/gcc/ada/fname-uf.adb
index 3572d1a6f7a..f2b549c3ac6 100644
--- a/gcc/ada/fname-uf.adb
+++ b/gcc/ada/fname-uf.adb
@@ -28,7 +28,7 @@
 
 with Alloc;
 with Debug;    use Debug;
-with Fmap;
+with Fmap;     use Fmap;
 with Krunch;
 with Namet;    use Namet;
 with Opt;      use Opt;
@@ -140,6 +140,7 @@ package body Fname.UF is
 
       Pname : File_Name_Type := No_File;
       Fname : File_Name_Type := No_File;
+      --  Path name and File name for mapping
 
    begin
       --  Null or error name means that some previous error occurred
@@ -149,12 +150,12 @@ package body Fname.UF is
          raise Unrecoverable_Error;
       end if;
 
-      --  Look into the mapping from unit names to file names
+      --  Look in the map from unit names to file names
 
-      Fname := Fmap.File_Name_Of (Uname);
+      Fname := Mapped_File_Name (Uname);
 
       --  If the unit name is already mapped, return the corresponding
-      --  file name.
+      --  file name from the map.
 
       if Fname /= No_File then
          return Fname;
@@ -394,7 +395,7 @@ package body Fname.UF is
                         --  Add to mapping, so that we don't do another
                         --  path search in Find_File for this file name
 
-                        Fmap.Add (Get_File_Name.Uname, Fnam, Pname);
+                        Add_To_File_Map (Get_File_Name.Uname, Fnam, Pname);
                         return Fnam;
 
                      --  This entry does not match after all, because this is