exp_prag.adb (Expand_Pragma_Import_Or_Interface): Remove properly a default initialization on an imported object...

2007-04-20  Ed Schonberg  <schonberg@adacore.com>
	    Arnaud Charlet  <charlet@adacore.com>
	    Robert Dewar  <dewar@adacore.com>
	    Gary Dismukes  <dismukes@adacore.com>

	* exp_prag.adb (Expand_Pragma_Import_Or_Interface): Remove properly a
	default initialization on an imported object, when there is no
	initialization call generated for it.
	(Expand_Pragma_Assert): Add handling of No_Exception_Propagation
	restriction

	* snames.h, snames.ads, snames.adb, par-prag.adb: New pragma
	Static_Elaboration_Desired.
	Remove pragma Thread_Body.
	Implement a new pragma No_Body
	Removes the Explicit_Overriding pragma
	Remove Optional_Overriding pragma
	(Prag): Deal with Universal_Aliasing.
	(Name_CIL, Name_CIL_Constructor, Convention_CIL,
	Pragma_CIL_Constructor): New names.

	* sem_cat.adb (Validate_Object_Declaration): An initialization that
	uses the equivalent aggregate of a type must be treated as an implicit
	initialization.
	(Get_Categorization): Check a unit for pragma Preelaborate only if it
	has none of the other categories.
	(Process_Import_Or_Interface_Pragma): Report an error for an attempt
	to apply Import to an object renaming declaration.

	* sem_prag.adb (Process_Import_Or_Interface): Warn that a type imported
	from a C++ class should be declared as limited and that it will be
	considererd limited.
	(Analyze_Pragma): Warn that a type specified with pragma CPP_Class
	should be declared as limited and that it will be considererd limited.
	(Ada_2005_Pragma): New procedure, used to deal with Ada 2005 pragmas
	(Analyze_Pragma, case Export): Diagnose export of enumeration literal
	(Analyze_Pragma): Deal with Universal_Aliasing.
	(Sig_Flags): Likewise.
	(Set_Encoded_Interface_Name): Suppress encoding when compiling for AAMP.
	(Overflow_Checks_Unsuppressed): New flag.
	(Process_Suppress_Unsuppress): Set Overflow_Checks_Unsuppressed.
	(Analyze_Pragma [case Pack]): Ignore pragma Pack and post warning in
	case of JVM or .NET targets, and compiling user code.
	Add debugging convenience routine rv

From-SVN: r125408

7 files changed, 1173 insertions, 971 deletions

diff --git a/gcc/ada/exp_prag.adb b/gcc/ada/exp_prag.adb
index ada99fc..710ff7d 100644
--- a/gcc/ada/exp_prag.adb
+++ b/gcc/ada/exp_prag.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2006, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2007, 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- --
@@ -26,6 +26,7 @@
 
 with Atree;    use Atree;
 with Casing;   use Casing;
+with Debug;    use Debug;
 with Einfo;    use Einfo;
 with Errout;   use Errout;
 with Exp_Ch11; use Exp_Ch11;
@@ -36,6 +37,8 @@ with Namet;    use Namet;
 with Nlists;   use Nlists;
 with Nmake;    use Nmake;
 with Opt;      use Opt;
+with Restrict; use Restrict;
+with Rident;   use Rident;
 with Rtsfind;  use Rtsfind;
 with Sem;      use Sem;
 with Sem_Eval; use Sem_Eval;
@@ -239,7 +242,7 @@ package body Exp_Prag is
 
       --  Since assertions are on, we rewrite the pragma with its
       --  corresponding if statement, and then analyze the statement
-      --  The expansion transforms:
+      --  The normal case expansion transforms:
 
       --    pragma Assert (condition [,message]);
 
@@ -252,30 +255,70 @@ package body Exp_Prag is
       --  where Str is the message if one is present, or the default of
       --  file:line if no message is given.
 
-      --  First, we need to prepare the character literal
+      --  An alternative expansion is used when the No_Exception_Propagation
+      --  restriction is active and there is a local Assert_Failure handler.
+      --  This is not a common combination of circumstances, but it occurs in
+      --  the context of Aunit and the zero footprint profile. In this case we
+      --  generate:
 
-      if Present (Arg2 (N)) then
-         Msg := Strval (Expr_Value_S (Arg2 (N)));
-      else
-         Build_Location_String (Loc);
-         Msg := String_From_Name_Buffer;
-      end if;
+      --    if not condition then
+      --       raise Assert_Failure;
+      --    end if;
 
-      --  Now generate the if statement. Note that we consider this to be
-      --  an explicit conditional in the source, not an implicit if, so we
+      --  This will then be transformed into a goto, and the local handler will
+      --  be able to handle the assert error (which would not be the case if a
+      --  call is made to the Raise_Assert_Failure procedure).
+
+      --  Note that the reason we do not always generate a direct raise is that
+      --  the form in which the procedure is called allows for more efficient
+      --  breakpointing of assertion errors.
+
+      --  Generate the appropriate if statement. Note that we consider this to
+      --  be an explicit conditional in the source, not an implicit if, so we
       --  do not call Make_Implicit_If_Statement.
 
-      Rewrite (N,
-        Make_If_Statement (Loc,
-          Condition =>
-            Make_Op_Not (Loc,
-              Right_Opnd => Cond),
-          Then_Statements => New_List (
-            Make_Procedure_Call_Statement (Loc,
-              Name =>
-                New_Reference_To (RTE (RE_Raise_Assert_Failure), Loc),
-              Parameter_Associations => New_List (
-                Make_String_Literal (Loc, Msg))))));
+      --  Case where we generate a direct raise
+
+      if (Debug_Flag_Dot_G
+          or else Restriction_Active (No_Exception_Propagation))
+        and then Present (Find_Local_Handler (RTE (RE_Assert_Failure), N))
+      then
+         Rewrite (N,
+           Make_If_Statement (Loc,
+             Condition =>
+               Make_Op_Not (Loc,
+                 Right_Opnd => Cond),
+             Then_Statements => New_List (
+               Make_Raise_Statement (Loc,
+                 Name =>
+                   New_Reference_To (RTE (RE_Assert_Failure), Loc)))));
+
+      --  Case where we call the procedure
+
+      else
+         --  First, we need to prepare the string literal
+
+         if Present (Arg2 (N)) then
+            Msg := Strval (Expr_Value_S (Arg2 (N)));
+         else
+            Build_Location_String (Loc);
+            Msg := String_From_Name_Buffer;
+         end if;
+
+         --  Now rewrite as an if statement
+
+         Rewrite (N,
+           Make_If_Statement (Loc,
+             Condition =>
+               Make_Op_Not (Loc,
+                 Right_Opnd => Cond),
+             Then_Statements => New_List (
+               Make_Procedure_Call_Statement (Loc,
+                 Name =>
+                   New_Reference_To (RTE (RE_Raise_Assert_Failure), Loc),
+                 Parameter_Associations => New_List (
+                   Make_String_Literal (Loc, Msg))))));
+      end if;
 
       Analyze (N);
 
@@ -284,9 +327,8 @@ package body Exp_Prag is
       if Nkind (N) = N_Procedure_Call_Statement
         and then Is_RTE (Entity (Name (N)), RE_Raise_Assert_Failure)
       then
-         --  If original condition was a Standard.False, we assume
-         --  that this is indeed intented to raise assert error
-         --  and no warning is required.
+         --  If original condition was a Standard.False, we assume that this is
+         --  indeed intented to raise assert error and no warning is required.
 
          if Is_Entity_Name (Original_Node (Cond))
            and then Entity (Original_Node (Cond)) = Standard_False
@@ -389,7 +431,8 @@ package body Exp_Prag is
       if Ekind (Def_Id) = E_Variable then
          Typ  := Etype (Def_Id);
 
-         --  Loop to ???
+         --  Iterate from declaration of object to import pragma, to find
+         --  generated initialization call for object, if any.
 
          Init_Call := Next (Parent (Def_Id));
          while Present (Init_Call) and then Init_Call /= N loop
@@ -411,7 +454,7 @@ package body Exp_Prag is
          --  have explicit initialization, so the expression must have
          --  been generated by the compiler.
 
-         if No (Init_Call)
+         if Init_Call = N
            and then Present (Expression (Parent (Def_Id)))
          then
             Set_Expression (Parent (Def_Id), Empty);
diff --git a/gcc/ada/par-prag.adb b/gcc/ada/par-prag.adb
index c9afda4..6e791b5 100644
--- a/gcc/ada/par-prag.adb
+++ b/gcc/ada/par-prag.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2006, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2007, 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- --
@@ -518,7 +518,7 @@ begin
             Expr  : Node_Id;
             Index : Nat;
 
-            function Get_Fname (Arg : Node_Id) return Name_Id;
+            function Get_Fname (Arg : Node_Id) return File_Name_Type;
             --  Process file name from unit name form of pragma
 
             function Get_String_Argument (Arg : Node_Id) return String_Ptr;
@@ -534,7 +534,7 @@ begin
             -- Get_Fname --
             ---------------
 
-            function Get_Fname (Arg : Node_Id) return Name_Id is
+            function Get_Fname (Arg : Node_Id) return File_Name_Type is
             begin
                String_To_Name_Buffer (Strval (Expression (Arg)));
 
@@ -803,7 +803,7 @@ begin
       --  turn off semantic checking anyway if any parse errors are found.
 
       when Pragma_Source_Reference => Source_Reference : declare
-         Fname : Name_Id;
+         Fname : File_Name_Type;
 
       begin
          if Arg_Count /= 1 then
@@ -833,7 +833,7 @@ begin
                   Pragma_Sloc);
                raise Error_Resync;
             else
-               Fname := No_Name;
+               Fname := No_File;
             end if;
 
          --  File name present
@@ -1054,6 +1054,7 @@ begin
            Pragma_Atomic                        |
            Pragma_Atomic_Components             |
            Pragma_Attach_Handler                |
+           Pragma_CIL_Constructor               |
            Pragma_Compile_Time_Error            |
            Pragma_Compile_Time_Warning          |
            Pragma_Convention_Identifier         |
@@ -1077,7 +1078,6 @@ begin
            Pragma_Elaborate_All                 |
            Pragma_Elaborate_Body                |
            Pragma_Elaboration_Checks            |
-           Pragma_Explicit_Overriding           |
            Pragma_Export                        |
            Pragma_Export_Exception              |
            Pragma_Export_Function               |
@@ -1123,13 +1123,13 @@ begin
            Pragma_Main                          |
            Pragma_Main_Storage                  |
            Pragma_Memory_Size                   |
+           Pragma_No_Body                       |
            Pragma_No_Return                     |
            Pragma_Obsolescent                   |
            Pragma_No_Run_Time                   |
            Pragma_No_Strict_Aliasing            |
            Pragma_Normalize_Scalars             |
            Pragma_Optimize                      |
-           Pragma_Optional_Overriding           |
            Pragma_Pack                          |
            Pragma_Passive                       |
            Pragma_Preelaborable_Initialization  |
@@ -1157,6 +1157,7 @@ begin
            Pragma_Shared_Passive                |
            Pragma_Storage_Size                  |
            Pragma_Storage_Unit                  |
+           Pragma_Static_Elaboration_Desired    |
            Pragma_Stream_Convert                |
            Pragma_Subtitle                      |
            Pragma_Suppress                      |
@@ -1169,11 +1170,11 @@ begin
            Pragma_Task_Info                     |
            Pragma_Task_Name                     |
            Pragma_Task_Storage                  |
-           Pragma_Thread_Body                   |
            Pragma_Time_Slice                    |
            Pragma_Title                         |
            Pragma_Unchecked_Union               |
            Pragma_Unimplemented_Unit            |
+           Pragma_Universal_Aliasing            |
            Pragma_Universal_Data                |
            Pragma_Unreferenced                  |
            Pragma_Unreferenced_Objects          |
diff --git a/gcc/ada/sem_cat.adb b/gcc/ada/sem_cat.adb
index 581aad7..409090c 100644
--- a/gcc/ada/sem_cat.adb
+++ b/gcc/ada/sem_cat.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2006, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2007, 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- --
@@ -31,6 +31,7 @@ with Elists;   use Elists;
 with Errout;   use Errout;
 with Fname;    use Fname;
 with Lib;      use Lib;
+with Namet;    use Namet;
 with Nlists;   use Nlists;
 with Opt;      use Opt;
 with Sem;      use Sem;
@@ -120,9 +121,13 @@ package body Sem_Cat is
    is
       N : constant Node_Id := Info_Node;
 
-      --  Here we define an enumeration type to represent categorization
-      --  types, ordered so that a unit with a given categorization can
-      --  only WITH units with lower or equal categorization type.
+      --  Here we define an enumeration type to represent categorization types,
+      --  ordered so that a unit with a given categorization can only WITH
+      --  units with lower or equal categorization type.
+
+      --  Note that we take advantage of E.2(14) to define a category
+      --  Preelaborated and treat pragma Preelaborate as a categorization
+      --  pragma that defines that category.
 
       type Categorization is
         (Pure,
@@ -132,12 +137,9 @@ package body Sem_Cat is
          Preelaborated,
          Normal);
 
-      Unit_Category : Categorization;
-      With_Category : Categorization;
-
       function Get_Categorization (E : Entity_Id) return Categorization;
       --  Check categorization flags from entity, and return in the form
-      --  of a corresponding enumeration value.
+      --  of the lowest value of the Categorization type that applies to E.
 
       ------------------------
       -- Get_Categorization --
@@ -145,12 +147,16 @@ package body Sem_Cat is
 
       function Get_Categorization (E : Entity_Id) return Categorization is
       begin
-         if Is_Preelaborated (E) then
-            return Preelaborated;
+         --  Get the lowest categorization that corresponds to E. Note that
+         --  nothing prevents several (different) categorization pragmas
+         --  to apply to the same library unit, in which case the unit has
+         --  all associated categories, so we need to be careful here to
+         --  check pragmas in proper Categorization order in order to
+         --  return the lowest appplicable value.
 
-            --  Ignore Pure specification if set by pragma Pure_Function
+         --  Ignore Pure specification if set by pragma Pure_Function
 
-         elsif Is_Pure (E)
+         if Is_Pure (E)
            and then not
              (Has_Pragma_Pure_Function (E) and not Has_Pragma_Pure (E))
          then
@@ -165,11 +171,17 @@ package body Sem_Cat is
          elsif Is_Remote_Call_Interface (E) then
             return Remote_Call_Interface;
 
+         elsif Is_Preelaborated (E) then
+            return Preelaborated;
+
          else
             return Normal;
          end if;
       end Get_Categorization;
 
+      Unit_Category : Categorization;
+      With_Category : Categorization;
+
    --  Start of processing for Check_Categorization_Dependencies
 
    begin
@@ -1049,8 +1061,20 @@ package body Sem_Cat is
          --  Check for default initialized variable case. Note that in
          --  accordance with (RM B.1(24)) imported objects are not
          --  subject to default initialization.
+         --  If the initialization does not come from source and is an
+         --  aggregate, it is a static initialization that replaces an
+         --  implicit call, and must be treated as such.
+
+         if Present (E)
+           and then
+            (Comes_From_Source (E) or else Nkind (E) /= N_Aggregate)
+         then
+            null;
 
-         if No (E) and then not Is_Imported (Id) then
+         elsif Is_Imported (Id) then
+            null;
+
+         else
             declare
                Ent : Entity_Id := T;
 
@@ -1129,23 +1153,30 @@ package body Sem_Cat is
                           ("private object not allowed in preelaborated unit",
                            N);
 
-                        --  If we are in Ada 2005 mode, add a message if pragma
+                        --  Add a message if it would help to provide a pragma
                         --  Preelaborable_Initialization on the type of the
-                        --  object would help.
+                        --  object (which would make it legal in Ada 2005).
 
                         --  If the type has no full view (generic type, or
                         --  previous error), the warning does not apply.
 
-                        if Ada_Version >= Ada_05
-                          and then Is_Private_Type (Ent)
+                        if Is_Private_Type (Ent)
                           and then Present (Full_View (Ent))
                           and then
                             Has_Preelaborable_Initialization (Full_View (Ent))
                         then
                            Error_Msg_Sloc := Sloc (Ent);
-                           Error_Msg_NE
-                             ("\would be legal if pragma Preelaborable_" &
-                              "Initialization given for & #", N, Ent);
+
+                           if Ada_Version >= Ada_05 then
+                              Error_Msg_NE
+                                ("\would be legal if pragma Preelaborable_" &
+                                 "Initialization given for & #", N, Ent);
+                           else
+                              Error_Msg_NE
+                                ("\would be legal in Ada 2005 if pragma " &
+                                 "Preelaborable_Initialization given for & #",
+                                 N, Ent);
+                           end if;
                         end if;
                      end if;
                   end if;
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 9ad244c..5f4b95d2 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2006, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2007, 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- --
@@ -37,7 +37,6 @@ with Debug;    use Debug;
 with Einfo;    use Einfo;
 with Errout;   use Errout;
 with Exp_Dist; use Exp_Dist;
-with Hostparm; use Hostparm;
 with Lib;      use Lib;
 with Lib.Writ; use Lib.Writ;
 with Lib.Xref; use Lib.Xref;
@@ -174,6 +173,12 @@ package body Sem_Prag is
    --  (the original one, following the renaming chain) is returned.
    --  Otherwise the entity is returned unchanged. Should be in Einfo???
 
+   procedure rv;
+   --  This is a dummy function called by the processing for pragma Reviewable.
+   --  It is there for assisting front end debugging. By placing a Reviewable
+   --  pragma in the source program, a breakpoint on rv catches this place in
+   --  the source, allowing convenient stepping to the point of interest.
+
    procedure Set_Unit_Name (N : Node_Id; With_Item : Node_Id);
    --  Place semantic information on the argument of an Elaborate or
    --  Elaborate_All pragma. Entity name for unit and its parents is
@@ -253,6 +258,11 @@ package body Sem_Prag is
       type Args_List is array (Natural range <>) of Node_Id;
       --  Types used for arguments to Check_Arg_Order and Gather_Associations
 
+      procedure Ada_2005_Pragma;
+      --  Called for pragmas defined in Ada 2005, that are not in Ada 95. In
+      --  Ada 95 mode, these are implementation defined pragmas, so should be
+      --  caught by the No_Implementation_Pragmas restriction
+
       procedure Check_Ada_83_Warning;
       --  Issues a warning message for the current pragma if operating in Ada
       --  83 mode (used for language pragmas that are not a standard part of
@@ -482,8 +492,8 @@ package body Sem_Prag is
       --  returned, otherwise Arg is returned unchanged.
 
       procedure GNAT_Pragma;
-      --  Called for all GNAT defined pragmas to note the use of the feature,
-      --  and also check the relevant restriction (No_Implementation_Pragmas).
+      --  Called for all GNAT defined pragmas to check the relevant restriction
+      --  (No_Implementation_Pragmas).
 
       function Is_Before_First_Decl
         (Pragma_Node : Node_Id;
@@ -633,6 +643,17 @@ package body Sem_Prag is
       --  node, which is used for error messages on any constructs
       --  that violate the profile.
 
+      ---------------------
+      -- Ada_2005_Pragma --
+      ---------------------
+
+      procedure Ada_2005_Pragma is
+      begin
+         if Ada_Version <= Ada_95 then
+            Check_Restriction (No_Implementation_Pragmas, N);
+         end if;
+      end Ada_2005_Pragma;
+
       --------------------------
       -- Check_Ada_83_Warning --
       --------------------------
@@ -1417,8 +1438,8 @@ package body Sem_Prag is
                      Pragma_Misplaced;
 
                   elsif (Nkind (Parent_Node) = N_Generic_Package_Declaration
-                          or else Nkind (Parent_Node)
-                            = N_Generic_Subprogram_Declaration)
+                           or else Nkind (Parent_Node) =
+                                             N_Generic_Subprogram_Declaration)
                     and then Plist = Generic_Formal_Declarations (Parent_Node)
                   then
                      Pragma_Misplaced;
@@ -2198,6 +2219,10 @@ package body Sem_Prag is
             Error_Pragma_Arg ("entity name required", Arg2);
          end if;
 
+         if Ekind (Entity (Id)) = E_Enumeration_Literal then
+            Error_Pragma ("enumeration literal not allowed for pragma%");
+         end if;
+
          E := Entity (Id);
 
          --  Go to renamed subprogram if present, since convention applies
@@ -2207,8 +2232,8 @@ package body Sem_Prag is
          if Is_Subprogram (E)
            and then Present (Alias (E))
          then
-            if Nkind (Parent (Declaration_Node (E)))
-              = N_Subprogram_Renaming_Declaration
+            if Nkind (Parent (Declaration_Node (E))) =
+                                       N_Subprogram_Renaming_Declaration
             then
                E := Alias (E);
 
@@ -3078,14 +3103,20 @@ package body Sem_Prag is
               or else
             Ekind (Def_Id) = E_Constant
          then
+            --  We do not permit Import to apply to a renaming declaration
+
+            if Present (Renamed_Object (Def_Id)) then
+               Error_Pragma_Arg
+                 ("pragma% not allowed for object renaming", Arg2);
+
             --  User initialization is not allowed for imported object, but
             --  the object declaration may contain a default initialization,
             --  that will be discarded. Note that an explicit initialization
             --  only counts if it comes from source, otherwise it is simply
             --  the code generator making an implicit initialization explicit.
 
-            if Present (Expression (Parent (Def_Id)))
-               and then Comes_From_Source (Expression (Parent (Def_Id)))
+            elsif Present (Expression (Parent (Def_Id)))
+              and then Comes_From_Source (Expression (Parent (Def_Id)))
             then
                Error_Msg_Sloc := Sloc (Def_Id);
                Error_Pragma_Arg
@@ -3235,12 +3266,14 @@ package body Sem_Prag is
                end if;
             end loop;
 
-         --  When the convention is Java, we also allow Import to be given
-         --  for packages, exceptions, and record components.
+         --  When the convention is Java or CIL, we also allow Import to be
+         --  given for packages, generic packages, exceptions, and record
+         --  components.
 
-         elsif C = Convention_Java
+         elsif (C = Convention_Java or else C = Convention_CIL)
            and then
              (Ekind (Def_Id) = E_Package
+                or else Ekind (Def_Id) = E_Generic_Package
                 or else Ekind (Def_Id) = E_Exception
                 or else Nkind (Parent (Def_Id)) = N_Component_Declaration)
          then
@@ -3256,7 +3289,24 @@ package body Sem_Prag is
             if not Is_Tagged_Type (Def_Id) then
                Error_Msg_Sloc := Sloc (Def_Id);
                Error_Pragma_Arg ("imported 'C'P'P type must be tagged", Arg2);
+
             else
+               --  Types treated as CPP classes are treated as limited, but we
+               --  don't require them to be declared this way. A warning is
+               --  issued to encourage the user to declare them as limited.
+               --  This is not an error, for compatibility reasons, because
+               --  these types have been supported this way for some time.
+
+               if not Is_Limited_Type (Def_Id) then
+                  Error_Msg_N
+                    ("imported 'C'P'P type should be " &
+                       "explicitly declared limited?",
+                     Get_Pragma_Arg (Arg2));
+                  Error_Msg_N
+                    ("\type will be considered limited",
+                     Get_Pragma_Arg (Arg2));
+               end if;
+
                Set_Is_CPP_Class (Def_Id);
                Set_Is_Limited_Record (Def_Id);
             end if;
@@ -3338,8 +3388,8 @@ package body Sem_Prag is
                --  trivially possible.
 
                elsif
-                 Nkind (Unit_Declaration_Node (Corresponding_Body (Decl)))
-                   = N_Subprogram_Renaming_Declaration
+                 Nkind (Unit_Declaration_Node (Corresponding_Body (Decl))) =
+                                             N_Subprogram_Renaming_Declaration
                then
                   return False;
 
@@ -3569,9 +3619,11 @@ package body Sem_Prag is
                C := Get_String_Char (S, J);
 
                if Warn_On_Export_Import
-                 and then (not In_Character_Range (C)
-                             or else Get_Character (C) = ' '
-                             or else Get_Character (C) = ',')
+                 and then
+                   (not In_Character_Range (C)
+                     or else (Get_Character (C) = ' '
+                               and then VM_Target /= CLI_Target)
+                     or else Get_Character (C) = ',')
                then
                   Error_Msg_N
                     ("?interface name contains illegal character", SN);
@@ -3584,6 +3636,18 @@ package body Sem_Prag is
       begin
          if No (Link_Arg) then
             if No (Ext_Arg) then
+               if VM_Target = CLI_Target
+                 and then Ekind (Subprogram_Def) = E_Package
+                 and then Nkind (Parent (Subprogram_Def)) =
+                                                 N_Package_Specification
+                 and then Present (Generic_Parent (Parent (Subprogram_Def)))
+               then
+                  Set_Interface_Name
+                     (Subprogram_Def,
+                      Interface_Name
+                        (Generic_Parent (Parent (Subprogram_Def))));
+               end if;
+
                return;
 
             elsif Chars (Ext_Arg) = Name_Link_Name then
@@ -3669,7 +3733,11 @@ package body Sem_Prag is
 
          else
             Start_String;
-            Store_String_Char (Get_Char_Code ('*'));
+
+            if VM_Target = No_VM then
+               Store_String_Char (Get_Char_Code ('*'));
+            end if;
+
             String_Val := Strval (Expr_Value_S (Link_Nam));
 
             for J in 1 .. String_Length (String_Val) loop
@@ -3952,6 +4020,12 @@ package body Sem_Prag is
             C := Get_Check_Id (Chars (Expression (Arg1)));
          end if;
 
+         if not Suppress_Case
+           and then (C = All_Checks or else C = Overflow_Check)
+         then
+            Opt.Overflow_Checks_Unsuppressed := True;
+         end if;
+
          if Arg_Count = 1 then
 
             --  Make an entry in the local scope suppress table. This is the
@@ -4665,6 +4739,7 @@ package body Sem_Prag is
             Expr : Node_Id;
 
          begin
+            Ada_2005_Pragma;
             Check_At_Least_N_Arguments (1);
             Check_At_Most_N_Arguments (2);
             Check_Arg_Order ((Name_Check, Name_Message));
@@ -4737,6 +4812,7 @@ package body Sem_Prag is
          --  pragma Assertion_Policy (Check | Ignore)
 
          when Pragma_Assertion_Policy =>
+            Ada_2005_Pragma;
             Check_Arg_Count (1);
             Check_Arg_Is_One_Of (Arg1, Name_Check, Name_Ignore);
             Assertions_Enabled := Chars (Expression (Arg1)) = Name_Check;
@@ -5413,6 +5489,22 @@ package body Sem_Prag is
                Error_Pragma_Arg ("pragma% applicable to tagged types ", Arg1);
             end if;
 
+            --  Types treated as CPP classes are treated as limited, but we
+            --  don't require them to be declared this way. A warning is issued
+            --  to encourage the user to declare them as limited. This is not
+            --  an error, for compatibility reasons, because these types have
+            --  been supported this way for some time.
+
+            if not Is_Limited_Type (Typ) then
+               Error_Msg_N
+                 ("imported 'C'P'P type should be " &
+                    "explicitly declared limited?",
+                  Get_Pragma_Arg (Arg1));
+               Error_Msg_N
+                 ("\type will be considered limited",
+                  Get_Pragma_Arg (Arg1));
+            end if;
+
             Set_Is_CPP_Class      (Typ);
             Set_Is_Limited_Record (Typ);
             Set_Convention        (Typ, Convention_CPP);
@@ -5558,7 +5650,7 @@ package body Sem_Prag is
          --  pragma Detect_Blocking;
 
          when Pragma_Detect_Blocking =>
-            GNAT_Pragma;
+            Ada_2005_Pragma;
             Check_Arg_Count (0);
             Check_Valid_Configuration_Pragma;
             Detect_Blocking := True;
@@ -5591,7 +5683,8 @@ package body Sem_Prag is
 
                   --  If there is no parameter, then from now on this pragma
                   --  applies to any enumeration, exception or tagged type
-                  --  defined in the current declarative part.
+                  --  defined in the current declarative part, and recursively
+                  --  to any nested scope.
 
                   Set_Discard_Names (Current_Scope);
                   return;
@@ -5936,15 +6029,6 @@ package body Sem_Prag is
                Source_Location);
          end Eliminate;
 
-         -------------------------
-         -- Explicit_Overriding --
-         -------------------------
-
-         when Pragma_Explicit_Overriding =>
-            Check_Valid_Configuration_Pragma;
-            Check_Arg_Count (0);
-            Explicit_Overriding := True;
-
          ------------
          -- Export --
          ------------
@@ -7337,7 +7421,7 @@ package body Sem_Prag is
                   Error_Msg_Sloc :=
                     Interrupt_States.Table (IST_Num).Pragma_Loc;
                   Error_Pragma_Arg
-                    ("state conflicts with that given at #", Arg2);
+                    ("state conflicts with that given #", Arg2);
                   exit;
                end if;
 
@@ -7351,10 +7435,12 @@ package body Sem_Prag is
 
          --  pragma Java_Constructor ([Entity =>] LOCAL_NAME);
 
-         when Pragma_Java_Constructor => Java_Constructor : declare
-            Id     : Entity_Id;
-            Def_Id : Entity_Id;
-            Hom_Id : Entity_Id;
+         when Pragma_CIL_Constructor | Pragma_Java_Constructor =>
+         Java_Constructor : declare
+            Id         : Entity_Id;
+            Def_Id     : Entity_Id;
+            Hom_Id     : Entity_Id;
+            Convention : Convention_Id;
 
          begin
             GNAT_Pragma;
@@ -7371,6 +7457,12 @@ package body Sem_Prag is
                return;
             end if;
 
+            case Prag_Id is
+               when Pragma_CIL_Constructor  => Convention := Convention_CIL;
+               when Pragma_Java_Constructor => Convention := Convention_Java;
+               when others                  => null;
+            end case;
+
             Hom_Id := Entity (Id);
 
             --  Loop through homonyms
@@ -7378,26 +7470,37 @@ package body Sem_Prag is
             loop
                Def_Id := Get_Base_Subprogram (Hom_Id);
 
-               --  The constructor is required to be a function returning
-               --  an access type whose designated type has convention Java.
+               --  The constructor is required to be a function returning an
+               --  access type whose designated type has convention Java/CIL.
 
                if Ekind (Def_Id) = E_Function
-                 and then Ekind (Etype (Def_Id)) in Access_Kind
                  and then
-                   (Atree.Convention
-                      (Designated_Type (Etype (Def_Id))) = Convention_Java
-                   or else
-                     Atree.Convention
-                      (Root_Type (Designated_Type (Etype (Def_Id))))
-                        = Convention_Java)
+                   (Is_Value_Type (Etype (Def_Id))
+                     or else
+                       (Ekind (Etype (Def_Id)) in Access_Kind
+                         and then
+                          (Atree.Convention
+                             (Designated_Type (Etype (Def_Id))) = Convention
+                            or else
+                              Atree.Convention
+                               (Root_Type (Designated_Type (Etype (Def_Id)))) =
+                                                                 Convention)))
                then
                   Set_Is_Constructor (Def_Id);
-                  Set_Convention     (Def_Id, Convention_Java);
+                  Set_Convention     (Def_Id, Convention);
+                  Set_Is_Imported    (Def_Id);
 
                else
-                  Error_Pragma_Arg
-                    ("pragma% requires function returning a 'Java access type",
-                      Arg1);
+                  if Convention = Convention_Java then
+                     Error_Pragma_Arg
+                       ("pragma% requires function returning a " &
+                        "'Java access type", Arg1);
+                  else
+                     pragma Assert (Convention = Convention_CIL);
+                     Error_Pragma_Arg
+                       ("pragma% requires function returning a " &
+                        "'CIL access type", Arg1);
+                  end if;
                end if;
 
                Hom_Id := Homonym (Hom_Id);
@@ -7985,6 +8088,22 @@ package body Sem_Prag is
             Check_Arg_Count (1);
             Check_Arg_Is_Integer_Literal (Arg1);
 
+         -------------
+         -- No_Body --
+         -------------
+
+         --  pragma No_Body;
+
+         --  The only correct use of this pragma is on its own in a file, in
+         --  which case it is specially processed (see Gnat1drv.Check_Bad_Body
+         --  and Frontend, which use Sinput.L.Source_File_Is_Pragma_No_Body to
+         --  check for a file containing nothing but a No_Body pragma). If we
+         --  attempt to process it during normal semantics processing, it means
+         --  it was misplaced.
+
+         when Pragma_No_Body =>
+            Error_Pragma ("misplaced pragma %");
+
          ---------------
          -- No_Return --
          ---------------
@@ -8337,18 +8456,6 @@ package body Sem_Prag is
             Check_Arg_Count (1);
             Check_Arg_Is_One_Of (Arg1, Name_Time, Name_Space, Name_Off);
 
-         -------------------------
-         -- Optional_Overriding --
-         -------------------------
-
-         --  These pragmas are treated as part of the previous subprogram
-         --  declaration, and analyzed immediately after it (see sem_ch6,
-         --  Check_Overriding_Operation). If the pragma has not been analyzed
-         --  yet, it appears in the wrong place.
-
-         when Pragma_Optional_Overriding =>
-            Error_Msg_N ("pragma must appear immediately after subprogram", N);
-
          ----------
          -- Pack --
          ----------
@@ -8423,7 +8530,13 @@ package body Sem_Prag is
 
                else
                   if not Rep_Item_Too_Late (Typ, N) then
-                     Set_Is_Packed            (Base_Type (Typ));
+                     if VM_Target = No_VM then
+                        Set_Is_Packed (Base_Type (Typ));
+                     elsif not GNAT_Mode then
+                        Error_Pragma
+                          ("?pragma% ignored in this configuration");
+                     end if;
+
                      Set_Has_Pragma_Pack      (Base_Type (Typ));
                      Set_Has_Non_Standard_Rep (Base_Type (Typ));
                   end if;
@@ -8433,8 +8546,13 @@ package body Sem_Prag is
 
             else pragma Assert (Is_Record_Type (Typ));
                if not Rep_Item_Too_Late (Typ, N) then
+                  if VM_Target = No_VM then
+                     Set_Is_Packed (Base_Type (Typ));
+                  elsif not GNAT_Mode then
+                     Error_Pragma ("?pragma% ignored in this configuration");
+                  end if;
+
                   Set_Has_Pragma_Pack      (Base_Type (Typ));
-                  Set_Is_Packed            (Base_Type (Typ));
                   Set_Has_Non_Standard_Rep (Base_Type (Typ));
                end if;
             end if;
@@ -8483,6 +8601,7 @@ package body Sem_Prag is
             Ent : Entity_Id;
 
          begin
+            Ada_2005_Pragma;
             Check_Arg_Count (1);
             Check_No_Identifiers;
             Check_Arg_Is_Identifier (Arg1);
@@ -8770,6 +8889,7 @@ package body Sem_Prag is
             Upper_Val   : Uint;
 
          begin
+            Ada_2005_Pragma;
             Check_Arg_Count (3);
             Check_No_Identifiers;
             Check_Arg_Is_Task_Dispatching_Policy (Arg1);
@@ -8888,6 +9008,7 @@ package body Sem_Prag is
          --  profile_IDENTIFIER => Protected | Ravenscar
 
          when Pragma_Profile =>
+            Ada_2005_Pragma;
             Check_Arg_Count (1);
             Check_Valid_Configuration_Pragma;
             Check_No_Identifiers;
@@ -9388,6 +9509,7 @@ package body Sem_Prag is
          when Pragma_Reviewable =>
             Check_Ada_83_Warning;
             Check_Arg_Count (0);
+            rv;
 
          -------------------
          -- Share_Generic --
@@ -9537,6 +9659,25 @@ package body Sem_Prag is
          when Pragma_Source_Reference =>
             GNAT_Pragma;
 
+         --------------------------------
+         -- Static_Elaboration_Desired --
+         --------------------------------
+
+         --  Syntax ???
+
+         when Pragma_Static_Elaboration_Desired =>
+
+            --  GNAT_Pragma???
+            --  Check number of arguments ???
+
+            if Is_Compilation_Unit (Current_Scope)
+              and then Ekind (Current_Scope) = E_Package
+            then
+               Set_Static_Elaboration_Desired (Current_Scope, True);
+            else
+               Error_Pragma ("pragma% must apply to a library-level package");
+            end if;
+
          ------------------
          -- Storage_Size --
          ------------------
@@ -10078,80 +10219,6 @@ package body Sem_Prag is
             end if;
          end Task_Storage;
 
-         -----------------
-         -- Thread_Body --
-         -----------------
-
-         --  pragma Thread_Body
-         --    (  [Entity =>]               LOCAL_NAME
-         --     [,[Secondary_Stack_Size =>] static_integer_EXPRESSION]);
-
-         when Pragma_Thread_Body => Thread_Body : declare
-            Id : Node_Id;
-            SS : Node_Id;
-            E  : Entity_Id;
-
-         begin
-            GNAT_Pragma;
-            Check_Arg_Order ((Name_Entity, Name_Secondary_Stack_Size));
-            Check_At_Least_N_Arguments (1);
-            Check_At_Most_N_Arguments (2);
-            Check_Optional_Identifier (Arg1, Name_Entity);
-            Check_Arg_Is_Local_Name (Arg1);
-
-            Id := Expression (Arg1);
-
-            if not Is_Entity_Name (Id)
-              or else not Is_Subprogram (Entity (Id))
-            then
-               Error_Pragma_Arg ("subprogram name required", Arg1);
-            end if;
-
-            E := Entity (Id);
-
-            --  Go to renamed subprogram if present, since Thread_Body applies
-            --  to the actual renamed entity, not to the renaming entity.
-
-            if Present (Alias (E))
-              and then Nkind (Parent (Declaration_Node (E))) =
-                         N_Subprogram_Renaming_Declaration
-            then
-               E := Alias (E);
-            end if;
-
-            --  Various error checks
-
-            if Nkind (Parent (Declaration_Node (E))) = N_Subprogram_Body then
-               Error_Pragma
-                 ("pragma% requires separate spec and must come before body");
-
-            elsif Rep_Item_Too_Early (E, N)
-              or else Rep_Item_Too_Late (E, N)
-            then
-               raise Pragma_Exit;
-
-            elsif Is_Thread_Body (E) then
-               Error_Pragma_Arg
-                 ("only one thread body pragma allowed", Arg1);
-
-            elsif Present (Homonym (E))
-              and then Scope (Homonym (E)) = Current_Scope
-            then
-               Error_Pragma_Arg
-                 ("thread body subprogram must not be overloaded", Arg1);
-            end if;
-
-            Set_Is_Thread_Body (E);
-
-            --  Deal with secondary stack argument
-
-            if Arg_Count = 2 then
-               Check_Optional_Identifier (Arg2, Name_Secondary_Stack_Size);
-               SS := Expression (Arg2);
-               Analyze_And_Resolve (SS, Any_Integer);
-            end if;
-         end Thread_Body;
-
          ----------------
          -- Time_Slice --
          ----------------
@@ -10373,6 +10440,31 @@ package body Sem_Prag is
             end if;
          end Unimplemented_Unit;
 
+         ------------------------
+         -- Universal_Aliasing --
+         ------------------------
+
+         --  pragma Universal_Aliasing [([Entity =>] type_LOCAL_NAME)];
+
+         when Pragma_Universal_Aliasing => Universal_Alias : declare
+            E_Id : Entity_Id;
+
+         begin
+            GNAT_Pragma;
+            Check_Arg_Count (1);
+            Check_Optional_Identifier (Arg2, Name_Entity);
+            Check_Arg_Is_Local_Name (Arg1);
+            E_Id := Entity (Expression (Arg1));
+
+            if E_Id = Any_Type then
+               return;
+            elsif No (E_Id) or else not Is_Type (E_Id) then
+               Error_Pragma_Arg ("pragma% requires type", Arg1);
+            end if;
+
+            Set_Universal_Aliasing (Implementation_Base_Type (E_Id));
+         end Universal_Alias;
+
          --------------------
          -- Universal_Data --
          --------------------
@@ -11012,6 +11104,7 @@ package body Sem_Prag is
       Pragma_Atomic                        =>  0,
       Pragma_Atomic_Components             =>  0,
       Pragma_Attach_Handler                => -1,
+      Pragma_CIL_Constructor               => -1,
       Pragma_CPP_Class                     =>  0,
       Pragma_CPP_Constructor               =>  0,
       Pragma_CPP_Virtual                   =>  0,
@@ -11036,7 +11129,6 @@ package body Sem_Prag is
       Pragma_Elaborate_Body                => -1,
       Pragma_Elaboration_Checks            => -1,
       Pragma_Eliminate                     => -1,
-      Pragma_Explicit_Overriding           => -1,
       Pragma_Export                        => -1,
       Pragma_Export_Exception              => -1,
       Pragma_Export_Function               => -1,
@@ -11085,12 +11177,12 @@ package body Sem_Prag is
       Pragma_Main_Storage                  => -1,
       Pragma_Memory_Size                   => -1,
       Pragma_No_Return                     =>  0,
+      Pragma_No_Body                       =>  0,
       Pragma_No_Run_Time                   => -1,
       Pragma_No_Strict_Aliasing            => -1,
       Pragma_Normalize_Scalars             => -1,
       Pragma_Obsolescent                   =>  0,
       Pragma_Optimize                      => -1,
-      Pragma_Optional_Overriding           => -1,
       Pragma_Pack                          =>  0,
       Pragma_Page                          => -1,
       Pragma_Passive                       => -1,
@@ -11124,6 +11216,7 @@ package body Sem_Prag is
       Pragma_Source_Reference              => -1,
       Pragma_Storage_Size                  => -1,
       Pragma_Storage_Unit                  => -1,
+      Pragma_Static_Elaboration_Desired    => -1,
       Pragma_Stream_Convert                => -1,
       Pragma_Style_Checks                  => -1,
       Pragma_Subtitle                      => -1,
@@ -11137,11 +11230,11 @@ package body Sem_Prag is
       Pragma_Task_Info                     => -1,
       Pragma_Task_Name                     => -1,
       Pragma_Task_Storage                  =>  0,
-      Pragma_Thread_Body                   => +2,
       Pragma_Time_Slice                    => -1,
       Pragma_Title                         => -1,
       Pragma_Unchecked_Union               =>  0,
       Pragma_Unimplemented_Unit            => -1,
+      Pragma_Universal_Aliasing            => -1,
       Pragma_Universal_Data                => -1,
       Pragma_Unreferenced                  => -1,
       Pragma_Unreferenced_Objects          => -1,
@@ -11297,6 +11390,15 @@ package body Sem_Prag is
       end;
    end Process_Compilation_Unit_Pragmas;
 
+   --------
+   -- rv --
+   --------
+
+   procedure rv is
+   begin
+      null;
+   end rv;
+
    --------------------------------
    -- Set_Encoded_Interface_Name --
    --------------------------------
@@ -11337,11 +11439,12 @@ package body Sem_Prag is
       --  If first character is asterisk, this is a link name, and we
       --  leave it completely unmodified. We also ignore null strings
       --  (the latter case happens only in error cases) and no encoding
-      --  should occur for Java interface names.
+      --  should occur for Java or AAMP interface names.
 
       if Len = 0
         or else Get_String_Char (Str, 1) = Get_Char_Code ('*')
-        or else Java_VM
+        or else VM_Target /= No_VM
+        or else AAMP_On_Target
       then
          Set_Interface_Name (E, S);
 
diff --git a/gcc/ada/snames.adb b/gcc/ada/snames.adb
index 9981725..1afe327 100644
--- a/gcc/ada/snames.adb
+++ b/gcc/ada/snames.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---          Copyright (C) 1992-2006, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2007, 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- --
@@ -31,7 +31,6 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
-with Namet; use Namet;
 with Opt;   use Opt;
 with Table;
 
@@ -118,9 +117,11 @@ package body Snames is
      "put#" &
      "put_line#" &
      "to#" &
+     "exception_traces#" &
      "finalization#" &
      "finalization_root#" &
      "interfaces#" &
+     "most_recent_exception#" &
      "standard#" &
      "system#" &
      "text_io#" &
@@ -187,7 +188,6 @@ package body Snames is
      "discard_names#" &
      "elaboration_checks#" &
      "eliminate#" &
-     "explicit_overriding#" &
      "extend_system#" &
      "extensions_allowed#" &
      "external_name_casing#" &
@@ -232,6 +232,7 @@ package body Snames is
      "atomic#" &
      "atomic_components#" &
      "attach_handler#" &
+     "cil_constructor#" &
      "comment#" &
      "common_object#" &
      "complete_representation#" &
@@ -283,10 +284,10 @@ package body Snames is
      "main#" &
      "main_storage#" &
      "memory_size#" &
+     "no_body#" &
      "no_return#" &
      "obsolescent#" &
      "optimize#" &
-     "optional_overriding#" &
      "pack#" &
      "page#" &
      "passive#" &
@@ -303,6 +304,7 @@ package body Snames is
      "shared#" &
      "shared_passive#" &
      "source_reference#" &
+     "static_elaboration_desired#" &
      "stream_convert#" &
      "subtitle#" &
      "suppress_all#" &
@@ -312,11 +314,11 @@ package body Snames is
      "task_info#" &
      "task_name#" &
      "task_storage#" &
-     "thread_body#" &
      "time_slice#" &
      "title#" &
      "unchecked_union#" &
      "unimplemented_unit#" &
+     "universal_aliasing#" &
      "unreferenced#" &
      "unreferenced_objects#" &
      "unreserve_all_interrupts#" &
@@ -325,6 +327,7 @@ package body Snames is
      "weak_external#" &
      "ada#" &
      "assembler#" &
+     "cil#" &
      "cobol#" &
      "cpp#" &
      "fortran#" &
@@ -670,13 +673,13 @@ package body Snames is
      "archive_suffix#" &
      "binder#" &
      "binder_driver#" &
+     "binder_prefix#" &
      "body_suffix#" &
      "builder#" &
      "builder_switches#" &
      "compiler#" &
      "compiler_driver#" &
      "compiler_kind#" &
-     "compiler_minimum_options#" &
      "compiler_pic_option#" &
      "compute_dependency#" &
      "config_body_file_name#" &
@@ -690,6 +693,7 @@ package body Snames is
      "default_global_compiler_switches#" &
      "default_language#" &
      "default_linker#" &
+     "default_minimum_linker_options#" &
      "default_switches#" &
      "dependency_file_kind#" &
      "dependency_option#" &
@@ -724,6 +728,7 @@ package body Snames is
      "library_name#" &
      "library_major_minor_id_supported#" &
      "library_options#" &
+     "library_partial_linker#" &
      "library_reference_symbol_file#" &
      "library_src_dir#" &
      "library_support#" &
@@ -743,6 +748,8 @@ package body Snames is
      "mapping_body_suffix#" &
      "metrics#" &
      "minimum_binder_options#" &
+     "minimum_compiler_options#" &
+     "minimum_linker_options#" &
      "naming#" &
      "objects_path#" &
      "objects_path_file#" &
@@ -767,6 +774,7 @@ package body Snames is
      "stack#" &
      "switches#" &
      "symbolic_link_supported#" &
+     "toolchain_description#" &
      "toolchain_version#" &
      "unaligned_valid#" &
      "interface#" &
@@ -864,6 +872,7 @@ package body Snames is
          when Name_Ada        => return Convention_Ada;
          when Name_Assembler  => return Convention_Assembler;
          when Name_C          => return Convention_C;
+         when Name_CIL        => return Convention_CIL;
          when Name_COBOL      => return Convention_COBOL;
          when Name_CPP        => return Convention_CPP;
          when Name_Fortran    => return Convention_Fortran;
@@ -896,6 +905,7 @@ package body Snames is
          when Convention_Ada       => return Name_Ada;
          when Convention_Assembler => return Name_Assembler;
          when Convention_C         => return Name_C;
+         when Convention_CIL       => return Name_CIL;
          when Convention_COBOL     => return Name_COBOL;
          when Convention_CPP       => return Name_CPP;
          when Convention_Entry     => return Name_Entry;
diff --git a/gcc/ada/snames.ads b/gcc/ada/snames.ads
index 3ff606e..7795368 100644
--- a/gcc/ada/snames.ads
+++ b/gcc/ada/snames.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2006, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2007, 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- --
@@ -31,6 +31,7 @@
 --                                                                          --
 ------------------------------------------------------------------------------
 
+with Namet; use Namet;
 with Types; use Types;
 
 package Snames is
@@ -235,78 +236,80 @@ package Snames is
 
    --  Names for packages that are treated specially by the compiler
 
-   Name_Finalization                   : constant Name_Id := N + 060;
-   Name_Finalization_Root              : constant Name_Id := N + 061;
-   Name_Interfaces                     : constant Name_Id := N + 062;
-   Name_Standard                       : constant Name_Id := N + 063;
-   Name_System                         : constant Name_Id := N + 064;
-   Name_Text_IO                        : constant Name_Id := N + 065;
-   Name_Wide_Text_IO                   : constant Name_Id := N + 066;
-   Name_Wide_Wide_Text_IO              : constant Name_Id := N + 067;
+   Name_Exception_Traces               : constant Name_Id := N + 060;
+   Name_Finalization                   : constant Name_Id := N + 061;
+   Name_Finalization_Root              : constant Name_Id := N + 062;
+   Name_Interfaces                     : constant Name_Id := N + 063;
+   Name_Most_Recent_Exception          : constant Name_Id := N + 064;
+   Name_Standard                       : constant Name_Id := N + 065;
+   Name_System                         : constant Name_Id := N + 066;
+   Name_Text_IO                        : constant Name_Id := N + 067;
+   Name_Wide_Text_IO                   : constant Name_Id := N + 068;
+   Name_Wide_Wide_Text_IO              : constant Name_Id := N + 069;
 
    --  Names of implementations of the distributed systems annex
 
-   First_PCS_Name                      : constant Name_Id := N + 068;
-   Name_No_DSA                         : constant Name_Id := N + 068;
-   Name_GARLIC_DSA                     : constant Name_Id := N + 069;
-   Name_PolyORB_DSA                    : constant Name_Id := N + 070;
-   Last_PCS_Name                       : constant Name_Id := N + 070;
+   First_PCS_Name                      : constant Name_Id := N + 070;
+   Name_No_DSA                         : constant Name_Id := N + 070;
+   Name_GARLIC_DSA                     : constant Name_Id := N + 071;
+   Name_PolyORB_DSA                    : constant Name_Id := N + 072;
+   Last_PCS_Name                       : constant Name_Id := N + 072;
 
    subtype PCS_Names is Name_Id
      range First_PCS_Name .. Last_PCS_Name;
 
    --  Names of identifiers used in expanding distribution stubs
 
-   Name_Addr                           : constant Name_Id := N + 071;
-   Name_Async                          : constant Name_Id := N + 072;
-   Name_Get_Active_Partition_ID        : constant Name_Id := N + 073;
-   Name_Get_RCI_Package_Receiver       : constant Name_Id := N + 074;
-   Name_Get_RCI_Package_Ref            : constant Name_Id := N + 075;
-   Name_Origin                         : constant Name_Id := N + 076;
-   Name_Params                         : constant Name_Id := N + 077;
-   Name_Partition                      : constant Name_Id := N + 078;
-   Name_Partition_Interface            : constant Name_Id := N + 079;
-   Name_Ras                            : constant Name_Id := N + 080;
-   Name_uCall                          : constant Name_Id := N + 081;
-   Name_RCI_Name                       : constant Name_Id := N + 082;
-   Name_Receiver                       : constant Name_Id := N + 083;
-   Name_Result                         : constant Name_Id := N + 084;
-   Name_Rpc                            : constant Name_Id := N + 085;
-   Name_Subp_Id                        : constant Name_Id := N + 086;
-   Name_Operation                      : constant Name_Id := N + 087;
-   Name_Argument                       : constant Name_Id := N + 088;
-   Name_Arg_Modes                      : constant Name_Id := N + 089;
-   Name_Handler                        : constant Name_Id := N + 090;
-   Name_Target                         : constant Name_Id := N + 091;
-   Name_Req                            : constant Name_Id := N + 092;
-   Name_Obj_TypeCode                   : constant Name_Id := N + 093;
-   Name_Stub                           : constant Name_Id := N + 094;
+   Name_Addr                           : constant Name_Id := N + 073;
+   Name_Async                          : constant Name_Id := N + 074;
+   Name_Get_Active_Partition_ID        : constant Name_Id := N + 075;
+   Name_Get_RCI_Package_Receiver       : constant Name_Id := N + 076;
+   Name_Get_RCI_Package_Ref            : constant Name_Id := N + 077;
+   Name_Origin                         : constant Name_Id := N + 078;
+   Name_Params                         : constant Name_Id := N + 079;
+   Name_Partition                      : constant Name_Id := N + 080;
+   Name_Partition_Interface            : constant Name_Id := N + 081;
+   Name_Ras                            : constant Name_Id := N + 082;
+   Name_uCall                          : constant Name_Id := N + 083;
+   Name_RCI_Name                       : constant Name_Id := N + 084;
+   Name_Receiver                       : constant Name_Id := N + 085;
+   Name_Result                         : constant Name_Id := N + 086;
+   Name_Rpc                            : constant Name_Id := N + 087;
+   Name_Subp_Id                        : constant Name_Id := N + 088;
+   Name_Operation                      : constant Name_Id := N + 089;
+   Name_Argument                       : constant Name_Id := N + 090;
+   Name_Arg_Modes                      : constant Name_Id := N + 091;
+   Name_Handler                        : constant Name_Id := N + 092;
+   Name_Target                         : constant Name_Id := N + 093;
+   Name_Req                            : constant Name_Id := N + 094;
+   Name_Obj_TypeCode                   : constant Name_Id := N + 095;
+   Name_Stub                           : constant Name_Id := N + 096;
 
    --  Operator Symbol entries. The actual names have an upper case O at
    --  the start in place of the Op_ prefix (e.g. the actual name that
    --  corresponds to Name_Op_Abs is "Oabs".
 
-   First_Operator_Name                 : constant Name_Id := N + 095;
-   Name_Op_Abs                         : constant Name_Id := N + 095; -- "abs"
-   Name_Op_And                         : constant Name_Id := N + 096; -- "and"
-   Name_Op_Mod                         : constant Name_Id := N + 097; -- "mod"
-   Name_Op_Not                         : constant Name_Id := N + 098; -- "not"
-   Name_Op_Or                          : constant Name_Id := N + 099; -- "or"
-   Name_Op_Rem                         : constant Name_Id := N + 100; -- "rem"
-   Name_Op_Xor                         : constant Name_Id := N + 101; -- "xor"
-   Name_Op_Eq                          : constant Name_Id := N + 102; -- "="
-   Name_Op_Ne                          : constant Name_Id := N + 103; -- "/="
-   Name_Op_Lt                          : constant Name_Id := N + 104; -- "<"
-   Name_Op_Le                          : constant Name_Id := N + 105; -- "<="
-   Name_Op_Gt                          : constant Name_Id := N + 106; -- ">"
-   Name_Op_Ge                          : constant Name_Id := N + 107; -- ">="
-   Name_Op_Add                         : constant Name_Id := N + 108; -- "+"
-   Name_Op_Subtract                    : constant Name_Id := N + 109; -- "-"
-   Name_Op_Concat                      : constant Name_Id := N + 110; -- "&"
-   Name_Op_Multiply                    : constant Name_Id := N + 111; -- "*"
-   Name_Op_Divide                      : constant Name_Id := N + 112; -- "/"
-   Name_Op_Expon                       : constant Name_Id := N + 113; -- "**"
-   Last_Operator_Name                  : constant Name_Id := N + 113;
+   First_Operator_Name                 : constant Name_Id := N + 097;
+   Name_Op_Abs                         : constant Name_Id := N + 097; -- "abs"
+   Name_Op_And                         : constant Name_Id := N + 098; -- "and"
+   Name_Op_Mod                         : constant Name_Id := N + 099; -- "mod"
+   Name_Op_Not                         : constant Name_Id := N + 100; -- "not"
+   Name_Op_Or                          : constant Name_Id := N + 101; -- "or"
+   Name_Op_Rem                         : constant Name_Id := N + 102; -- "rem"
+   Name_Op_Xor                         : constant Name_Id := N + 103; -- "xor"
+   Name_Op_Eq                          : constant Name_Id := N + 104; -- "="
+   Name_Op_Ne                          : constant Name_Id := N + 105; -- "/="
+   Name_Op_Lt                          : constant Name_Id := N + 106; -- "<"
+   Name_Op_Le                          : constant Name_Id := N + 107; -- "<="
+   Name_Op_Gt                          : constant Name_Id := N + 108; -- ">"
+   Name_Op_Ge                          : constant Name_Id := N + 109; -- ">="
+   Name_Op_Add                         : constant Name_Id := N + 110; -- "+"
+   Name_Op_Subtract                    : constant Name_Id := N + 111; -- "-"
+   Name_Op_Concat                      : constant Name_Id := N + 112; -- "&"
+   Name_Op_Multiply                    : constant Name_Id := N + 113; -- "*"
+   Name_Op_Divide                      : constant Name_Id := N + 114; -- "/"
+   Name_Op_Expon                       : constant Name_Id := N + 115; -- "**"
+   Last_Operator_Name                  : constant Name_Id := N + 115;
 
    --  Names for all pragmas recognized by GNAT. The entries with the comment
    --  "Ada 83" are pragmas that are defined in Ada 83, but not in Ada 95.
@@ -329,69 +332,68 @@ package Snames is
    --  only in GNAT for the AAMP. They are ignored in other versions with
    --  appropriate warnings.
 
-   First_Pragma_Name                   : constant Name_Id := N + 114;
+   First_Pragma_Name                   : constant Name_Id := N + 116;
 
    --  Configuration pragmas are grouped at start
 
-   Name_Ada_83                         : constant Name_Id := N + 114; -- GNAT
-   Name_Ada_95                         : constant Name_Id := N + 115; -- GNAT
-   Name_Ada_05                         : constant Name_Id := N + 116; -- GNAT
-   Name_Ada_2005                       : constant Name_Id := N + 117; -- GNAT
-   Name_Assertion_Policy               : constant Name_Id := N + 118; -- Ada 05
-   Name_C_Pass_By_Copy                 : constant Name_Id := N + 119; -- GNAT
-   Name_Compile_Time_Error             : constant Name_Id := N + 120; -- GNAT
-   Name_Compile_Time_Warning           : constant Name_Id := N + 121; -- GNAT
-   Name_Component_Alignment            : constant Name_Id := N + 122; -- GNAT
-   Name_Convention_Identifier          : constant Name_Id := N + 123; -- GNAT
-   Name_Debug_Policy                   : constant Name_Id := N + 124; -- GNAT
-   Name_Detect_Blocking                : constant Name_Id := N + 125; -- Ada 05
-   Name_Discard_Names                  : constant Name_Id := N + 126;
-   Name_Elaboration_Checks             : constant Name_Id := N + 127; -- GNAT
-   Name_Eliminate                      : constant Name_Id := N + 128; -- GNAT
-   Name_Explicit_Overriding            : constant Name_Id := N + 129; -- Ada 05
-   Name_Extend_System                  : constant Name_Id := N + 130; -- GNAT
-   Name_Extensions_Allowed             : constant Name_Id := N + 131; -- GNAT
-   Name_External_Name_Casing           : constant Name_Id := N + 132; -- GNAT
-   Name_Float_Representation           : constant Name_Id := N + 133; -- GNAT
-   Name_Initialize_Scalars             : constant Name_Id := N + 134; -- GNAT
-   Name_Interrupt_State                : constant Name_Id := N + 135; -- GNAT
-   Name_License                        : constant Name_Id := N + 136; -- GNAT
-   Name_Locking_Policy                 : constant Name_Id := N + 137;
-   Name_Long_Float                     : constant Name_Id := N + 138; -- VMS
-   Name_No_Run_Time                    : constant Name_Id := N + 139; -- GNAT
-   Name_No_Strict_Aliasing             : constant Name_Id := N + 140; -- GNAT
-   Name_Normalize_Scalars              : constant Name_Id := N + 141;
-   Name_Polling                        : constant Name_Id := N + 142; -- GNAT
-   Name_Persistent_BSS                 : constant Name_Id := N + 143; -- GNAT
-   Name_Priority_Specific_Dispatching  : constant Name_Id := N + 144; -- Ada 05
-   Name_Profile                        : constant Name_Id := N + 145; -- Ada 05
-   Name_Profile_Warnings               : constant Name_Id := N + 146; -- GNAT
-   Name_Propagate_Exceptions           : constant Name_Id := N + 147; -- GNAT
-   Name_Queuing_Policy                 : constant Name_Id := N + 148;
-   Name_Ravenscar                      : constant Name_Id := N + 149; -- Ada 05
-   Name_Restricted_Run_Time            : constant Name_Id := N + 150; -- GNAT
-   Name_Restrictions                   : constant Name_Id := N + 151;
-   Name_Restriction_Warnings           : constant Name_Id := N + 152; -- GNAT
-   Name_Reviewable                     : constant Name_Id := N + 153;
-   Name_Source_File_Name               : constant Name_Id := N + 154; -- GNAT
-   Name_Source_File_Name_Project       : constant Name_Id := N + 155; -- GNAT
-   Name_Style_Checks                   : constant Name_Id := N + 156; -- GNAT
-   Name_Suppress                       : constant Name_Id := N + 157;
-   Name_Suppress_Exception_Locations   : constant Name_Id := N + 158; -- GNAT
-   Name_Task_Dispatching_Policy        : constant Name_Id := N + 159;
-   Name_Universal_Data                 : constant Name_Id := N + 160; -- AAMP
-   Name_Unsuppress                     : constant Name_Id := N + 161; -- GNAT
-   Name_Use_VADS_Size                  : constant Name_Id := N + 162; -- GNAT
-   Name_Validity_Checks                : constant Name_Id := N + 163; -- GNAT
-   Name_Warnings                       : constant Name_Id := N + 164; -- GNAT
-   Name_Wide_Character_Encoding        : constant Name_Id := N + 165; -- GNAT
-   Last_Configuration_Pragma_Name      : constant Name_Id := N + 165;
+   Name_Ada_83                         : constant Name_Id := N + 116; -- GNAT
+   Name_Ada_95                         : constant Name_Id := N + 117; -- GNAT
+   Name_Ada_05                         : constant Name_Id := N + 118; -- GNAT
+   Name_Ada_2005                       : constant Name_Id := N + 119; -- GNAT
+   Name_Assertion_Policy               : constant Name_Id := N + 120; -- Ada 05
+   Name_C_Pass_By_Copy                 : constant Name_Id := N + 121; -- GNAT
+   Name_Compile_Time_Error             : constant Name_Id := N + 122; -- GNAT
+   Name_Compile_Time_Warning           : constant Name_Id := N + 123; -- GNAT
+   Name_Component_Alignment            : constant Name_Id := N + 124; -- GNAT
+   Name_Convention_Identifier          : constant Name_Id := N + 125; -- GNAT
+   Name_Debug_Policy                   : constant Name_Id := N + 126; -- GNAT
+   Name_Detect_Blocking                : constant Name_Id := N + 127; -- Ada 05
+   Name_Discard_Names                  : constant Name_Id := N + 128;
+   Name_Elaboration_Checks             : constant Name_Id := N + 129; -- GNAT
+   Name_Eliminate                      : constant Name_Id := N + 130; -- GNAT
+   Name_Extend_System                  : constant Name_Id := N + 131; -- GNAT
+   Name_Extensions_Allowed             : constant Name_Id := N + 132; -- GNAT
+   Name_External_Name_Casing           : constant Name_Id := N + 133; -- GNAT
+   Name_Float_Representation           : constant Name_Id := N + 134; -- GNAT
+   Name_Initialize_Scalars             : constant Name_Id := N + 135; -- GNAT
+   Name_Interrupt_State                : constant Name_Id := N + 136; -- GNAT
+   Name_License                        : constant Name_Id := N + 137; -- GNAT
+   Name_Locking_Policy                 : constant Name_Id := N + 138;
+   Name_Long_Float                     : constant Name_Id := N + 139; -- VMS
+   Name_No_Run_Time                    : constant Name_Id := N + 140; -- GNAT
+   Name_No_Strict_Aliasing             : constant Name_Id := N + 141; -- GNAT
+   Name_Normalize_Scalars              : constant Name_Id := N + 142;
+   Name_Polling                        : constant Name_Id := N + 143; -- GNAT
+   Name_Persistent_BSS                 : constant Name_Id := N + 144; -- GNAT
+   Name_Priority_Specific_Dispatching  : constant Name_Id := N + 145; -- Ada 05
+   Name_Profile                        : constant Name_Id := N + 146; -- Ada 05
+   Name_Profile_Warnings               : constant Name_Id := N + 147; -- GNAT
+   Name_Propagate_Exceptions           : constant Name_Id := N + 148; -- GNAT
+   Name_Queuing_Policy                 : constant Name_Id := N + 149;
+   Name_Ravenscar                      : constant Name_Id := N + 150; -- GNAT
+   Name_Restricted_Run_Time            : constant Name_Id := N + 151; -- GNAT
+   Name_Restrictions                   : constant Name_Id := N + 152;
+   Name_Restriction_Warnings           : constant Name_Id := N + 153; -- GNAT
+   Name_Reviewable                     : constant Name_Id := N + 154;
+   Name_Source_File_Name               : constant Name_Id := N + 155; -- GNAT
+   Name_Source_File_Name_Project       : constant Name_Id := N + 156; -- GNAT
+   Name_Style_Checks                   : constant Name_Id := N + 157; -- GNAT
+   Name_Suppress                       : constant Name_Id := N + 158;
+   Name_Suppress_Exception_Locations   : constant Name_Id := N + 159; -- GNAT
+   Name_Task_Dispatching_Policy        : constant Name_Id := N + 160;
+   Name_Universal_Data                 : constant Name_Id := N + 161; -- AAMP
+   Name_Unsuppress                     : constant Name_Id := N + 162; -- GNAT
+   Name_Use_VADS_Size                  : constant Name_Id := N + 163; -- GNAT
+   Name_Validity_Checks                : constant Name_Id := N + 164; -- GNAT
+   Name_Warnings                       : constant Name_Id := N + 165; -- GNAT
+   Name_Wide_Character_Encoding        : constant Name_Id := N + 166; -- GNAT
+   Last_Configuration_Pragma_Name      : constant Name_Id := N + 166;
 
    --  Remaining pragma names
 
-   Name_Abort_Defer                    : constant Name_Id := N + 166; -- GNAT
-   Name_All_Calls_Remote               : constant Name_Id := N + 167;
-   Name_Annotate                       : constant Name_Id := N + 168; -- GNAT
+   Name_Abort_Defer                    : constant Name_Id := N + 167; -- GNAT
+   Name_All_Calls_Remote               : constant Name_Id := N + 168;
+   Name_Annotate                       : constant Name_Id := N + 169; -- GNAT
 
    --  Note: AST_Entry is not in this list because its name matches the
    --  name of the corresponding attribute. However, it is included in the
@@ -399,72 +401,73 @@ package Snames is
    --  and Check_Pragma_Id correctly recognize and process Name_AST_Entry.
    --  AST_Entry is a VMS specific pragma.
 
-   Name_Assert                         : constant Name_Id := N + 169; -- Ada 05
-   Name_Asynchronous                   : constant Name_Id := N + 170;
-   Name_Atomic                         : constant Name_Id := N + 171;
-   Name_Atomic_Components              : constant Name_Id := N + 172;
-   Name_Attach_Handler                 : constant Name_Id := N + 173;
-   Name_Comment                        : constant Name_Id := N + 174; -- GNAT
-   Name_Common_Object                  : constant Name_Id := N + 175; -- GNAT
-   Name_Complete_Representation        : constant Name_Id := N + 176; -- GNAT
-   Name_Complex_Representation         : constant Name_Id := N + 177; -- GNAT
-   Name_Controlled                     : constant Name_Id := N + 178;
-   Name_Convention                     : constant Name_Id := N + 179;
-   Name_CPP_Class                      : constant Name_Id := N + 180; -- GNAT
-   Name_CPP_Constructor                : constant Name_Id := N + 181; -- GNAT
-   Name_CPP_Virtual                    : constant Name_Id := N + 182; -- GNAT
-   Name_CPP_Vtable                     : constant Name_Id := N + 183; -- GNAT
-   Name_Debug                          : constant Name_Id := N + 184; -- GNAT
-   Name_Elaborate                      : constant Name_Id := N + 185; -- Ada 83
-   Name_Elaborate_All                  : constant Name_Id := N + 186;
-   Name_Elaborate_Body                 : constant Name_Id := N + 187;
-   Name_Export                         : constant Name_Id := N + 188;
-   Name_Export_Exception               : constant Name_Id := N + 189; -- VMS
-   Name_Export_Function                : constant Name_Id := N + 190; -- GNAT
-   Name_Export_Object                  : constant Name_Id := N + 191; -- GNAT
-   Name_Export_Procedure               : constant Name_Id := N + 192; -- GNAT
-   Name_Export_Value                   : constant Name_Id := N + 193; -- GNAT
-   Name_Export_Valued_Procedure        : constant Name_Id := N + 194; -- GNAT
-   Name_External                       : constant Name_Id := N + 195; -- GNAT
-   Name_Finalize_Storage_Only          : constant Name_Id := N + 196; -- GNAT
-   Name_Ident                          : constant Name_Id := N + 197; -- VMS
-   Name_Import                         : constant Name_Id := N + 198;
-   Name_Import_Exception               : constant Name_Id := N + 199; -- VMS
-   Name_Import_Function                : constant Name_Id := N + 200; -- GNAT
-   Name_Import_Object                  : constant Name_Id := N + 201; -- GNAT
-   Name_Import_Procedure               : constant Name_Id := N + 202; -- GNAT
-   Name_Import_Valued_Procedure        : constant Name_Id := N + 203; -- GNAT
-   Name_Inline                         : constant Name_Id := N + 204;
-   Name_Inline_Always                  : constant Name_Id := N + 205; -- GNAT
-   Name_Inline_Generic                 : constant Name_Id := N + 206; -- GNAT
-   Name_Inspection_Point               : constant Name_Id := N + 207;
-   Name_Interface_Name                 : constant Name_Id := N + 208; -- GNAT
-   Name_Interrupt_Handler              : constant Name_Id := N + 209;
-   Name_Interrupt_Priority             : constant Name_Id := N + 210;
-   Name_Java_Constructor               : constant Name_Id := N + 211; -- GNAT
-   Name_Java_Interface                 : constant Name_Id := N + 212; -- GNAT
-   Name_Keep_Names                     : constant Name_Id := N + 213; -- GNAT
-   Name_Link_With                      : constant Name_Id := N + 214; -- GNAT
-   Name_Linker_Alias                   : constant Name_Id := N + 215; -- GNAT
-   Name_Linker_Constructor             : constant Name_Id := N + 216; -- GNAT
-   Name_Linker_Destructor              : constant Name_Id := N + 217; -- GNAT
-   Name_Linker_Options                 : constant Name_Id := N + 218;
-   Name_Linker_Section                 : constant Name_Id := N + 219; -- GNAT
-   Name_List                           : constant Name_Id := N + 220;
-   Name_Machine_Attribute              : constant Name_Id := N + 221; -- GNAT
-   Name_Main                           : constant Name_Id := N + 222; -- GNAT
-   Name_Main_Storage                   : constant Name_Id := N + 223; -- GNAT
-   Name_Memory_Size                    : constant Name_Id := N + 224; -- Ada 83
-   Name_No_Return                      : constant Name_Id := N + 225; -- GNAT
-   Name_Obsolescent                    : constant Name_Id := N + 226; -- GNAT
-   Name_Optimize                       : constant Name_Id := N + 227;
-   Name_Optional_Overriding            : constant Name_Id := N + 228; -- Ada 05
-   Name_Pack                           : constant Name_Id := N + 229;
-   Name_Page                           : constant Name_Id := N + 230;
-   Name_Passive                        : constant Name_Id := N + 231; -- GNAT
-   Name_Preelaborable_Initialization   : constant Name_Id := N + 232; -- Ada 05
-   Name_Preelaborate                   : constant Name_Id := N + 233;
-   Name_Preelaborate_05                : constant Name_Id := N + 234; -- GNAT
+   Name_Assert                         : constant Name_Id := N + 170; -- Ada 05
+   Name_Asynchronous                   : constant Name_Id := N + 171;
+   Name_Atomic                         : constant Name_Id := N + 172;
+   Name_Atomic_Components              : constant Name_Id := N + 173;
+   Name_Attach_Handler                 : constant Name_Id := N + 174;
+   Name_CIL_Constructor                : constant Name_Id := N + 175; -- GNAT
+   Name_Comment                        : constant Name_Id := N + 176; -- GNAT
+   Name_Common_Object                  : constant Name_Id := N + 177; -- GNAT
+   Name_Complete_Representation        : constant Name_Id := N + 178; -- GNAT
+   Name_Complex_Representation         : constant Name_Id := N + 179; -- GNAT
+   Name_Controlled                     : constant Name_Id := N + 180;
+   Name_Convention                     : constant Name_Id := N + 181;
+   Name_CPP_Class                      : constant Name_Id := N + 182; -- GNAT
+   Name_CPP_Constructor                : constant Name_Id := N + 183; -- GNAT
+   Name_CPP_Virtual                    : constant Name_Id := N + 184; -- GNAT
+   Name_CPP_Vtable                     : constant Name_Id := N + 185; -- GNAT
+   Name_Debug                          : constant Name_Id := N + 186; -- GNAT
+   Name_Elaborate                      : constant Name_Id := N + 187; -- Ada 83
+   Name_Elaborate_All                  : constant Name_Id := N + 188;
+   Name_Elaborate_Body                 : constant Name_Id := N + 189;
+   Name_Export                         : constant Name_Id := N + 190;
+   Name_Export_Exception               : constant Name_Id := N + 191; -- VMS
+   Name_Export_Function                : constant Name_Id := N + 192; -- GNAT
+   Name_Export_Object                  : constant Name_Id := N + 193; -- GNAT
+   Name_Export_Procedure               : constant Name_Id := N + 194; -- GNAT
+   Name_Export_Value                   : constant Name_Id := N + 195; -- GNAT
+   Name_Export_Valued_Procedure        : constant Name_Id := N + 196; -- GNAT
+   Name_External                       : constant Name_Id := N + 197; -- GNAT
+   Name_Finalize_Storage_Only          : constant Name_Id := N + 198; -- GNAT
+   Name_Ident                          : constant Name_Id := N + 199; -- VMS
+   Name_Import                         : constant Name_Id := N + 200;
+   Name_Import_Exception               : constant Name_Id := N + 201; -- VMS
+   Name_Import_Function                : constant Name_Id := N + 202; -- GNAT
+   Name_Import_Object                  : constant Name_Id := N + 203; -- GNAT
+   Name_Import_Procedure               : constant Name_Id := N + 204; -- GNAT
+   Name_Import_Valued_Procedure        : constant Name_Id := N + 205; -- GNAT
+   Name_Inline                         : constant Name_Id := N + 206;
+   Name_Inline_Always                  : constant Name_Id := N + 207; -- GNAT
+   Name_Inline_Generic                 : constant Name_Id := N + 208; -- GNAT
+   Name_Inspection_Point               : constant Name_Id := N + 209;
+   Name_Interface_Name                 : constant Name_Id := N + 210; -- GNAT
+   Name_Interrupt_Handler              : constant Name_Id := N + 211;
+   Name_Interrupt_Priority             : constant Name_Id := N + 212;
+   Name_Java_Constructor               : constant Name_Id := N + 213; -- GNAT
+   Name_Java_Interface                 : constant Name_Id := N + 214; -- GNAT
+   Name_Keep_Names                     : constant Name_Id := N + 215; -- GNAT
+   Name_Link_With                      : constant Name_Id := N + 216; -- GNAT
+   Name_Linker_Alias                   : constant Name_Id := N + 217; -- GNAT
+   Name_Linker_Constructor             : constant Name_Id := N + 218; -- GNAT
+   Name_Linker_Destructor              : constant Name_Id := N + 219; -- GNAT
+   Name_Linker_Options                 : constant Name_Id := N + 220;
+   Name_Linker_Section                 : constant Name_Id := N + 221; -- GNAT
+   Name_List                           : constant Name_Id := N + 222;
+   Name_Machine_Attribute              : constant Name_Id := N + 223; -- GNAT
+   Name_Main                           : constant Name_Id := N + 224; -- GNAT
+   Name_Main_Storage                   : constant Name_Id := N + 225; -- GNAT
+   Name_Memory_Size                    : constant Name_Id := N + 226; -- Ada 83
+   Name_No_Body                        : constant Name_Id := N + 227; -- GNAT
+   Name_No_Return                      : constant Name_Id := N + 228; -- GNAT
+   Name_Obsolescent                    : constant Name_Id := N + 229; -- GNAT
+   Name_Optimize                       : constant Name_Id := N + 230;
+   Name_Pack                           : constant Name_Id := N + 231;
+   Name_Page                           : constant Name_Id := N + 232;
+   Name_Passive                        : constant Name_Id := N + 233; -- GNAT
+   Name_Preelaborable_Initialization   : constant Name_Id := N + 234; -- Ada 05
+   Name_Preelaborate                   : constant Name_Id := N + 235;
+   Name_Preelaborate_05                : constant Name_Id := N + 236; -- GNAT
 
    --  Note: Priority is not in this list because its name matches the
    --  name of the corresponding attribute. However, it is included in the
@@ -472,15 +475,15 @@ package Snames is
    --  and Check_Pragma_Id correctly recognize and process Priority.
    --  Priority is a standard Ada 95 pragma.
 
-   Name_Psect_Object                   : constant Name_Id := N + 235; -- VMS
-   Name_Pure                           : constant Name_Id := N + 236;
-   Name_Pure_05                        : constant Name_Id := N + 237; -- GNAT
-   Name_Pure_Function                  : constant Name_Id := N + 238; -- GNAT
-   Name_Remote_Call_Interface          : constant Name_Id := N + 239;
-   Name_Remote_Types                   : constant Name_Id := N + 240;
-   Name_Share_Generic                  : constant Name_Id := N + 241; -- GNAT
-   Name_Shared                         : constant Name_Id := N + 242; -- Ada 83
-   Name_Shared_Passive                 : constant Name_Id := N + 243;
+   Name_Psect_Object                   : constant Name_Id := N + 237; -- VMS
+   Name_Pure                           : constant Name_Id := N + 238;
+   Name_Pure_05                        : constant Name_Id := N + 239; -- GNAT
+   Name_Pure_Function                  : constant Name_Id := N + 240; -- GNAT
+   Name_Remote_Call_Interface          : constant Name_Id := N + 241;
+   Name_Remote_Types                   : constant Name_Id := N + 242;
+   Name_Share_Generic                  : constant Name_Id := N + 243; -- GNAT
+   Name_Shared                         : constant Name_Id := N + 244; -- Ada 83
+   Name_Shared_Passive                 : constant Name_Id := N + 245;
 
    --  Note: Storage_Size is not in this list because its name matches the
    --  name of the corresponding attribute. However, it is included in the
@@ -490,28 +493,29 @@ package Snames is
    --  Note: Storage_Unit is also omitted from the list because of a clash
    --  with an attribute name, and is treated similarly.
 
-   Name_Source_Reference               : constant Name_Id := N + 244; -- GNAT
-   Name_Stream_Convert                 : constant Name_Id := N + 245; -- GNAT
-   Name_Subtitle                       : constant Name_Id := N + 246; -- GNAT
-   Name_Suppress_All                   : constant Name_Id := N + 247; -- GNAT
-   Name_Suppress_Debug_Info            : constant Name_Id := N + 248; -- GNAT
-   Name_Suppress_Initialization        : constant Name_Id := N + 249; -- GNAT
-   Name_System_Name                    : constant Name_Id := N + 250; -- Ada 83
-   Name_Task_Info                      : constant Name_Id := N + 251; -- GNAT
-   Name_Task_Name                      : constant Name_Id := N + 252; -- GNAT
-   Name_Task_Storage                   : constant Name_Id := N + 253; -- VMS
-   Name_Thread_Body                    : constant Name_Id := N + 254; -- GNAT
-   Name_Time_Slice                     : constant Name_Id := N + 255; -- GNAT
-   Name_Title                          : constant Name_Id := N + 256; -- GNAT
-   Name_Unchecked_Union                : constant Name_Id := N + 257; -- GNAT
-   Name_Unimplemented_Unit             : constant Name_Id := N + 258; -- GNAT
-   Name_Unreferenced                   : constant Name_Id := N + 259; -- GNAT
-   Name_Unreferenced_Objects           : constant Name_Id := N + 260; -- GNAT
-   Name_Unreserve_All_Interrupts       : constant Name_Id := N + 261; -- GNAT
-   Name_Volatile                       : constant Name_Id := N + 262;
-   Name_Volatile_Components            : constant Name_Id := N + 263;
-   Name_Weak_External                  : constant Name_Id := N + 264; -- GNAT
-   Last_Pragma_Name                    : constant Name_Id := N + 264;
+   Name_Source_Reference               : constant Name_Id := N + 246; -- GNAT
+   Name_Static_Elaboration_Desired     : constant Name_Id := N + 247; -- GNAT
+   Name_Stream_Convert                 : constant Name_Id := N + 248; -- GNAT
+   Name_Subtitle                       : constant Name_Id := N + 249; -- GNAT
+   Name_Suppress_All                   : constant Name_Id := N + 250; -- GNAT
+   Name_Suppress_Debug_Info            : constant Name_Id := N + 251; -- GNAT
+   Name_Suppress_Initialization        : constant Name_Id := N + 252; -- GNAT
+   Name_System_Name                    : constant Name_Id := N + 253; -- Ada 83
+   Name_Task_Info                      : constant Name_Id := N + 254; -- GNAT
+   Name_Task_Name                      : constant Name_Id := N + 255; -- GNAT
+   Name_Task_Storage                   : constant Name_Id := N + 256; -- VMS
+   Name_Time_Slice                     : constant Name_Id := N + 257; -- GNAT
+   Name_Title                          : constant Name_Id := N + 258; -- GNAT
+   Name_Unchecked_Union                : constant Name_Id := N + 259; -- GNAT
+   Name_Unimplemented_Unit             : constant Name_Id := N + 260; -- GNAT
+   Name_Universal_Aliasing             : constant Name_Id := N + 261; -- GNAT
+   Name_Unreferenced                   : constant Name_Id := N + 262; -- GNAT
+   Name_Unreferenced_Objects           : constant Name_Id := N + 263; -- GNAT
+   Name_Unreserve_All_Interrupts       : constant Name_Id := N + 264; -- GNAT
+   Name_Volatile                       : constant Name_Id := N + 265;
+   Name_Volatile_Components            : constant Name_Id := N + 266;
+   Name_Weak_External                  : constant Name_Id := N + 267; -- GNAT
+   Last_Pragma_Name                    : constant Name_Id := N + 267;
 
    --  Language convention names for pragma Convention/Export/Import/Interface
    --  Note that Name_C is not included in this list, since it was already
@@ -522,118 +526,119 @@ package Snames is
    --  Entry and Protected, this is because these conventions cannot be
    --  specified by a pragma.
 
-   First_Convention_Name               : constant Name_Id := N + 265;
-   Name_Ada                            : constant Name_Id := N + 265;
-   Name_Assembler                      : constant Name_Id := N + 266;
-   Name_COBOL                          : constant Name_Id := N + 267;
-   Name_CPP                            : constant Name_Id := N + 268;
-   Name_Fortran                        : constant Name_Id := N + 269;
-   Name_Intrinsic                      : constant Name_Id := N + 270;
-   Name_Java                           : constant Name_Id := N + 271;
-   Name_Stdcall                        : constant Name_Id := N + 272;
-   Name_Stubbed                        : constant Name_Id := N + 273;
-   Last_Convention_Name                : constant Name_Id := N + 273;
+   First_Convention_Name               : constant Name_Id := N + 268;
+   Name_Ada                            : constant Name_Id := N + 268;
+   Name_Assembler                      : constant Name_Id := N + 269;
+   Name_CIL                            : constant Name_Id := N + 270;
+   Name_COBOL                          : constant Name_Id := N + 271;
+   Name_CPP                            : constant Name_Id := N + 272;
+   Name_Fortran                        : constant Name_Id := N + 273;
+   Name_Intrinsic                      : constant Name_Id := N + 274;
+   Name_Java                           : constant Name_Id := N + 275;
+   Name_Stdcall                        : constant Name_Id := N + 276;
+   Name_Stubbed                        : constant Name_Id := N + 277;
+   Last_Convention_Name                : constant Name_Id := N + 277;
 
    --  The following names are preset as synonyms for Assembler
 
-   Name_Asm                            : constant Name_Id := N + 274;
-   Name_Assembly                       : constant Name_Id := N + 275;
+   Name_Asm                            : constant Name_Id := N + 278;
+   Name_Assembly                       : constant Name_Id := N + 279;
 
    --  The following names are preset as synonyms for C
 
-   Name_Default                        : constant Name_Id := N + 276;
+   Name_Default                        : constant Name_Id := N + 280;
    --  Name_Exernal (previously defined as pragma)
 
    --  The following names are preset as synonyms for CPP
 
-   Name_C_Plus_Plus                    : constant Name_Id := N + 277;
+   Name_C_Plus_Plus                    : constant Name_Id := N + 281;
 
    --  The following names are present as synonyms for Stdcall
 
-   Name_DLL                            : constant Name_Id := N + 278;
-   Name_Win32                          : constant Name_Id := N + 279;
+   Name_DLL                            : constant Name_Id := N + 282;
+   Name_Win32                          : constant Name_Id := N + 283;
 
    --  Other special names used in processing pragmas
 
-   Name_As_Is                          : constant Name_Id := N + 280;
-   Name_Attribute_Name                 : constant Name_Id := N + 281;
-   Name_Body_File_Name                 : constant Name_Id := N + 282;
-   Name_Boolean_Entry_Barriers         : constant Name_Id := N + 283;
-   Name_Check                          : constant Name_Id := N + 284;
-   Name_Casing                         : constant Name_Id := N + 285;
-   Name_Code                           : constant Name_Id := N + 286;
-   Name_Component                      : constant Name_Id := N + 287;
-   Name_Component_Size_4               : constant Name_Id := N + 288;
-   Name_Copy                           : constant Name_Id := N + 289;
-   Name_D_Float                        : constant Name_Id := N + 290;
-   Name_Descriptor                     : constant Name_Id := N + 291;
-   Name_Dot_Replacement                : constant Name_Id := N + 292;
-   Name_Dynamic                        : constant Name_Id := N + 293;
-   Name_Entity                         : constant Name_Id := N + 294;
-   Name_Entry_Count                    : constant Name_Id := N + 295;
-   Name_External_Name                  : constant Name_Id := N + 296;
-   Name_First_Optional_Parameter       : constant Name_Id := N + 297;
-   Name_Form                           : constant Name_Id := N + 298;
-   Name_G_Float                        : constant Name_Id := N + 299;
-   Name_Gcc                            : constant Name_Id := N + 300;
-   Name_Gnat                           : constant Name_Id := N + 301;
-   Name_GPL                            : constant Name_Id := N + 302;
-   Name_IEEE_Float                     : constant Name_Id := N + 303;
-   Name_Ignore                         : constant Name_Id := N + 304;
-   Name_Info                           : constant Name_Id := N + 305;
-   Name_Internal                       : constant Name_Id := N + 306;
-   Name_Link_Name                      : constant Name_Id := N + 307;
-   Name_Lowercase                      : constant Name_Id := N + 308;
-   Name_Max_Entry_Queue_Depth          : constant Name_Id := N + 309;
-   Name_Max_Entry_Queue_Length         : constant Name_Id := N + 310;
-   Name_Max_Size                       : constant Name_Id := N + 311;
-   Name_Mechanism                      : constant Name_Id := N + 312;
-   Name_Message                        : constant Name_Id := N + 313;
-   Name_Mixedcase                      : constant Name_Id := N + 314;
-   Name_Modified_GPL                   : constant Name_Id := N + 315;
-   Name_Name                           : constant Name_Id := N + 316;
-   Name_NCA                            : constant Name_Id := N + 317;
-   Name_No                             : constant Name_Id := N + 318;
-   Name_No_Dependence                  : constant Name_Id := N + 319;
-   Name_No_Dynamic_Attachment          : constant Name_Id := N + 320;
-   Name_No_Dynamic_Interrupts          : constant Name_Id := N + 321;
-   Name_No_Requeue                     : constant Name_Id := N + 322;
-   Name_No_Requeue_Statements          : constant Name_Id := N + 323;
-   Name_No_Task_Attributes             : constant Name_Id := N + 324;
-   Name_No_Task_Attributes_Package     : constant Name_Id := N + 325;
-   Name_On                             : constant Name_Id := N + 326;
-   Name_Parameter_Types                : constant Name_Id := N + 327;
-   Name_Reference                      : constant Name_Id := N + 328;
-   Name_Restricted                     : constant Name_Id := N + 329;
-   Name_Result_Mechanism               : constant Name_Id := N + 330;
-   Name_Result_Type                    : constant Name_Id := N + 331;
-   Name_Runtime                        : constant Name_Id := N + 332;
-   Name_SB                             : constant Name_Id := N + 333;
-   Name_Secondary_Stack_Size           : constant Name_Id := N + 334;
-   Name_Section                        : constant Name_Id := N + 335;
-   Name_Semaphore                      : constant Name_Id := N + 336;
-   Name_Simple_Barriers                : constant Name_Id := N + 337;
-   Name_Spec_File_Name                 : constant Name_Id := N + 338;
-   Name_State                          : constant Name_Id := N + 339;
-   Name_Static                         : constant Name_Id := N + 340;
-   Name_Stack_Size                     : constant Name_Id := N + 341;
-   Name_Subunit_File_Name              : constant Name_Id := N + 342;
-   Name_Task_Stack_Size_Default        : constant Name_Id := N + 343;
-   Name_Task_Type                      : constant Name_Id := N + 344;
-   Name_Time_Slicing_Enabled           : constant Name_Id := N + 345;
-   Name_Top_Guard                      : constant Name_Id := N + 346;
-   Name_UBA                            : constant Name_Id := N + 347;
-   Name_UBS                            : constant Name_Id := N + 348;
-   Name_UBSB                           : constant Name_Id := N + 349;
-   Name_Unit_Name                      : constant Name_Id := N + 350;
-   Name_Unknown                        : constant Name_Id := N + 351;
-   Name_Unrestricted                   : constant Name_Id := N + 352;
-   Name_Uppercase                      : constant Name_Id := N + 353;
-   Name_User                           : constant Name_Id := N + 354;
-   Name_VAX_Float                      : constant Name_Id := N + 355;
-   Name_VMS                            : constant Name_Id := N + 356;
-   Name_Vtable_Ptr                     : constant Name_Id := N + 357;
-   Name_Working_Storage                : constant Name_Id := N + 358;
+   Name_As_Is                          : constant Name_Id := N + 284;
+   Name_Attribute_Name                 : constant Name_Id := N + 285;
+   Name_Body_File_Name                 : constant Name_Id := N + 286;
+   Name_Boolean_Entry_Barriers         : constant Name_Id := N + 287;
+   Name_Check                          : constant Name_Id := N + 288;
+   Name_Casing                         : constant Name_Id := N + 289;
+   Name_Code                           : constant Name_Id := N + 290;
+   Name_Component                      : constant Name_Id := N + 291;
+   Name_Component_Size_4               : constant Name_Id := N + 292;
+   Name_Copy                           : constant Name_Id := N + 293;
+   Name_D_Float                        : constant Name_Id := N + 294;
+   Name_Descriptor                     : constant Name_Id := N + 295;
+   Name_Dot_Replacement                : constant Name_Id := N + 296;
+   Name_Dynamic                        : constant Name_Id := N + 297;
+   Name_Entity                         : constant Name_Id := N + 298;
+   Name_Entry_Count                    : constant Name_Id := N + 299;
+   Name_External_Name                  : constant Name_Id := N + 300;
+   Name_First_Optional_Parameter       : constant Name_Id := N + 301;
+   Name_Form                           : constant Name_Id := N + 302;
+   Name_G_Float                        : constant Name_Id := N + 303;
+   Name_Gcc                            : constant Name_Id := N + 304;
+   Name_Gnat                           : constant Name_Id := N + 305;
+   Name_GPL                            : constant Name_Id := N + 306;
+   Name_IEEE_Float                     : constant Name_Id := N + 307;
+   Name_Ignore                         : constant Name_Id := N + 308;
+   Name_Info                           : constant Name_Id := N + 309;
+   Name_Internal                       : constant Name_Id := N + 310;
+   Name_Link_Name                      : constant Name_Id := N + 311;
+   Name_Lowercase                      : constant Name_Id := N + 312;
+   Name_Max_Entry_Queue_Depth          : constant Name_Id := N + 313;
+   Name_Max_Entry_Queue_Length         : constant Name_Id := N + 314;
+   Name_Max_Size                       : constant Name_Id := N + 315;
+   Name_Mechanism                      : constant Name_Id := N + 316;
+   Name_Message                        : constant Name_Id := N + 317;
+   Name_Mixedcase                      : constant Name_Id := N + 318;
+   Name_Modified_GPL                   : constant Name_Id := N + 319;
+   Name_Name                           : constant Name_Id := N + 320;
+   Name_NCA                            : constant Name_Id := N + 321;
+   Name_No                             : constant Name_Id := N + 322;
+   Name_No_Dependence                  : constant Name_Id := N + 323;
+   Name_No_Dynamic_Attachment          : constant Name_Id := N + 324;
+   Name_No_Dynamic_Interrupts          : constant Name_Id := N + 325;
+   Name_No_Requeue                     : constant Name_Id := N + 326;
+   Name_No_Requeue_Statements          : constant Name_Id := N + 327;
+   Name_No_Task_Attributes             : constant Name_Id := N + 328;
+   Name_No_Task_Attributes_Package     : constant Name_Id := N + 329;
+   Name_On                             : constant Name_Id := N + 330;
+   Name_Parameter_Types                : constant Name_Id := N + 331;
+   Name_Reference                      : constant Name_Id := N + 332;
+   Name_Restricted                     : constant Name_Id := N + 333;
+   Name_Result_Mechanism               : constant Name_Id := N + 334;
+   Name_Result_Type                    : constant Name_Id := N + 335;
+   Name_Runtime                        : constant Name_Id := N + 336;
+   Name_SB                             : constant Name_Id := N + 337;
+   Name_Secondary_Stack_Size           : constant Name_Id := N + 338;
+   Name_Section                        : constant Name_Id := N + 339;
+   Name_Semaphore                      : constant Name_Id := N + 340;
+   Name_Simple_Barriers                : constant Name_Id := N + 341;
+   Name_Spec_File_Name                 : constant Name_Id := N + 342;
+   Name_State                          : constant Name_Id := N + 343;
+   Name_Static                         : constant Name_Id := N + 344;
+   Name_Stack_Size                     : constant Name_Id := N + 345;
+   Name_Subunit_File_Name              : constant Name_Id := N + 346;
+   Name_Task_Stack_Size_Default        : constant Name_Id := N + 347;
+   Name_Task_Type                      : constant Name_Id := N + 348;
+   Name_Time_Slicing_Enabled           : constant Name_Id := N + 349;
+   Name_Top_Guard                      : constant Name_Id := N + 350;
+   Name_UBA                            : constant Name_Id := N + 351;
+   Name_UBS                            : constant Name_Id := N + 352;
+   Name_UBSB                           : constant Name_Id := N + 353;
+   Name_Unit_Name                      : constant Name_Id := N + 354;
+   Name_Unknown                        : constant Name_Id := N + 355;
+   Name_Unrestricted                   : constant Name_Id := N + 356;
+   Name_Uppercase                      : constant Name_Id := N + 357;
+   Name_User                           : constant Name_Id := N + 358;
+   Name_VAX_Float                      : constant Name_Id := N + 359;
+   Name_VMS                            : constant Name_Id := N + 360;
+   Name_Vtable_Ptr                     : constant Name_Id := N + 361;
+   Name_Working_Storage                : constant Name_Id := N + 362;
 
    --  Names of recognized attributes. The entries with the comment "Ada 83"
    --  are attributes that are defined in Ada 83, but not in Ada 95. These
@@ -647,168 +652,168 @@ package Snames is
    --  The entries marked VMS are recognized only in OpenVMS implementations
    --  of GNAT, and are treated as illegal in all other contexts.
 
-   First_Attribute_Name                : constant Name_Id := N + 359;
-   Name_Abort_Signal                   : constant Name_Id := N + 359; -- GNAT
-   Name_Access                         : constant Name_Id := N + 360;
-   Name_Address                        : constant Name_Id := N + 361;
-   Name_Address_Size                   : constant Name_Id := N + 362; -- GNAT
-   Name_Aft                            : constant Name_Id := N + 363;
-   Name_Alignment                      : constant Name_Id := N + 364;
-   Name_Asm_Input                      : constant Name_Id := N + 365; -- GNAT
-   Name_Asm_Output                     : constant Name_Id := N + 366; -- GNAT
-   Name_AST_Entry                      : constant Name_Id := N + 367; -- VMS
-   Name_Bit                            : constant Name_Id := N + 368; -- GNAT
-   Name_Bit_Order                      : constant Name_Id := N + 369;
-   Name_Bit_Position                   : constant Name_Id := N + 370; -- GNAT
-   Name_Body_Version                   : constant Name_Id := N + 371;
-   Name_Callable                       : constant Name_Id := N + 372;
-   Name_Caller                         : constant Name_Id := N + 373;
-   Name_Code_Address                   : constant Name_Id := N + 374; -- GNAT
-   Name_Component_Size                 : constant Name_Id := N + 375;
-   Name_Compose                        : constant Name_Id := N + 376;
-   Name_Constrained                    : constant Name_Id := N + 377;
-   Name_Count                          : constant Name_Id := N + 378;
-   Name_Default_Bit_Order              : constant Name_Id := N + 379; -- GNAT
-   Name_Definite                       : constant Name_Id := N + 380;
-   Name_Delta                          : constant Name_Id := N + 381;
-   Name_Denorm                         : constant Name_Id := N + 382;
-   Name_Digits                         : constant Name_Id := N + 383;
-   Name_Elaborated                     : constant Name_Id := N + 384; -- GNAT
-   Name_Emax                           : constant Name_Id := N + 385; -- Ada 83
-   Name_Enum_Rep                       : constant Name_Id := N + 386; -- GNAT
-   Name_Epsilon                        : constant Name_Id := N + 387; -- Ada 83
-   Name_Exponent                       : constant Name_Id := N + 388;
-   Name_External_Tag                   : constant Name_Id := N + 389;
-   Name_First                          : constant Name_Id := N + 390;
-   Name_First_Bit                      : constant Name_Id := N + 391;
-   Name_Fixed_Value                    : constant Name_Id := N + 392; -- GNAT
-   Name_Fore                           : constant Name_Id := N + 393;
-   Name_Has_Access_Values              : constant Name_Id := N + 394; -- GNAT
-   Name_Has_Discriminants              : constant Name_Id := N + 395; -- GNAT
-   Name_Identity                       : constant Name_Id := N + 396;
-   Name_Img                            : constant Name_Id := N + 397; -- GNAT
-   Name_Integer_Value                  : constant Name_Id := N + 398; -- GNAT
-   Name_Large                          : constant Name_Id := N + 399; -- Ada 83
-   Name_Last                           : constant Name_Id := N + 400;
-   Name_Last_Bit                       : constant Name_Id := N + 401;
-   Name_Leading_Part                   : constant Name_Id := N + 402;
-   Name_Length                         : constant Name_Id := N + 403;
-   Name_Machine_Emax                   : constant Name_Id := N + 404;
-   Name_Machine_Emin                   : constant Name_Id := N + 405;
-   Name_Machine_Mantissa               : constant Name_Id := N + 406;
-   Name_Machine_Overflows              : constant Name_Id := N + 407;
-   Name_Machine_Radix                  : constant Name_Id := N + 408;
-   Name_Machine_Rounding               : constant Name_Id := N + 409; -- Ada 05
-   Name_Machine_Rounds                 : constant Name_Id := N + 410;
-   Name_Machine_Size                   : constant Name_Id := N + 411; -- GNAT
-   Name_Mantissa                       : constant Name_Id := N + 412; -- Ada 83
-   Name_Max_Size_In_Storage_Elements   : constant Name_Id := N + 413;
-   Name_Maximum_Alignment              : constant Name_Id := N + 414; -- GNAT
-   Name_Mechanism_Code                 : constant Name_Id := N + 415; -- GNAT
-   Name_Mod                            : constant Name_Id := N + 416;
-   Name_Model_Emin                     : constant Name_Id := N + 417;
-   Name_Model_Epsilon                  : constant Name_Id := N + 418;
-   Name_Model_Mantissa                 : constant Name_Id := N + 419;
-   Name_Model_Small                    : constant Name_Id := N + 420;
-   Name_Modulus                        : constant Name_Id := N + 421;
-   Name_Null_Parameter                 : constant Name_Id := N + 422; -- GNAT
-   Name_Object_Size                    : constant Name_Id := N + 423; -- GNAT
-   Name_Partition_ID                   : constant Name_Id := N + 424;
-   Name_Passed_By_Reference            : constant Name_Id := N + 425; -- GNAT
-   Name_Pool_Address                   : constant Name_Id := N + 426;
-   Name_Pos                            : constant Name_Id := N + 427;
-   Name_Position                       : constant Name_Id := N + 428;
-   Name_Priority                       : constant Name_Id := N + 429; -- Ada 05
-   Name_Range                          : constant Name_Id := N + 430;
-   Name_Range_Length                   : constant Name_Id := N + 431; -- GNAT
-   Name_Round                          : constant Name_Id := N + 432;
-   Name_Safe_Emax                      : constant Name_Id := N + 433; -- Ada 83
-   Name_Safe_First                     : constant Name_Id := N + 434;
-   Name_Safe_Large                     : constant Name_Id := N + 435; -- Ada 83
-   Name_Safe_Last                      : constant Name_Id := N + 436;
-   Name_Safe_Small                     : constant Name_Id := N + 437; -- Ada 83
-   Name_Scale                          : constant Name_Id := N + 438;
-   Name_Scaling                        : constant Name_Id := N + 439;
-   Name_Signed_Zeros                   : constant Name_Id := N + 440;
-   Name_Size                           : constant Name_Id := N + 441;
-   Name_Small                          : constant Name_Id := N + 442;
-   Name_Storage_Size                   : constant Name_Id := N + 443;
-   Name_Storage_Unit                   : constant Name_Id := N + 444; -- GNAT
-   Name_Stream_Size                    : constant Name_Id := N + 445; -- Ada 05
-   Name_Tag                            : constant Name_Id := N + 446;
-   Name_Target_Name                    : constant Name_Id := N + 447; -- GNAT
-   Name_Terminated                     : constant Name_Id := N + 448;
-   Name_To_Address                     : constant Name_Id := N + 449; -- GNAT
-   Name_Type_Class                     : constant Name_Id := N + 450; -- GNAT
-   Name_UET_Address                    : constant Name_Id := N + 451; -- GNAT
-   Name_Unbiased_Rounding              : constant Name_Id := N + 452;
-   Name_Unchecked_Access               : constant Name_Id := N + 453;
-   Name_Unconstrained_Array            : constant Name_Id := N + 454;
-   Name_Universal_Literal_String       : constant Name_Id := N + 455; -- GNAT
-   Name_Unrestricted_Access            : constant Name_Id := N + 456; -- GNAT
-   Name_VADS_Size                      : constant Name_Id := N + 457; -- GNAT
-   Name_Val                            : constant Name_Id := N + 458;
-   Name_Valid                          : constant Name_Id := N + 459;
-   Name_Value_Size                     : constant Name_Id := N + 460; -- GNAT
-   Name_Version                        : constant Name_Id := N + 461;
-   Name_Wchar_T_Size                   : constant Name_Id := N + 462; -- GNAT
-   Name_Wide_Wide_Width                : constant Name_Id := N + 463; -- Ada 05
-   Name_Wide_Width                     : constant Name_Id := N + 464;
-   Name_Width                          : constant Name_Id := N + 465;
-   Name_Word_Size                      : constant Name_Id := N + 466; -- GNAT
+   First_Attribute_Name                : constant Name_Id := N + 363;
+   Name_Abort_Signal                   : constant Name_Id := N + 363; -- GNAT
+   Name_Access                         : constant Name_Id := N + 364;
+   Name_Address                        : constant Name_Id := N + 365;
+   Name_Address_Size                   : constant Name_Id := N + 366; -- GNAT
+   Name_Aft                            : constant Name_Id := N + 367;
+   Name_Alignment                      : constant Name_Id := N + 368;
+   Name_Asm_Input                      : constant Name_Id := N + 369; -- GNAT
+   Name_Asm_Output                     : constant Name_Id := N + 370; -- GNAT
+   Name_AST_Entry                      : constant Name_Id := N + 371; -- VMS
+   Name_Bit                            : constant Name_Id := N + 372; -- GNAT
+   Name_Bit_Order                      : constant Name_Id := N + 373;
+   Name_Bit_Position                   : constant Name_Id := N + 374; -- GNAT
+   Name_Body_Version                   : constant Name_Id := N + 375;
+   Name_Callable                       : constant Name_Id := N + 376;
+   Name_Caller                         : constant Name_Id := N + 377;
+   Name_Code_Address                   : constant Name_Id := N + 378; -- GNAT
+   Name_Component_Size                 : constant Name_Id := N + 379;
+   Name_Compose                        : constant Name_Id := N + 380;
+   Name_Constrained                    : constant Name_Id := N + 381;
+   Name_Count                          : constant Name_Id := N + 382;
+   Name_Default_Bit_Order              : constant Name_Id := N + 383; -- GNAT
+   Name_Definite                       : constant Name_Id := N + 384;
+   Name_Delta                          : constant Name_Id := N + 385;
+   Name_Denorm                         : constant Name_Id := N + 386;
+   Name_Digits                         : constant Name_Id := N + 387;
+   Name_Elaborated                     : constant Name_Id := N + 388; -- GNAT
+   Name_Emax                           : constant Name_Id := N + 389; -- Ada 83
+   Name_Enum_Rep                       : constant Name_Id := N + 390; -- GNAT
+   Name_Epsilon                        : constant Name_Id := N + 391; -- Ada 83
+   Name_Exponent                       : constant Name_Id := N + 392;
+   Name_External_Tag                   : constant Name_Id := N + 393;
+   Name_First                          : constant Name_Id := N + 394;
+   Name_First_Bit                      : constant Name_Id := N + 395;
+   Name_Fixed_Value                    : constant Name_Id := N + 396; -- GNAT
+   Name_Fore                           : constant Name_Id := N + 397;
+   Name_Has_Access_Values              : constant Name_Id := N + 398; -- GNAT
+   Name_Has_Discriminants              : constant Name_Id := N + 399; -- GNAT
+   Name_Identity                       : constant Name_Id := N + 400;
+   Name_Img                            : constant Name_Id := N + 401; -- GNAT
+   Name_Integer_Value                  : constant Name_Id := N + 402; -- GNAT
+   Name_Large                          : constant Name_Id := N + 403; -- Ada 83
+   Name_Last                           : constant Name_Id := N + 404;
+   Name_Last_Bit                       : constant Name_Id := N + 405;
+   Name_Leading_Part                   : constant Name_Id := N + 406;
+   Name_Length                         : constant Name_Id := N + 407;
+   Name_Machine_Emax                   : constant Name_Id := N + 408;
+   Name_Machine_Emin                   : constant Name_Id := N + 409;
+   Name_Machine_Mantissa               : constant Name_Id := N + 410;
+   Name_Machine_Overflows              : constant Name_Id := N + 411;
+   Name_Machine_Radix                  : constant Name_Id := N + 412;
+   Name_Machine_Rounding               : constant Name_Id := N + 413; -- Ada 05
+   Name_Machine_Rounds                 : constant Name_Id := N + 414;
+   Name_Machine_Size                   : constant Name_Id := N + 415; -- GNAT
+   Name_Mantissa                       : constant Name_Id := N + 416; -- Ada 83
+   Name_Max_Size_In_Storage_Elements   : constant Name_Id := N + 417;
+   Name_Maximum_Alignment              : constant Name_Id := N + 418; -- GNAT
+   Name_Mechanism_Code                 : constant Name_Id := N + 419; -- GNAT
+   Name_Mod                            : constant Name_Id := N + 420;
+   Name_Model_Emin                     : constant Name_Id := N + 421;
+   Name_Model_Epsilon                  : constant Name_Id := N + 422;
+   Name_Model_Mantissa                 : constant Name_Id := N + 423;
+   Name_Model_Small                    : constant Name_Id := N + 424;
+   Name_Modulus                        : constant Name_Id := N + 425;
+   Name_Null_Parameter                 : constant Name_Id := N + 426; -- GNAT
+   Name_Object_Size                    : constant Name_Id := N + 427; -- GNAT
+   Name_Partition_ID                   : constant Name_Id := N + 428;
+   Name_Passed_By_Reference            : constant Name_Id := N + 429; -- GNAT
+   Name_Pool_Address                   : constant Name_Id := N + 430;
+   Name_Pos                            : constant Name_Id := N + 431;
+   Name_Position                       : constant Name_Id := N + 432;
+   Name_Priority                       : constant Name_Id := N + 433; -- Ada 05
+   Name_Range                          : constant Name_Id := N + 434;
+   Name_Range_Length                   : constant Name_Id := N + 435; -- GNAT
+   Name_Round                          : constant Name_Id := N + 436;
+   Name_Safe_Emax                      : constant Name_Id := N + 437; -- Ada 83
+   Name_Safe_First                     : constant Name_Id := N + 438;
+   Name_Safe_Large                     : constant Name_Id := N + 439; -- Ada 83
+   Name_Safe_Last                      : constant Name_Id := N + 440;
+   Name_Safe_Small                     : constant Name_Id := N + 441; -- Ada 83
+   Name_Scale                          : constant Name_Id := N + 442;
+   Name_Scaling                        : constant Name_Id := N + 443;
+   Name_Signed_Zeros                   : constant Name_Id := N + 444;
+   Name_Size                           : constant Name_Id := N + 445;
+   Name_Small                          : constant Name_Id := N + 446;
+   Name_Storage_Size                   : constant Name_Id := N + 447;
+   Name_Storage_Unit                   : constant Name_Id := N + 448; -- GNAT
+   Name_Stream_Size                    : constant Name_Id := N + 449; -- Ada 05
+   Name_Tag                            : constant Name_Id := N + 450;
+   Name_Target_Name                    : constant Name_Id := N + 451; -- GNAT
+   Name_Terminated                     : constant Name_Id := N + 452;
+   Name_To_Address                     : constant Name_Id := N + 453; -- GNAT
+   Name_Type_Class                     : constant Name_Id := N + 454; -- GNAT
+   Name_UET_Address                    : constant Name_Id := N + 455; -- GNAT
+   Name_Unbiased_Rounding              : constant Name_Id := N + 456;
+   Name_Unchecked_Access               : constant Name_Id := N + 457;
+   Name_Unconstrained_Array            : constant Name_Id := N + 458;
+   Name_Universal_Literal_String       : constant Name_Id := N + 459; -- GNAT
+   Name_Unrestricted_Access            : constant Name_Id := N + 460; -- GNAT
+   Name_VADS_Size                      : constant Name_Id := N + 461; -- GNAT
+   Name_Val                            : constant Name_Id := N + 462;
+   Name_Valid                          : constant Name_Id := N + 463;
+   Name_Value_Size                     : constant Name_Id := N + 464; -- GNAT
+   Name_Version                        : constant Name_Id := N + 465;
+   Name_Wchar_T_Size                   : constant Name_Id := N + 466; -- GNAT
+   Name_Wide_Wide_Width                : constant Name_Id := N + 467; -- Ada 05
+   Name_Wide_Width                     : constant Name_Id := N + 468;
+   Name_Width                          : constant Name_Id := N + 469;
+   Name_Word_Size                      : constant Name_Id := N + 470; -- GNAT
 
    --  Attributes that designate attributes returning renamable functions,
    --  i.e. functions that return other than a universal value and that
    --  have non-universal arguments.
 
-   First_Renamable_Function_Attribute  : constant Name_Id := N + 467;
-   Name_Adjacent                       : constant Name_Id := N + 467;
-   Name_Ceiling                        : constant Name_Id := N + 468;
-   Name_Copy_Sign                      : constant Name_Id := N + 469;
-   Name_Floor                          : constant Name_Id := N + 470;
-   Name_Fraction                       : constant Name_Id := N + 471;
-   Name_Image                          : constant Name_Id := N + 472;
-   Name_Input                          : constant Name_Id := N + 473;
-   Name_Machine                        : constant Name_Id := N + 474;
-   Name_Max                            : constant Name_Id := N + 475;
-   Name_Min                            : constant Name_Id := N + 476;
-   Name_Model                          : constant Name_Id := N + 477;
-   Name_Pred                           : constant Name_Id := N + 478;
-   Name_Remainder                      : constant Name_Id := N + 479;
-   Name_Rounding                       : constant Name_Id := N + 480;
-   Name_Succ                           : constant Name_Id := N + 481;
-   Name_Truncation                     : constant Name_Id := N + 482;
-   Name_Value                          : constant Name_Id := N + 483;
-   Name_Wide_Image                     : constant Name_Id := N + 484;
-   Name_Wide_Wide_Image                : constant Name_Id := N + 485;
-   Name_Wide_Value                     : constant Name_Id := N + 486;
-   Name_Wide_Wide_Value                : constant Name_Id := N + 487;
-   Last_Renamable_Function_Attribute   : constant Name_Id := N + 487;
+   First_Renamable_Function_Attribute  : constant Name_Id := N + 471;
+   Name_Adjacent                       : constant Name_Id := N + 471;
+   Name_Ceiling                        : constant Name_Id := N + 472;
+   Name_Copy_Sign                      : constant Name_Id := N + 473;
+   Name_Floor                          : constant Name_Id := N + 474;
+   Name_Fraction                       : constant Name_Id := N + 475;
+   Name_Image                          : constant Name_Id := N + 476;
+   Name_Input                          : constant Name_Id := N + 477;
+   Name_Machine                        : constant Name_Id := N + 478;
+   Name_Max                            : constant Name_Id := N + 479;
+   Name_Min                            : constant Name_Id := N + 480;
+   Name_Model                          : constant Name_Id := N + 481;
+   Name_Pred                           : constant Name_Id := N + 482;
+   Name_Remainder                      : constant Name_Id := N + 483;
+   Name_Rounding                       : constant Name_Id := N + 484;
+   Name_Succ                           : constant Name_Id := N + 485;
+   Name_Truncation                     : constant Name_Id := N + 486;
+   Name_Value                          : constant Name_Id := N + 487;
+   Name_Wide_Image                     : constant Name_Id := N + 488;
+   Name_Wide_Wide_Image                : constant Name_Id := N + 489;
+   Name_Wide_Value                     : constant Name_Id := N + 490;
+   Name_Wide_Wide_Value                : constant Name_Id := N + 491;
+   Last_Renamable_Function_Attribute   : constant Name_Id := N + 491;
 
    --  Attributes that designate procedures
 
-   First_Procedure_Attribute           : constant Name_Id := N + 488;
-   Name_Output                         : constant Name_Id := N + 488;
-   Name_Read                           : constant Name_Id := N + 489;
-   Name_Write                          : constant Name_Id := N + 490;
-   Last_Procedure_Attribute            : constant Name_Id := N + 490;
+   First_Procedure_Attribute           : constant Name_Id := N + 492;
+   Name_Output                         : constant Name_Id := N + 492;
+   Name_Read                           : constant Name_Id := N + 493;
+   Name_Write                          : constant Name_Id := N + 494;
+   Last_Procedure_Attribute            : constant Name_Id := N + 494;
 
    --  Remaining attributes are ones that return entities
 
-   First_Entity_Attribute_Name         : constant Name_Id := N + 491;
-   Name_Elab_Body                      : constant Name_Id := N + 491; -- GNAT
-   Name_Elab_Spec                      : constant Name_Id := N + 492; -- GNAT
-   Name_Storage_Pool                   : constant Name_Id := N + 493;
+   First_Entity_Attribute_Name         : constant Name_Id := N + 495;
+   Name_Elab_Body                      : constant Name_Id := N + 495; -- GNAT
+   Name_Elab_Spec                      : constant Name_Id := N + 496; -- GNAT
+   Name_Storage_Pool                   : constant Name_Id := N + 497;
 
    --  These attributes are the ones that return types
 
-   First_Type_Attribute_Name           : constant Name_Id := N + 494;
-   Name_Base                           : constant Name_Id := N + 494;
-   Name_Class                          : constant Name_Id := N + 495;
-   Name_Stub_Type                      : constant Name_Id := N + 496;
-   Last_Type_Attribute_Name            : constant Name_Id := N + 496;
-   Last_Entity_Attribute_Name          : constant Name_Id := N + 496;
-   Last_Attribute_Name                 : constant Name_Id := N + 496;
+   First_Type_Attribute_Name           : constant Name_Id := N + 498;
+   Name_Base                           : constant Name_Id := N + 498;
+   Name_Class                          : constant Name_Id := N + 499;
+   Name_Stub_Type                      : constant Name_Id := N + 500;
+   Last_Type_Attribute_Name            : constant Name_Id := N + 500;
+   Last_Entity_Attribute_Name          : constant Name_Id := N + 500;
+   Last_Attribute_Name                 : constant Name_Id := N + 500;
 
    --  Names of recognized locking policy identifiers
 
@@ -816,10 +821,10 @@ package Snames is
    --  name (e.g. C for Ceiling_Locking). If new policy names are added,
    --  the first character must be distinct.
 
-   First_Locking_Policy_Name           : constant Name_Id := N + 497;
-   Name_Ceiling_Locking                : constant Name_Id := N + 497;
-   Name_Inheritance_Locking            : constant Name_Id := N + 498;
-   Last_Locking_Policy_Name            : constant Name_Id := N + 498;
+   First_Locking_Policy_Name           : constant Name_Id := N + 501;
+   Name_Ceiling_Locking                : constant Name_Id := N + 501;
+   Name_Inheritance_Locking            : constant Name_Id := N + 502;
+   Last_Locking_Policy_Name            : constant Name_Id := N + 502;
 
    --  Names of recognized queuing policy identifiers
 
@@ -827,10 +832,10 @@ package Snames is
    --  name (e.g. F for FIFO_Queuing). If new policy names are added,
    --  the first character must be distinct.
 
-   First_Queuing_Policy_Name           : constant Name_Id := N + 499;
-   Name_FIFO_Queuing                   : constant Name_Id := N + 499;
-   Name_Priority_Queuing               : constant Name_Id := N + 500;
-   Last_Queuing_Policy_Name            : constant Name_Id := N + 500;
+   First_Queuing_Policy_Name           : constant Name_Id := N + 503;
+   Name_FIFO_Queuing                   : constant Name_Id := N + 503;
+   Name_Priority_Queuing               : constant Name_Id := N + 504;
+   Last_Queuing_Policy_Name            : constant Name_Id := N + 504;
 
    --  Names of recognized task dispatching policy identifiers
 
@@ -838,271 +843,276 @@ package Snames is
    --  name (e.g. F for FIFO_Within_Priorities). If new policy names
    --  are added, the first character must be distinct.
 
-   First_Task_Dispatching_Policy_Name  : constant Name_Id := N + 501;
-   Name_EDF_Across_Priorities          : constant Name_Id := N + 501;
-   Name_FIFO_Within_Priorities         : constant Name_Id := N + 502;
-   Name_Non_Preemptive_Within_Priorities : constant Name_Id := N + 503;
-   Name_Round_Robin_Within_Priorities  : constant Name_Id := N + 504;
-   Last_Task_Dispatching_Policy_Name   : constant Name_Id := N + 504;
+   First_Task_Dispatching_Policy_Name  : constant Name_Id := N + 505;
+   Name_EDF_Across_Priorities          : constant Name_Id := N + 505;
+   Name_FIFO_Within_Priorities         : constant Name_Id := N + 506;
+   Name_Non_Preemptive_Within_Priorities : constant Name_Id := N + 507;
+   Name_Round_Robin_Within_Priorities  : constant Name_Id := N + 508;
+   Last_Task_Dispatching_Policy_Name   : constant Name_Id := N + 508;
 
    --  Names of recognized checks for pragma Suppress
 
-   First_Check_Name                    : constant Name_Id := N + 505;
-   Name_Access_Check                   : constant Name_Id := N + 505;
-   Name_Accessibility_Check            : constant Name_Id := N + 506;
-   Name_Alignment_Check                : constant Name_Id := N + 507;
-   Name_Discriminant_Check             : constant Name_Id := N + 508;
-   Name_Division_Check                 : constant Name_Id := N + 509;
-   Name_Elaboration_Check              : constant Name_Id := N + 510;
-   Name_Index_Check                    : constant Name_Id := N + 511;
-   Name_Length_Check                   : constant Name_Id := N + 512;
-   Name_Overflow_Check                 : constant Name_Id := N + 513;
-   Name_Range_Check                    : constant Name_Id := N + 514;
-   Name_Storage_Check                  : constant Name_Id := N + 515;
-   Name_Tag_Check                      : constant Name_Id := N + 516;
-   Name_Validity_Check                 : constant Name_Id := N + 517;
-   Name_All_Checks                     : constant Name_Id := N + 518;
-   Last_Check_Name                     : constant Name_Id := N + 518;
+   First_Check_Name                    : constant Name_Id := N + 509;
+   Name_Access_Check                   : constant Name_Id := N + 509;
+   Name_Accessibility_Check            : constant Name_Id := N + 510;
+   Name_Alignment_Check                : constant Name_Id := N + 511;
+   Name_Discriminant_Check             : constant Name_Id := N + 512;
+   Name_Division_Check                 : constant Name_Id := N + 513;
+   Name_Elaboration_Check              : constant Name_Id := N + 514;
+   Name_Index_Check                    : constant Name_Id := N + 515;
+   Name_Length_Check                   : constant Name_Id := N + 516;
+   Name_Overflow_Check                 : constant Name_Id := N + 517;
+   Name_Range_Check                    : constant Name_Id := N + 518;
+   Name_Storage_Check                  : constant Name_Id := N + 519;
+   Name_Tag_Check                      : constant Name_Id := N + 520;
+   Name_Validity_Check                 : constant Name_Id := N + 521;
+   Name_All_Checks                     : constant Name_Id := N + 522;
+   Last_Check_Name                     : constant Name_Id := N + 522;
 
    --  Names corresponding to reserved keywords, excluding those already
    --  declared in the attribute list (Access, Delta, Digits, Mod, Range).
 
-   Name_Abort                          : constant Name_Id := N + 519;
-   Name_Abs                            : constant Name_Id := N + 520;
-   Name_Accept                         : constant Name_Id := N + 521;
-   Name_And                            : constant Name_Id := N + 522;
-   Name_All                            : constant Name_Id := N + 523;
-   Name_Array                          : constant Name_Id := N + 524;
-   Name_At                             : constant Name_Id := N + 525;
-   Name_Begin                          : constant Name_Id := N + 526;
-   Name_Body                           : constant Name_Id := N + 527;
-   Name_Case                           : constant Name_Id := N + 528;
-   Name_Constant                       : constant Name_Id := N + 529;
-   Name_Declare                        : constant Name_Id := N + 530;
-   Name_Delay                          : constant Name_Id := N + 531;
-   Name_Do                             : constant Name_Id := N + 532;
-   Name_Else                           : constant Name_Id := N + 533;
-   Name_Elsif                          : constant Name_Id := N + 534;
-   Name_End                            : constant Name_Id := N + 535;
-   Name_Entry                          : constant Name_Id := N + 536;
-   Name_Exception                      : constant Name_Id := N + 537;
-   Name_Exit                           : constant Name_Id := N + 538;
-   Name_For                            : constant Name_Id := N + 539;
-   Name_Function                       : constant Name_Id := N + 540;
-   Name_Generic                        : constant Name_Id := N + 541;
-   Name_Goto                           : constant Name_Id := N + 542;
-   Name_If                             : constant Name_Id := N + 543;
-   Name_In                             : constant Name_Id := N + 544;
-   Name_Is                             : constant Name_Id := N + 545;
-   Name_Limited                        : constant Name_Id := N + 546;
-   Name_Loop                           : constant Name_Id := N + 547;
-   Name_New                            : constant Name_Id := N + 548;
-   Name_Not                            : constant Name_Id := N + 549;
-   Name_Null                           : constant Name_Id := N + 550;
-   Name_Of                             : constant Name_Id := N + 551;
-   Name_Or                             : constant Name_Id := N + 552;
-   Name_Others                         : constant Name_Id := N + 553;
-   Name_Out                            : constant Name_Id := N + 554;
-   Name_Package                        : constant Name_Id := N + 555;
-   Name_Pragma                         : constant Name_Id := N + 556;
-   Name_Private                        : constant Name_Id := N + 557;
-   Name_Procedure                      : constant Name_Id := N + 558;
-   Name_Raise                          : constant Name_Id := N + 559;
-   Name_Record                         : constant Name_Id := N + 560;
-   Name_Rem                            : constant Name_Id := N + 561;
-   Name_Renames                        : constant Name_Id := N + 562;
-   Name_Return                         : constant Name_Id := N + 563;
-   Name_Reverse                        : constant Name_Id := N + 564;
-   Name_Select                         : constant Name_Id := N + 565;
-   Name_Separate                       : constant Name_Id := N + 566;
-   Name_Subtype                        : constant Name_Id := N + 567;
-   Name_Task                           : constant Name_Id := N + 568;
-   Name_Terminate                      : constant Name_Id := N + 569;
-   Name_Then                           : constant Name_Id := N + 570;
-   Name_Type                           : constant Name_Id := N + 571;
-   Name_Use                            : constant Name_Id := N + 572;
-   Name_When                           : constant Name_Id := N + 573;
-   Name_While                          : constant Name_Id := N + 574;
-   Name_With                           : constant Name_Id := N + 575;
-   Name_Xor                            : constant Name_Id := N + 576;
+   Name_Abort                          : constant Name_Id := N + 523;
+   Name_Abs                            : constant Name_Id := N + 524;
+   Name_Accept                         : constant Name_Id := N + 525;
+   Name_And                            : constant Name_Id := N + 526;
+   Name_All                            : constant Name_Id := N + 527;
+   Name_Array                          : constant Name_Id := N + 528;
+   Name_At                             : constant Name_Id := N + 529;
+   Name_Begin                          : constant Name_Id := N + 530;
+   Name_Body                           : constant Name_Id := N + 531;
+   Name_Case                           : constant Name_Id := N + 532;
+   Name_Constant                       : constant Name_Id := N + 533;
+   Name_Declare                        : constant Name_Id := N + 534;
+   Name_Delay                          : constant Name_Id := N + 535;
+   Name_Do                             : constant Name_Id := N + 536;
+   Name_Else                           : constant Name_Id := N + 537;
+   Name_Elsif                          : constant Name_Id := N + 538;
+   Name_End                            : constant Name_Id := N + 539;
+   Name_Entry                          : constant Name_Id := N + 540;
+   Name_Exception                      : constant Name_Id := N + 541;
+   Name_Exit                           : constant Name_Id := N + 542;
+   Name_For                            : constant Name_Id := N + 543;
+   Name_Function                       : constant Name_Id := N + 544;
+   Name_Generic                        : constant Name_Id := N + 545;
+   Name_Goto                           : constant Name_Id := N + 546;
+   Name_If                             : constant Name_Id := N + 547;
+   Name_In                             : constant Name_Id := N + 548;
+   Name_Is                             : constant Name_Id := N + 549;
+   Name_Limited                        : constant Name_Id := N + 550;
+   Name_Loop                           : constant Name_Id := N + 551;
+   Name_New                            : constant Name_Id := N + 552;
+   Name_Not                            : constant Name_Id := N + 553;
+   Name_Null                           : constant Name_Id := N + 554;
+   Name_Of                             : constant Name_Id := N + 555;
+   Name_Or                             : constant Name_Id := N + 556;
+   Name_Others                         : constant Name_Id := N + 557;
+   Name_Out                            : constant Name_Id := N + 558;
+   Name_Package                        : constant Name_Id := N + 559;
+   Name_Pragma                         : constant Name_Id := N + 560;
+   Name_Private                        : constant Name_Id := N + 561;
+   Name_Procedure                      : constant Name_Id := N + 562;
+   Name_Raise                          : constant Name_Id := N + 563;
+   Name_Record                         : constant Name_Id := N + 564;
+   Name_Rem                            : constant Name_Id := N + 565;
+   Name_Renames                        : constant Name_Id := N + 566;
+   Name_Return                         : constant Name_Id := N + 567;
+   Name_Reverse                        : constant Name_Id := N + 568;
+   Name_Select                         : constant Name_Id := N + 569;
+   Name_Separate                       : constant Name_Id := N + 570;
+   Name_Subtype                        : constant Name_Id := N + 571;
+   Name_Task                           : constant Name_Id := N + 572;
+   Name_Terminate                      : constant Name_Id := N + 573;
+   Name_Then                           : constant Name_Id := N + 574;
+   Name_Type                           : constant Name_Id := N + 575;
+   Name_Use                            : constant Name_Id := N + 576;
+   Name_When                           : constant Name_Id := N + 577;
+   Name_While                          : constant Name_Id := N + 578;
+   Name_With                           : constant Name_Id := N + 579;
+   Name_Xor                            : constant Name_Id := N + 580;
 
    --  Names of intrinsic subprograms
 
    --  Note: Asm is missing from this list, since Asm is a legitimate
    --  convention name. So is To_Adress, which is a GNAT attribute.
 
-   First_Intrinsic_Name                 : constant Name_Id := N + 577;
-   Name_Divide                          : constant Name_Id := N + 577;
-   Name_Enclosing_Entity                : constant Name_Id := N + 578;
-   Name_Exception_Information           : constant Name_Id := N + 579;
-   Name_Exception_Message               : constant Name_Id := N + 580;
-   Name_Exception_Name                  : constant Name_Id := N + 581;
-   Name_File                            : constant Name_Id := N + 582;
-   Name_Generic_Dispatching_Constructor : constant Name_Id := N + 583;
-   Name_Import_Address                  : constant Name_Id := N + 584;
-   Name_Import_Largest_Value            : constant Name_Id := N + 585;
-   Name_Import_Value                    : constant Name_Id := N + 586;
-   Name_Is_Negative                     : constant Name_Id := N + 587;
-   Name_Line                            : constant Name_Id := N + 588;
-   Name_Rotate_Left                     : constant Name_Id := N + 589;
-   Name_Rotate_Right                    : constant Name_Id := N + 590;
-   Name_Shift_Left                      : constant Name_Id := N + 591;
-   Name_Shift_Right                     : constant Name_Id := N + 592;
-   Name_Shift_Right_Arithmetic          : constant Name_Id := N + 593;
-   Name_Source_Location                 : constant Name_Id := N + 594;
-   Name_Unchecked_Conversion            : constant Name_Id := N + 595;
-   Name_Unchecked_Deallocation          : constant Name_Id := N + 596;
-   Name_To_Pointer                      : constant Name_Id := N + 597;
-   Last_Intrinsic_Name                  : constant Name_Id := N + 597;
+   First_Intrinsic_Name                 : constant Name_Id := N + 581;
+   Name_Divide                          : constant Name_Id := N + 581;
+   Name_Enclosing_Entity                : constant Name_Id := N + 582;
+   Name_Exception_Information           : constant Name_Id := N + 583;
+   Name_Exception_Message               : constant Name_Id := N + 584;
+   Name_Exception_Name                  : constant Name_Id := N + 585;
+   Name_File                            : constant Name_Id := N + 586;
+   Name_Generic_Dispatching_Constructor : constant Name_Id := N + 587;
+   Name_Import_Address                  : constant Name_Id := N + 588;
+   Name_Import_Largest_Value            : constant Name_Id := N + 589;
+   Name_Import_Value                    : constant Name_Id := N + 590;
+   Name_Is_Negative                     : constant Name_Id := N + 591;
+   Name_Line                            : constant Name_Id := N + 592;
+   Name_Rotate_Left                     : constant Name_Id := N + 593;
+   Name_Rotate_Right                    : constant Name_Id := N + 594;
+   Name_Shift_Left                      : constant Name_Id := N + 595;
+   Name_Shift_Right                     : constant Name_Id := N + 596;
+   Name_Shift_Right_Arithmetic          : constant Name_Id := N + 597;
+   Name_Source_Location                 : constant Name_Id := N + 598;
+   Name_Unchecked_Conversion            : constant Name_Id := N + 599;
+   Name_Unchecked_Deallocation          : constant Name_Id := N + 600;
+   Name_To_Pointer                      : constant Name_Id := N + 601;
+   Last_Intrinsic_Name                  : constant Name_Id := N + 601;
 
    --  Names used in processing intrinsic calls
 
-   Name_Free                           : constant Name_Id := N + 598;
+   Name_Free                           : constant Name_Id := N + 602;
 
    --  Reserved words used only in Ada 95
 
-   First_95_Reserved_Word              : constant Name_Id := N + 599;
-   Name_Abstract                       : constant Name_Id := N + 599;
-   Name_Aliased                        : constant Name_Id := N + 600;
-   Name_Protected                      : constant Name_Id := N + 601;
-   Name_Until                          : constant Name_Id := N + 602;
-   Name_Requeue                        : constant Name_Id := N + 603;
-   Name_Tagged                         : constant Name_Id := N + 604;
-   Last_95_Reserved_Word               : constant Name_Id := N + 604;
+   First_95_Reserved_Word              : constant Name_Id := N + 603;
+   Name_Abstract                       : constant Name_Id := N + 603;
+   Name_Aliased                        : constant Name_Id := N + 604;
+   Name_Protected                      : constant Name_Id := N + 605;
+   Name_Until                          : constant Name_Id := N + 606;
+   Name_Requeue                        : constant Name_Id := N + 607;
+   Name_Tagged                         : constant Name_Id := N + 608;
+   Last_95_Reserved_Word               : constant Name_Id := N + 608;
 
    subtype Ada_95_Reserved_Words is
      Name_Id range First_95_Reserved_Word .. Last_95_Reserved_Word;
 
    --  Miscellaneous names used in semantic checking
 
-   Name_Raise_Exception                : constant Name_Id := N + 605;
+   Name_Raise_Exception                : constant Name_Id := N + 609;
 
    --  Additional reserved words and identifiers used in GNAT Project Files
    --  Note that Name_External is already previously declared
 
-   Name_Ada_Roots                      : constant Name_Id := N + 606;
-   Name_Archive_Builder                : constant Name_Id := N + 607;
-   Name_Archive_Indexer                : constant Name_Id := N + 608;
-   Name_Archive_Suffix                 : constant Name_Id := N + 609;
-   Name_Binder                         : constant Name_Id := N + 610;
-   Name_Binder_Driver                  : constant Name_Id := N + 611;
-   Name_Body_Suffix                    : constant Name_Id := N + 612;
-   Name_Builder                        : constant Name_Id := N + 613;
-   Name_Builder_Switches               : constant Name_Id := N + 614;
-   Name_Compiler                       : constant Name_Id := N + 615;
-   Name_Compiler_Driver                : constant Name_Id := N + 616;
-   Name_Compiler_Kind                  : constant Name_Id := N + 617;
-   Name_Compiler_Minimum_Options       : constant Name_Id := N + 618;
-   Name_Compiler_Pic_Option            : constant Name_Id := N + 619;
-   Name_Compute_Dependency             : constant Name_Id := N + 620;
-   Name_Config_Body_File_Name          : constant Name_Id := N + 621;
-   Name_Config_Body_File_Name_Pattern  : constant Name_Id := N + 622;
-   Name_Config_File_Switches           : constant Name_Id := N + 623;
-   Name_Config_File_Unique             : constant Name_Id := N + 624;
-   Name_Config_Spec_File_Name          : constant Name_Id := N + 625;
-   Name_Config_Spec_File_Name_Pattern  : constant Name_Id := N + 626;
-   Name_Cross_Reference                : constant Name_Id := N + 627;
-   Name_Default_Builder_Switches       : constant Name_Id := N + 628;
-   Name_Default_Global_Compiler_Switches : constant Name_Id := N + 629;
-   Name_Default_Language               : constant Name_Id := N + 630;
-   Name_Default_Linker                 : constant Name_Id := N + 631;
-   Name_Default_Switches               : constant Name_Id := N + 632;
-   Name_Dependency_File_Kind           : constant Name_Id := N + 633;
-   Name_Dependency_Option              : constant Name_Id := N + 634;
-   Name_Exec_Dir                       : constant Name_Id := N + 635;
-   Name_Executable                     : constant Name_Id := N + 636;
-   Name_Executable_Suffix              : constant Name_Id := N + 637;
-   Name_Extends                        : constant Name_Id := N + 638;
-   Name_Externally_Built               : constant Name_Id := N + 639;
-   Name_Finder                         : constant Name_Id := N + 640;
-   Name_Global_Compiler_Switches       : constant Name_Id := N + 641;
-   Name_Global_Configuration_Pragmas   : constant Name_Id := N + 642;
-   Name_Global_Config_File             : constant Name_Id := N + 643;
-   Name_Gnatls                         : constant Name_Id := N + 644;
-   Name_Gnatstub                       : constant Name_Id := N + 645;
-   Name_Implementation                 : constant Name_Id := N + 646;
-   Name_Implementation_Exceptions      : constant Name_Id := N + 647;
-   Name_Implementation_Suffix          : constant Name_Id := N + 648;
-   Name_Include_Option                 : constant Name_Id := N + 649;
-   Name_Include_Path                   : constant Name_Id := N + 650;
-   Name_Include_Path_File              : constant Name_Id := N + 651;
-   Name_Language_Kind                  : constant Name_Id := N + 652;
-   Name_Language_Processing            : constant Name_Id := N + 653;
-   Name_Languages                      : constant Name_Id := N + 654;
-   Name_Library_Ali_Dir                : constant Name_Id := N + 655;
-   Name_Library_Auto_Init              : constant Name_Id := N + 656;
-   Name_Library_Auto_Init_Supported    : constant Name_Id := N + 657;
-   Name_Library_Builder                : constant Name_Id := N + 658;
-   Name_Library_Dir                    : constant Name_Id := N + 659;
-   Name_Library_GCC                    : constant Name_Id := N + 660;
-   Name_Library_Interface              : constant Name_Id := N + 661;
-   Name_Library_Kind                   : constant Name_Id := N + 662;
-   Name_Library_Name                   : constant Name_Id := N + 663;
-   Name_Library_Major_Minor_Id_Supported : constant Name_Id := N + 664;
-   Name_Library_Options                : constant Name_Id := N + 665;
-   Name_Library_Reference_Symbol_File  : constant Name_Id := N + 666;
-   Name_Library_Src_Dir                : constant Name_Id := N + 667;
-   Name_Library_Support                : constant Name_Id := N + 668;
-   Name_Library_Symbol_File            : constant Name_Id := N + 669;
-   Name_Library_Symbol_Policy          : constant Name_Id := N + 670;
-   Name_Library_Version                : constant Name_Id := N + 671;
-   Name_Library_Version_Options        : constant Name_Id := N + 672;
-   Name_Linker                         : constant Name_Id := N + 673;
-   Name_Linker_Executable_Option       : constant Name_Id := N + 674;
-   Name_Linker_Lib_Dir_Option          : constant Name_Id := N + 675;
-   Name_Linker_Lib_Name_Option         : constant Name_Id := N + 676;
-   Name_Local_Config_File              : constant Name_Id := N + 677;
-   Name_Local_Configuration_Pragmas    : constant Name_Id := N + 678;
-   Name_Locally_Removed_Files          : constant Name_Id := N + 679;
-   Name_Mapping_File_Switches          : constant Name_Id := N + 680;
-   Name_Mapping_Spec_Suffix            : constant Name_Id := N + 681;
-   Name_Mapping_Body_Suffix            : constant Name_Id := N + 682;
-   Name_Metrics                        : constant Name_Id := N + 683;
-   Name_Minimum_Binder_Options         : constant Name_Id := N + 684;
-   Name_Naming                         : constant Name_Id := N + 685;
-   Name_Objects_Path                   : constant Name_Id := N + 686;
-   Name_Objects_Path_File              : constant Name_Id := N + 687;
-   Name_Object_Dir                     : constant Name_Id := N + 688;
-   Name_Pretty_Printer                 : constant Name_Id := N + 689;
-   Name_Project                        : constant Name_Id := N + 690;
-   Name_Roots                          : constant Name_Id := N + 691;
-   Name_Run_Path_Option                : constant Name_Id := N + 692;
-   Name_Runtime_Project                : constant Name_Id := N + 693;
-   Name_Shared_Library_Minimum_Options : constant Name_Id := N + 694;
-   Name_Shared_Library_Prefix          : constant Name_Id := N + 695;
-   Name_Shared_Library_Suffix          : constant Name_Id := N + 696;
-   Name_Separate_Suffix                : constant Name_Id := N + 697;
-   Name_Source_Dirs                    : constant Name_Id := N + 698;
-   Name_Source_Files                   : constant Name_Id := N + 699;
-   Name_Source_List_File               : constant Name_Id := N + 700;
-   Name_Spec                           : constant Name_Id := N + 701;
-   Name_Spec_Suffix                    : constant Name_Id := N + 702;
-   Name_Specification                  : constant Name_Id := N + 703;
-   Name_Specification_Exceptions       : constant Name_Id := N + 704;
-   Name_Specification_Suffix           : constant Name_Id := N + 705;
-   Name_Stack                          : constant Name_Id := N + 706;
-   Name_Switches                       : constant Name_Id := N + 707;
-   Name_Symbolic_Link_Supported        : constant Name_Id := N + 708;
-   Name_Toolchain_Version              : constant Name_Id := N + 709;
+   Name_Ada_Roots                      : constant Name_Id := N + 610;
+   Name_Archive_Builder                : constant Name_Id := N + 611;
+   Name_Archive_Indexer                : constant Name_Id := N + 612;
+   Name_Archive_Suffix                 : constant Name_Id := N + 613;
+   Name_Binder                         : constant Name_Id := N + 614;
+   Name_Binder_Driver                  : constant Name_Id := N + 615;
+   Name_Binder_Prefix                  : constant Name_Id := N + 616;
+   Name_Body_Suffix                    : constant Name_Id := N + 617;
+   Name_Builder                        : constant Name_Id := N + 618;
+   Name_Builder_Switches               : constant Name_Id := N + 619;
+   Name_Compiler                       : constant Name_Id := N + 620;
+   Name_Compiler_Driver                : constant Name_Id := N + 621;
+   Name_Compiler_Kind                  : constant Name_Id := N + 622;
+   Name_Compiler_Pic_Option            : constant Name_Id := N + 623;
+   Name_Compute_Dependency             : constant Name_Id := N + 624;
+   Name_Config_Body_File_Name          : constant Name_Id := N + 625;
+   Name_Config_Body_File_Name_Pattern  : constant Name_Id := N + 626;
+   Name_Config_File_Switches           : constant Name_Id := N + 627;
+   Name_Config_File_Unique             : constant Name_Id := N + 628;
+   Name_Config_Spec_File_Name          : constant Name_Id := N + 629;
+   Name_Config_Spec_File_Name_Pattern  : constant Name_Id := N + 630;
+   Name_Cross_Reference                : constant Name_Id := N + 631;
+   Name_Default_Builder_Switches       : constant Name_Id := N + 632;
+   Name_Default_Global_Compiler_Switches : constant Name_Id := N + 633;
+   Name_Default_Language               : constant Name_Id := N + 634;
+   Name_Default_Linker                 : constant Name_Id := N + 635;
+   Name_Default_Minimum_Linker_Options : constant Name_Id := N + 636;
+   Name_Default_Switches               : constant Name_Id := N + 637;
+   Name_Dependency_File_Kind           : constant Name_Id := N + 638;
+   Name_Dependency_Option              : constant Name_Id := N + 639;
+   Name_Exec_Dir                       : constant Name_Id := N + 640;
+   Name_Executable                     : constant Name_Id := N + 641;
+   Name_Executable_Suffix              : constant Name_Id := N + 642;
+   Name_Extends                        : constant Name_Id := N + 643;
+   Name_Externally_Built               : constant Name_Id := N + 644;
+   Name_Finder                         : constant Name_Id := N + 645;
+   Name_Global_Compiler_Switches       : constant Name_Id := N + 646;
+   Name_Global_Configuration_Pragmas   : constant Name_Id := N + 647;
+   Name_Global_Config_File             : constant Name_Id := N + 648;
+   Name_Gnatls                         : constant Name_Id := N + 649;
+   Name_Gnatstub                       : constant Name_Id := N + 650;
+   Name_Implementation                 : constant Name_Id := N + 651;
+   Name_Implementation_Exceptions      : constant Name_Id := N + 652;
+   Name_Implementation_Suffix          : constant Name_Id := N + 653;
+   Name_Include_Option                 : constant Name_Id := N + 654;
+   Name_Include_Path                   : constant Name_Id := N + 655;
+   Name_Include_Path_File              : constant Name_Id := N + 656;
+   Name_Language_Kind                  : constant Name_Id := N + 657;
+   Name_Language_Processing            : constant Name_Id := N + 658;
+   Name_Languages                      : constant Name_Id := N + 659;
+   Name_Library_Ali_Dir                : constant Name_Id := N + 660;
+   Name_Library_Auto_Init              : constant Name_Id := N + 661;
+   Name_Library_Auto_Init_Supported    : constant Name_Id := N + 662;
+   Name_Library_Builder                : constant Name_Id := N + 663;
+   Name_Library_Dir                    : constant Name_Id := N + 664;
+   Name_Library_GCC                    : constant Name_Id := N + 665;
+   Name_Library_Interface              : constant Name_Id := N + 666;
+   Name_Library_Kind                   : constant Name_Id := N + 667;
+   Name_Library_Name                   : constant Name_Id := N + 668;
+   Name_Library_Major_Minor_Id_Supported : constant Name_Id := N + 669;
+   Name_Library_Options                : constant Name_Id := N + 670;
+   Name_Library_Partial_Linker         : constant Name_Id := N + 671;
+   Name_Library_Reference_Symbol_File  : constant Name_Id := N + 672;
+   Name_Library_Src_Dir                : constant Name_Id := N + 673;
+   Name_Library_Support                : constant Name_Id := N + 674;
+   Name_Library_Symbol_File            : constant Name_Id := N + 675;
+   Name_Library_Symbol_Policy          : constant Name_Id := N + 676;
+   Name_Library_Version                : constant Name_Id := N + 677;
+   Name_Library_Version_Options        : constant Name_Id := N + 678;
+   Name_Linker                         : constant Name_Id := N + 679;
+   Name_Linker_Executable_Option       : constant Name_Id := N + 680;
+   Name_Linker_Lib_Dir_Option          : constant Name_Id := N + 681;
+   Name_Linker_Lib_Name_Option         : constant Name_Id := N + 682;
+   Name_Local_Config_File              : constant Name_Id := N + 683;
+   Name_Local_Configuration_Pragmas    : constant Name_Id := N + 684;
+   Name_Locally_Removed_Files          : constant Name_Id := N + 685;
+   Name_Mapping_File_Switches          : constant Name_Id := N + 686;
+   Name_Mapping_Spec_Suffix            : constant Name_Id := N + 687;
+   Name_Mapping_Body_Suffix            : constant Name_Id := N + 688;
+   Name_Metrics                        : constant Name_Id := N + 689;
+   Name_Minimum_Binder_Options         : constant Name_Id := N + 690;
+   Name_Minimum_Compiler_Options       : constant Name_Id := N + 691;
+   Name_Minimum_Linker_Options         : constant Name_Id := N + 692;
+   Name_Naming                         : constant Name_Id := N + 693;
+   Name_Objects_Path                   : constant Name_Id := N + 694;
+   Name_Objects_Path_File              : constant Name_Id := N + 695;
+   Name_Object_Dir                     : constant Name_Id := N + 696;
+   Name_Pretty_Printer                 : constant Name_Id := N + 697;
+   Name_Project                        : constant Name_Id := N + 698;
+   Name_Roots                          : constant Name_Id := N + 699;
+   Name_Run_Path_Option                : constant Name_Id := N + 700;
+   Name_Runtime_Project                : constant Name_Id := N + 701;
+   Name_Shared_Library_Minimum_Options : constant Name_Id := N + 702;
+   Name_Shared_Library_Prefix          : constant Name_Id := N + 703;
+   Name_Shared_Library_Suffix          : constant Name_Id := N + 704;
+   Name_Separate_Suffix                : constant Name_Id := N + 705;
+   Name_Source_Dirs                    : constant Name_Id := N + 706;
+   Name_Source_Files                   : constant Name_Id := N + 707;
+   Name_Source_List_File               : constant Name_Id := N + 708;
+   Name_Spec                           : constant Name_Id := N + 709;
+   Name_Spec_Suffix                    : constant Name_Id := N + 710;
+   Name_Specification                  : constant Name_Id := N + 711;
+   Name_Specification_Exceptions       : constant Name_Id := N + 712;
+   Name_Specification_Suffix           : constant Name_Id := N + 713;
+   Name_Stack                          : constant Name_Id := N + 714;
+   Name_Switches                       : constant Name_Id := N + 715;
+   Name_Symbolic_Link_Supported        : constant Name_Id := N + 716;
+   Name_Toolchain_Description          : constant Name_Id := N + 717;
+   Name_Toolchain_Version              : constant Name_Id := N + 718;
 
    --  Other miscellaneous names used in front end
 
-   Name_Unaligned_Valid                : constant Name_Id := N + 710;
+   Name_Unaligned_Valid                : constant Name_Id := N + 719;
 
    --  Ada 2005 reserved words
 
-   First_2005_Reserved_Word            : constant Name_Id := N + 711;
-   Name_Interface                      : constant Name_Id := N + 711;
-   Name_Overriding                     : constant Name_Id := N + 712;
-   Name_Synchronized                   : constant Name_Id := N + 713;
-   Last_2005_Reserved_Word             : constant Name_Id := N + 713;
+   First_2005_Reserved_Word            : constant Name_Id := N + 720;
+   Name_Interface                      : constant Name_Id := N + 720;
+   Name_Overriding                     : constant Name_Id := N + 721;
+   Name_Synchronized                   : constant Name_Id := N + 722;
+   Last_2005_Reserved_Word             : constant Name_Id := N + 722;
 
    subtype Ada_2005_Reserved_Words is
      Name_Id range First_2005_Reserved_Word .. Last_2005_Reserved_Word;
 
    --  Mark last defined name for consistency check in Snames body
 
-   Last_Predefined_Name                : constant Name_Id := N + 713;
+   Last_Predefined_Name                : constant Name_Id := N + 722;
 
    ---------------------------------------
    -- Subtypes Defining Name Categories --
@@ -1287,6 +1297,7 @@ package Snames is
 
       Convention_Assembler,  --  also Asm, Assembly
       Convention_C,          --  also Default, External
+      Convention_CIL,
       Convention_COBOL,
       Convention_CPP,
       Convention_Fortran,
@@ -1336,7 +1347,6 @@ package Snames is
       Pragma_Discard_Names,
       Pragma_Elaboration_Checks,
       Pragma_Eliminate,
-      Pragma_Explicit_Overriding,
       Pragma_Extend_System,
       Pragma_Extensions_Allowed,
       Pragma_External_Name_Casing,
@@ -1384,6 +1394,7 @@ package Snames is
       Pragma_Atomic,
       Pragma_Atomic_Components,
       Pragma_Attach_Handler,
+      Pragma_CIL_Constructor,
       Pragma_Comment,
       Pragma_Common_Object,
       Pragma_Complete_Representation,
@@ -1435,10 +1446,10 @@ package Snames is
       Pragma_Main,
       Pragma_Main_Storage,
       Pragma_Memory_Size,
+      Pragma_No_Body,
       Pragma_No_Return,
       Pragma_Obsolescent,
       Pragma_Optimize,
-      Pragma_Optional_Overriding,
       Pragma_Pack,
       Pragma_Page,
       Pragma_Passive,
@@ -1455,6 +1466,7 @@ package Snames is
       Pragma_Shared,
       Pragma_Shared_Passive,
       Pragma_Source_Reference,
+      Pragma_Static_Elaboration_Desired,
       Pragma_Stream_Convert,
       Pragma_Subtitle,
       Pragma_Suppress_All,
@@ -1464,11 +1476,11 @@ package Snames is
       Pragma_Task_Info,
       Pragma_Task_Name,
       Pragma_Task_Storage,
-      Pragma_Thread_Body,
       Pragma_Time_Slice,
       Pragma_Title,
       Pragma_Unchecked_Union,
       Pragma_Unimplemented_Unit,
+      Pragma_Universal_Aliasing,
       Pragma_Unreferenced,
       Pragma_Unreferenced_Objects,
       Pragma_Unreserve_All_Interrupts,
diff --git a/gcc/ada/snames.h b/gcc/ada/snames.h
index 98f079e..b84d771 100644
--- a/gcc/ada/snames.h
+++ b/gcc/ada/snames.h
@@ -6,7 +6,7 @@
  *                                                                          *
  *                              C Header File                               *
  *                                                                          *
- *          Copyright (C) 1992-2006, Free Software Foundation, Inc.         *
+ *          Copyright (C) 1992-2007, 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- *
@@ -192,12 +192,13 @@ extern unsigned char Get_Attribute_Id (int);
 #define  Convention_Protected                     3
 #define  Convention_Assembler                     4
 #define  Convention_C                             5
-#define  Convention_COBOL                         6
-#define  Convention_CPP                           7
-#define  Convention_Fortran                       8
-#define  Convention_Java                          9
-#define  Convention_Stdcall                       10
-#define  Convention_Stubbed                       11
+#define  Convention_CIL                           6
+#define  Convention_COBOL                         7
+#define  Convention_CPP                           8
+#define  Convention_Fortran                       9
+#define  Convention_Java                          10
+#define  Convention_Stdcall                       11
+#define  Convention_Stubbed                       12
 
 /* Define the function to check if a Name_Id value is a valid pragma */
 
@@ -229,51 +230,51 @@ extern unsigned char Get_Pragma_Id (int);
 #define  Pragma_Discard_Names                 12
 #define  Pragma_Elaboration_Checks            13
 #define  Pragma_Eliminate                     14
-#define  Pragma_Explicit_Overriding           15
-#define  Pragma_Extend_System                 16
-#define  Pragma_Extensions_Allowed            17
-#define  Pragma_External_Name_Casing          18
-#define  Pragma_Float_Representation          19
-#define  Pragma_Initialize_Scalars            20
-#define  Pragma_Interrupt_State               21
-#define  Pragma_License                       22
-#define  Pragma_Locking_Policy                23
-#define  Pragma_Long_Float                    24
-#define  Pragma_No_Run_Time                   25
-#define  Pragma_No_Strict_Aliasing            26
-#define  Pragma_Normalize_Scalars             27
-#define  Pragma_Polling                       28
-#define  Pragma_Persistent_BSS                29
-#define  Pragma_Priority_Specific_Dispatching 30
-#define  Pragma_Profile                       31
-#define  Pragma_Profile_Warnings              32
-#define  Pragma_Propagate_Exceptions          33
-#define  Pragma_Queuing_Policy                34
-#define  Pragma_Ravenscar                     35
-#define  Pragma_Restricted_Run_Time           36
-#define  Pragma_Restrictions                  37
-#define  Pragma_Restriction_Warnings          38
-#define  Pragma_Reviewable                    39
-#define  Pragma_Source_File_Name              40
-#define  Pragma_Source_File_Name_Project      41
-#define  Pragma_Style_Checks                  42
-#define  Pragma_Suppress                      43
-#define  Pragma_Suppress_Exception_Locations  44
-#define  Pragma_Task_Dispatching_Policy       45
-#define  Pragma_Universal_Data                46
-#define  Pragma_Unsuppress                    47
-#define  Pragma_Use_VADS_Size                 48
-#define  Pragma_Validity_Checks               49
-#define  Pragma_Warnings                      50
-#define  Pragma_Wide_Character_Encoding       51
-#define  Pragma_Abort_Defer                   52
-#define  Pragma_All_Calls_Remote              53
-#define  Pragma_Annotate                      54
-#define  Pragma_Assert                        55
-#define  Pragma_Asynchronous                  56
-#define  Pragma_Atomic                        57
-#define  Pragma_Atomic_Components             58
-#define  Pragma_Attach_Handler                59
+#define  Pragma_Extend_System                 15
+#define  Pragma_Extensions_Allowed            16
+#define  Pragma_External_Name_Casing          17
+#define  Pragma_Float_Representation          18
+#define  Pragma_Initialize_Scalars            19
+#define  Pragma_Interrupt_State               20
+#define  Pragma_License                       21
+#define  Pragma_Locking_Policy                22
+#define  Pragma_Long_Float                    23
+#define  Pragma_No_Run_Time                   24
+#define  Pragma_No_Strict_Aliasing            25
+#define  Pragma_Normalize_Scalars             26
+#define  Pragma_Polling                       27
+#define  Pragma_Persistent_BSS                28
+#define  Pragma_Priority_Specific_Dispatching 29
+#define  Pragma_Profile                       30
+#define  Pragma_Profile_Warnings              31
+#define  Pragma_Propagate_Exceptions          32
+#define  Pragma_Queuing_Policy                33
+#define  Pragma_Ravenscar                     34
+#define  Pragma_Restricted_Run_Time           35
+#define  Pragma_Restrictions                  36
+#define  Pragma_Restriction_Warnings          37
+#define  Pragma_Reviewable                    38
+#define  Pragma_Source_File_Name              39
+#define  Pragma_Source_File_Name_Project      40
+#define  Pragma_Style_Checks                  41
+#define  Pragma_Suppress                      42
+#define  Pragma_Suppress_Exception_Locations  43
+#define  Pragma_Task_Dispatching_Policy       44
+#define  Pragma_Universal_Data                45
+#define  Pragma_Unsuppress                    46
+#define  Pragma_Use_VADS_Size                 47
+#define  Pragma_Validity_Checks               48
+#define  Pragma_Warnings                      49
+#define  Pragma_Wide_Character_Encoding       50
+#define  Pragma_Abort_Defer                   51
+#define  Pragma_All_Calls_Remote              52
+#define  Pragma_Annotate                      53
+#define  Pragma_Assert                        54
+#define  Pragma_Asynchronous                  55
+#define  Pragma_Atomic                        56
+#define  Pragma_Atomic_Components             57
+#define  Pragma_Attach_Handler                58
+#define  Pragma_CIL_Constructor               59
 #define  Pragma_Comment                       60
 #define  Pragma_Common_Object                 61
 #define  Pragma_Complete_Representation       62
@@ -325,10 +326,10 @@ extern unsigned char Get_Pragma_Id (int);
 #define  Pragma_Main                          108
 #define  Pragma_Main_Storage                  109
 #define  Pragma_Memory_Size                   110
-#define  Pragma_No_Return                     111
-#define  Pragma_Obsolescent                   112
-#define  Pragma_Optimize                      113
-#define  Pragma_Optional_Overriding           114
+#define  Pragma_No_Body                       111
+#define  Pragma_No_Return                     112
+#define  Pragma_Obsolescent                   113
+#define  Pragma_Optimize                      114
 #define  Pragma_Pack                          115
 #define  Pragma_Page                          116
 #define  Pragma_Passive                       117
@@ -345,30 +346,31 @@ extern unsigned char Get_Pragma_Id (int);
 #define  Pragma_Shared                        128
 #define  Pragma_Shared_Passive                129
 #define  Pragma_Source_Reference              130
-#define  Pragma_Stream_Convert                131
-#define  Pragma_Subtitle                      132
-#define  Pragma_Suppress_All                  133
-#define  Pragma_Suppress_Debug_Info           134
-#define  Pragma_Suppress_Initialization       135
-#define  Pragma_System_Name                   136
-#define  Pragma_Task_Info                     137
-#define  Pragma_Task_Name                     138
-#define  Pragma_Task_Storage                  139
-#define  Pragma_Thread_Body                   140
+#define  Pragma_Static_Elaboration_Desired    131
+#define  Pragma_Stream_Convert                132
+#define  Pragma_Subtitle                      133
+#define  Pragma_Suppress_All                  134
+#define  Pragma_Suppress_Debug_Info           135
+#define  Pragma_Suppress_Initialization       136
+#define  Pragma_System_Name                   137
+#define  Pragma_Task_Info                     138
+#define  Pragma_Task_Name                     139
+#define  Pragma_Task_Storage                  140
 #define  Pragma_Time_Slice                    141
 #define  Pragma_Title                         142
 #define  Pragma_Unchecked_Union               143
 #define  Pragma_Unimplemented_Unit            144
-#define  Pragma_Unreferenced                  145
-#define  Pragma_Unreferenced_Objects          146
-#define  Pragma_Unreserve_All_Interrupts      147
-#define  Pragma_Volatile                      148
-#define  Pragma_Volatile_Components           149
-#define  Pragma_Weak_External                 150
-#define  Pragma_AST_Entry                     151
-#define  Pragma_Interface                     152
-#define  Pragma_Priority                      153
-#define  Pragma_Storage_Size                  154
-#define  Pragma_Storage_Unit                  155
+#define  Pragma_Universal_Aliasing            145
+#define  Pragma_Unreferenced                  146
+#define  Pragma_Unreferenced_Objects          147
+#define  Pragma_Unreserve_All_Interrupts      148
+#define  Pragma_Volatile                      149
+#define  Pragma_Volatile_Components           150
+#define  Pragma_Weak_External                 151
+#define  Pragma_AST_Entry                     152
+#define  Pragma_Interface                     153
+#define  Pragma_Priority                      154
+#define  Pragma_Storage_Size                  155
+#define  Pragma_Storage_Unit                  156
 
 /* End of snames.h (C version of Snames package spec) */