* sem_res.adb (Resolve_Selected_Component): do not generate a

	discriminant check if the selected component is a component of
	the argument of an initialization procedure.

	* trans.c (tree_transform, case of arithmetic operators): If result
	type is private, the gnu_type is the base type of the full view,
	given that the full view itself may be a subtype.

	* sem_res.adb: Minor reformatting

	* trans.c (tree_transform, case N_Real_Literal): Add missing third
	parameter in call to Machine (unknown horrible effects from this
	omission).

	* urealp.h: Add definition of Round_Even for call to Machine
	Add third parameter for Machine

	* sem_warn.adb (Check_One_Unit): Suppress warnings completely on
	predefined units in No_Run_Time mode.

	* misc.c (insn-codes.h): Now include.

	* a-except.adb: Preparation work for future integration of the GCC 3
	exception handling mechanism
	(Notify_Handled_Exception, Notify_Unhandled_Exception): New routines
	to factorize previous code sequences and make them externally callable,
	e.g. for the Ada personality routine when the GCC 3 mechanism is used.
	(Propagate_Exception, Raise_Current_Excep, Raise_From_Signal_Handler):
	Use the new notification routines.

	* prj-tree.ads (First_Choice_Of): Document the when others case

	* bindgen.adb (Gen_Ada_Init_*): Set priority of environment task in
	HI-E mode, in order to support Ravenscar profile properly.

	* cstand.adb (Create_Standard): Duration is a 32 bit type in HI-E
	mode on 32 bits targets.

	* fmap.adb: Initial version.

	* fmap.ads: Initial version.

	* fname-uf.adb (Get_File_Name): Use mapping if unit name mapped.
	If search is successfully done, add to mapping.

	* frontend.adb: Initialize the mapping if a -gnatem switch was used.

	* make.adb:
	(Gnatmake): Add new local variable Mapping_File_Name.
	 Create mapping file when using project file(s).
	 Delete mapping file before exiting.

	* opt.ads (Mapping_File_Name): New variable

	* osint.adb (Find_File): Use path name found in mapping, if any.

	* prj-env.adb (Create_Mapping_File): New procedure

	* prj-env.ads (Create_Mapping_File): New procedure.

	* switch.adb (Scan_Front_End_Switches): Add processing for -gnatem
	(Mapping_File)

	* usage.adb: Add entry for new switch -gnatem.

	* Makefile.in: Add dependencies for fmap.o.

	* sem_ch10.adb (Analyze_With_Clause): Retrieve proper entity when unit
	is a package instantiation rewritten as a package body.
	(Install_Withed_Unit): Undo previous change, now redundant.

	* layout.adb:
	(Compute_Length): Move conversion to Unsigned to callers.
	(Get_Max_Size): Convert Len expression to Unsigned after calls to
	Compute_Length and Determine_Range.
	(Layout_Array_Type): Convert Len expression to Unsigned after calls to
	Compute_Length and Determine_Range.
	Above changes fix problem with length computation for supernull arrays
	where Max (Len, 0) wasn't getting applied due to the Unsigned
	conversion used by Compute_Length.

	* rtsfind.ads:
	(OK_To_Use_In_No_Run_Time_Mode): Allow Ada.Exceptions and
	 System.Secondary_Stack.
	(OK_To_Use_In_Ravenscar_Mode): New table needed to implement Ravenscar
	 in HI-E mode.
	Remove unused entity RE_Exception_Data.

	* rtsfind.adb (RTE): Allow Ravenscar Profile in HI mode.

	* rident.ads (No_Secondary_Stack): New restriction.


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

1 files changed, 35 insertions, 7 deletions

diff --git a/gcc/ada/fname-uf.adb b/gcc/ada/fname-uf.adb
index 37fe82c5c43..3572d1a6f7a 100644
--- a/gcc/ada/fname-uf.adb
+++ b/gcc/ada/fname-uf.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                            $Revision: 1.1 $
+--                            $Revision$
 --                                                                          --
 --          Copyright (C) 1992-2001, Free Software Foundation, Inc.         --
 --                                                                          --
@@ -28,6 +28,7 @@
 
 with Alloc;
 with Debug;    use Debug;
+with Fmap;
 with Krunch;
 with Namet;    use Namet;
 with Opt;      use Opt;
@@ -137,6 +138,9 @@ package body Fname.UF is
 
       N : Int;
 
+      Pname : File_Name_Type := No_File;
+      Fname : File_Name_Type := No_File;
+
    begin
       --  Null or error name means that some previous error occurred
       --  This is an unrecoverable error, so signal it.
@@ -145,6 +149,19 @@ package body Fname.UF is
          raise Unrecoverable_Error;
       end if;
 
+      --  Look into the mapping from unit names to file names
+
+      Fname := Fmap.File_Name_Of (Uname);
+
+      --  If the unit name is already mapped, return the corresponding
+      --  file name.
+
+      if Fname /= No_File then
+         return Fname;
+      end if;
+
+      --  If there is a specific SFN pragma, return the corresponding file name
+
       N := SFN_HTable.Get (Uname);
 
       if N /= No_Entry then
@@ -367,14 +384,25 @@ package body Fname.UF is
 
                   --  Check if file exists and if so, return the entry
 
-                  elsif Find_File (Fnam, Source) /= No_File then
-                     return Fnam;
+                  else
+                     Pname := Find_File (Fnam, Source);
+
+                  --  Check if file exists and if so, return the entry
 
-                  --  This entry does not match after all, because this is
-                  --  the first search loop, and the file does not exist.
+                     if Pname /= No_File then
 
-                  else
-                     Fnam := No_File;
+                        --  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);
+                        return Fnam;
+
+                     --  This entry does not match after all, because this is
+                     --  the first search loop, and the file does not exist.
+
+                     else
+                        Fnam := No_File;
+                     end if;
                   end if;
                end if;