2008-08-01 Hristian Kirtchev <kirtchev@adacore.com>

	* rtsfind.ads: Add block IO versions of stream routines for Strings.

	* bindgen.adb, gnat_rm.texi, gnat_ugn.texi, opt.ads,
	sem_prag.adb, snames.adb, snames.ads, snames.h,
	par-prag.adb: Undo Canonical_Streams related changes.

	* s-rident.ads: Add new restriction No_Stream_Optimizations.

	* s-ststop.ads, s-ststop.adb: Comment reformatting.
	Define enumeration type to designate different IO mechanisms.
	Enchance generic package Stream_Ops_Internal to include an
	implementation of Input and Output.

	* exp_attr.adb (Find_Stream_Subprogram): If restriction
	No_Stream_Optimization is active, choose the default byte IO
	implementations of stream attributes for Strings.
	Otherwise use the corresponding block IO version.

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

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 4101dad..dc260b7 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,7 +1,32 @@
+2008-08-01  Hristian Kirtchev  <kirtchev@adacore.com>
+
+       * rtsfind.ads: Add block IO versions of stream routines for Strings.
+       
+       * bindgen.adb, gnat_rm.texi, gnat_ugn.texi, opt.ads,
+       sem_prag.adb, snames.adb, snames.ads, snames.h,
+       par-prag.adb: Undo previous stream related changes.
+       
+       * s-rident.ads: Add new restriction No_Stream_Optimizations.
+       
+       * s-ststop.ads, s-ststop.adb: Comment reformatting.
+       Define enumeration type to designate different IO mechanisms.
+       Enchance generic package Stream_Ops_Internal to include an
+       implementation of Input and Output.
+
+       * exp_attr.adb (Find_Stream_Subprogram): If restriction
+       No_Stream_Optimization is active, choose the default byte IO
+       implementations of stream attributes for Strings.
+       Otherwise use the corresponding block IO version.
+
 2008-08-01  Olivier Hainque  <hainque@adacore.com>
        
-       * decl.c (gnat_to_gnu_entity) <case E_Function>: Do not turn Ada
-       Pure into GCC const, now implicitely implying nothrow as well.
+       * gcc-interface/decl.c (gnat_to_gnu_entity) <case E_Function>: Do not
+       turn Ada Pure into GCC const, now implicitely implying nothrow as well.
+
+2008-08-01  Robert Dewar  <dewar@adacore.com>
+
+       * par-ch3.adb (P_Defining_Identifier): Avoid repeated attempt to
+       convert plain identifier into defining identifier.
 
 2008-08-01  Robert Dewar  <dewar@adacore.com>
 

diff --git a/gcc/ada/bindgen.adb b/gcc/ada/bindgen.adb
index 204496a..070651c 100644 (file)
--- a/gcc/ada/bindgen.adb
+++ b/gcc/ada/bindgen.adb
@@ -126,7 +126,6 @@ package body Bindgen is
    --     Detect_Blocking               : Integer;
    --     Default_Stack_Size            : Integer;
    --     Leap_Seconds_Support          : Integer;
-   --     Canonical_Streams             : Integer;
 
    --  Main_Priority is the priority value set by pragma Priority in the main
    --  program. If no such pragma is present, the value is -1.
@@ -212,10 +211,6 @@ package body Bindgen is
    --  disabled. A value of zero indicates that leap seconds are turned "off",
    --  while a value of one signifies "on" status.
 
-   --  Canonical_Streams indicates whether stream-related optimizations are
-   --  active. A value of zero indicates that all optimizations are active,
-   --  while a value of one signifies that they have been disabled.
-
    -----------------------
    -- Local Subprograms --
    -----------------------
@@ -596,9 +591,6 @@ package body Bindgen is
          WBI ("      Leap_Seconds_Support : Integer;");
          WBI ("      pragma Import (C, Leap_Seconds_Support, " &
               """__gl_leap_seconds_support"");");
-         WBI ("      Canonical_Streams : Integer;");
-         WBI ("      pragma Import (C, Canonical_Streams, " &
-              """__gl_canonical_streams"");");
 
          --  Import entry point for elaboration time signal handler
          --  installation, and indication of if it's been called previously.
@@ -767,17 +759,6 @@ package body Bindgen is
          Set_String (";");
          Write_Statement_Buffer;
 
-         Set_String ("      Canonical_Streams := ");
-
-         if Canonical_Streams then
-            Set_Int (1);
-         else
-            Set_Int (0);
-         end if;
-
-         Set_String (";");
-         Write_Statement_Buffer;
-
          --  Generate call to Install_Handler
 
          WBI ("");
@@ -1059,18 +1040,6 @@ package body Bindgen is
          Set_String (";");
          Write_Statement_Buffer;
 
-         WBI ("   extern int __gl_canonical_streams;");
-         Set_String ("   __gl_canonical_streams = ");
-
-         if Canonical_Streams then
-            Set_Int (1);
-         else
-            Set_Int (0);
-         end if;
-
-         Set_String (";");
-         Write_Statement_Buffer;
-
          WBI ("");
 
          --  Install elaboration time signal handler

diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb
index 84bc808..8e0a83b 100644 (file)
--- a/gcc/ada/exp_attr.adb
+++ b/gcc/ada/exp_attr.adb
@@ -5365,53 +5365,100 @@ package body Exp_Attr is
         and then
           not Is_Predefined_File_Name (Unit_File_Name (Current_Sem_Unit))
       then
-
          --  String as defined in package Ada
 
          if Base_Typ = Standard_String then
-            if Nam = TSS_Stream_Input then
-               return RTE (RE_String_Input);
+            if Restriction_Active (No_Stream_Optimizations) then
+               if Nam = TSS_Stream_Input then
+                  return RTE (RE_String_Input);
+
+               elsif Nam = TSS_Stream_Output then
+                  return RTE (RE_String_Output);
+
+               elsif Nam = TSS_Stream_Read then
+                  return RTE (RE_String_Read);
 
-            elsif Nam = TSS_Stream_Output then
-               return RTE (RE_String_Output);
+               else pragma Assert (Nam = TSS_Stream_Write);
+                  return RTE (RE_String_Write);
+               end if;
+
+            else
+               if Nam = TSS_Stream_Input then
+                  return RTE (RE_String_Input_Blk_IO);
 
-            elsif Nam = TSS_Stream_Read then
-               return RTE (RE_String_Read);
+               elsif Nam = TSS_Stream_Output then
+                  return RTE (RE_String_Output_Blk_IO);
 
-            else pragma Assert (Nam = TSS_Stream_Write);
-               return RTE (RE_String_Write);
+               elsif Nam = TSS_Stream_Read then
+                  return RTE (RE_String_Read_Blk_IO);
+
+               else pragma Assert (Nam = TSS_Stream_Write);
+                  return RTE (RE_String_Write_Blk_IO);
+               end if;
             end if;
 
          --  Wide_String as defined in package Ada
 
          elsif Base_Typ = Standard_Wide_String then
-            if Nam = TSS_Stream_Input then
-               return RTE (RE_Wide_String_Input);
+            if Restriction_Active (No_Stream_Optimizations) then
+               if Nam = TSS_Stream_Input then
+                  return RTE (RE_Wide_String_Input);
+
+               elsif Nam = TSS_Stream_Output then
+                  return RTE (RE_Wide_String_Output);
+
+               elsif Nam = TSS_Stream_Read then
+                  return RTE (RE_Wide_String_Read);
+
+               else pragma Assert (Nam = TSS_Stream_Write);
+                  return RTE (RE_Wide_String_Write);
+               end if;
+
+            else
+               if Nam = TSS_Stream_Input then
+                  return RTE (RE_Wide_String_Input_Blk_IO);
 
-            elsif Nam = TSS_Stream_Output then
-               return RTE (RE_Wide_String_Output);
+               elsif Nam = TSS_Stream_Output then
+                  return RTE (RE_Wide_String_Output_Blk_IO);
 
-            elsif Nam = TSS_Stream_Read then
-               return RTE (RE_Wide_String_Read);
+               elsif Nam = TSS_Stream_Read then
+                  return RTE (RE_Wide_String_Read_Blk_IO);
 
-            else pragma Assert (Nam = TSS_Stream_Write);
-               return RTE (RE_Wide_String_Write);
+               else pragma Assert (Nam = TSS_Stream_Write);
+                  return RTE (RE_Wide_String_Write_Blk_IO);
+               end if;
             end if;
 
          --  Wide_Wide_String as defined in package Ada
 
          elsif Base_Typ = Standard_Wide_Wide_String then
-            if Nam = TSS_Stream_Input then
-               return RTE (RE_Wide_Wide_String_Input);
+            if Restriction_Active (No_Stream_Optimizations) then
+               if Nam = TSS_Stream_Input then
+                  return RTE (RE_Wide_Wide_String_Input);
+
+               elsif Nam = TSS_Stream_Output then
+                  return RTE (RE_Wide_Wide_String_Output);
 
-            elsif Nam = TSS_Stream_Output then
-               return RTE (RE_Wide_Wide_String_Output);
+               elsif Nam = TSS_Stream_Read then
+                  return RTE (RE_Wide_Wide_String_Read);
 
-            elsif Nam = TSS_Stream_Read then
-               return RTE (RE_Wide_Wide_String_Read);
+               else pragma Assert (Nam = TSS_Stream_Write);
+                  return RTE (RE_Wide_Wide_String_Write);
+               end if;
 
-            else pragma Assert (Nam = TSS_Stream_Write);
-               return RTE (RE_Wide_Wide_String_Write);
+            else
+               if Nam = TSS_Stream_Input then
+                  return RTE (RE_Wide_Wide_String_Input_Blk_IO);
+
+               elsif Nam = TSS_Stream_Output then
+                  return RTE (RE_Wide_Wide_String_Output_Blk_IO);
+
+               elsif Nam = TSS_Stream_Read then
+                  return RTE (RE_Wide_Wide_String_Read_Blk_IO);
+
+               else pragma Assert (Nam = TSS_Stream_Write);
+                  return RTE (RE_Wide_Wide_String_Write_Blk_IO);
+               end if;
             end if;
          end if;
       end if;

diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi
index 50af374..29c1aec 100644 (file)
--- a/gcc/ada/gnat_rm.texi
+++ b/gcc/ada/gnat_rm.texi
@@ -104,7 +104,6 @@ Implementation Defined Pragmas
 * Pragma Assert::
 * Pragma Ast_Entry::
 * Pragma C_Pass_By_Copy::
-* Pragma Canonical_Streams::
 * Pragma Check::
 * Pragma Check_Name::
 * Pragma Check_Policy::
@@ -706,7 +705,6 @@ consideration, the use of these pragmas should be minimized.
 * Pragma Assert::
 * Pragma Ast_Entry::
 * Pragma C_Pass_By_Copy::
-* Pragma Canonical_Streams::
 * Pragma Check::
 * Pragma Check_Name::
 * Pragma Check_Policy::
@@ -1059,27 +1057,6 @@ You can also pass records by copy by specifying the convention
 @code{Import} and @code{Export} pragmas, which allow specification of
 passing mechanisms on a parameter by parameter basis.
 
-@node Pragma Canonical_Streams
-@unnumberedsec Canonical Streams
-@cindex Canonical streams
-@findex Canonical_Streams
-@noindent
-Syntax:
-@smallexample @c ada
-pragma Canonical_Streams;
-@end smallexample
-
-@noindent
-This configuration pragma affects the behavior of stream attributes of any 
-@code{String}, @code{Wide_String} or @code{Wide_Wide_String} based type. When 
-this pragma is present, @code{'Input}, @code{'Output}, @code{'Read} and 
-@code{'Write} exibit Ada 95 canonical behavior, in other words, streaming of 
-values is done character by character.
-
-@noindent
-The use of this pragma is intended to bypass any implementation-related 
-optimizations allowed by Ada 2005 RM 13.13.2 (56/2) Implementation Permission.
-
 @node Pragma Check
 @unnumberedsec Pragma Check
 @cindex Assertions

diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi
index be312ad..99df83f 100644 (file)
--- a/gcc/ada/gnat_ugn.texi
+++ b/gcc/ada/gnat_ugn.texi
@@ -10925,7 +10925,6 @@ recognized by GNAT:
    Ada_2005
    Assertion_Policy
    C_Pass_By_Copy
-   Canonical_Streams
    Check_Name
    Check_Policy
    Compile_Time_Error

diff --git a/gcc/ada/opt.ads b/gcc/ada/opt.ads
index 476e987..600231c 100644 (file)
--- a/gcc/ada/opt.ads
+++ b/gcc/ada/opt.ads
@@ -283,11 +283,6 @@ package Opt is
    --  is set True, or if pragma No_Run_Time is used. See the spec of Rtsfind
    --  for details on the handling of the latter pragma.
 
-   Canonical_Streams : Boolean := False;
-   --  GNAT, GNATBIND
-   --  Set to True if configuration pragma Canonical_Streams is present. It
-   --  controls the canonical behaviour of stream operations for String types.
-
    Constant_Condition_Warnings : Boolean := False;
    --  GNAT
    --  Set to True to activate warnings on constant conditions

diff --git a/gcc/ada/par-prag.adb b/gcc/ada/par-prag.adb
index 8b7846f..ba32f38 100644 (file)
--- a/gcc/ada/par-prag.adb
+++ b/gcc/ada/par-prag.adb
@@ -1058,7 +1058,6 @@ begin
            Pragma_Atomic                        |
            Pragma_Atomic_Components             |
            Pragma_Attach_Handler                |
-           Pragma_Canonical_Streams             |
            Pragma_Check                         |
            Pragma_Check_Name                    |
            Pragma_Check_Policy                  |

diff --git a/gcc/ada/rtsfind.ads b/gcc/ada/rtsfind.ads
index b3bbf6a..1808cd8 100644 (file)
--- a/gcc/ada/rtsfind.ads
+++ b/gcc/ada/rtsfind.ads
@@ -1331,17 +1331,29 @@ package Rtsfind is
      RE_Str_Concat_5,                    -- System.String_Ops_Concat_5
 
      RE_String_Input,                    -- System.Strings.Stream_Ops
+     RE_String_Input_Blk_IO,             -- System.Strings.Stream_Ops
      RE_String_Output,                   -- System.Strings.Stream_Ops
+     RE_String_Output_Blk_IO,            -- System.Strings.Stream_Ops
      RE_String_Read,                     -- System.Strings.Stream_Ops
+     RE_String_Read_Blk_IO,              -- System.Strings.Stream_Ops
      RE_String_Write,                    -- System.Strings.Stream_Ops
+     RE_String_Write_Blk_IO,             -- System.Strings.Stream_Ops
      RE_Wide_String_Input,               -- System.Strings.Stream_Ops
+     RE_Wide_String_Input_Blk_IO,        -- System.Strings.Stream_Ops
      RE_Wide_String_Output,              -- System.Strings.Stream_Ops
+     RE_Wide_String_Output_Blk_IO,       -- System.Strings.Stream_Ops
      RE_Wide_String_Read,                -- System.Strings.Stream_Ops
+     RE_Wide_String_Read_Blk_IO,         -- System.Strings.Stream_Ops
      RE_Wide_String_Write,               -- System.Strings.Stream_Ops
+     RE_Wide_String_Write_Blk_IO,        -- System.Strings.Stream_Ops
      RE_Wide_Wide_String_Input,          -- System.Strings.Stream_Ops
+     RE_Wide_Wide_String_Input_Blk_IO,   -- System.Strings.Stream_Ops
      RE_Wide_Wide_String_Output,         -- System.Strings.Stream_Ops
+     RE_Wide_Wide_String_Output_Blk_IO,  -- System.Strings.Stream_Ops
      RE_Wide_Wide_String_Read,           -- System.Strings.Stream_Ops
+     RE_Wide_Wide_String_Read_Blk_IO,    -- System.Strings.Stream_Ops
      RE_Wide_Wide_String_Write,          -- System.Strings.Stream_Ops
+     RE_Wide_Wide_String_Write_Blk_IO,   -- System.Strings.Stream_Ops
 
      RE_Task_Info_Type,                  -- System.Task_Info
      RE_Unspecified_Task_Info,           -- System.Task_Info
@@ -2473,17 +2485,29 @@ package Rtsfind is
      RE_Str_Concat_5                     => System_String_Ops_Concat_5,
 
      RE_String_Input                     => System_Strings_Stream_Ops,
+     RE_String_Input_Blk_IO              => System_Strings_Stream_Ops,
      RE_String_Output                    => System_Strings_Stream_Ops,
+     RE_String_Output_Blk_IO             => System_Strings_Stream_Ops,
      RE_String_Read                      => System_Strings_Stream_Ops,
+     RE_String_Read_Blk_IO               => System_Strings_Stream_Ops,
      RE_String_Write                     => System_Strings_Stream_Ops,
+     RE_String_Write_Blk_IO              => System_Strings_Stream_Ops,
      RE_Wide_String_Input                => System_Strings_Stream_Ops,
+     RE_Wide_String_Input_Blk_IO         => System_Strings_Stream_Ops,
      RE_Wide_String_Output               => System_Strings_Stream_Ops,
+     RE_Wide_String_Output_Blk_IO        => System_Strings_Stream_Ops,
      RE_Wide_String_Read                 => System_Strings_Stream_Ops,
+     RE_Wide_String_Read_Blk_IO          => System_Strings_Stream_Ops,
      RE_Wide_String_Write                => System_Strings_Stream_Ops,
+     RE_Wide_String_Write_Blk_IO         => System_Strings_Stream_Ops,
      RE_Wide_Wide_String_Input           => System_Strings_Stream_Ops,
+     RE_Wide_Wide_String_Input_Blk_IO    => System_Strings_Stream_Ops,
      RE_Wide_Wide_String_Output          => System_Strings_Stream_Ops,
+     RE_Wide_Wide_String_Output_Blk_IO   => System_Strings_Stream_Ops,
      RE_Wide_Wide_String_Read            => System_Strings_Stream_Ops,
+     RE_Wide_Wide_String_Read_Blk_IO     => System_Strings_Stream_Ops,
      RE_Wide_Wide_String_Write           => System_Strings_Stream_Ops,
+     RE_Wide_Wide_String_Write_Blk_IO    => System_Strings_Stream_Ops,
 
      RE_Task_Info_Type                   => System_Task_Info,
      RE_Unspecified_Task_Info            => System_Task_Info,

diff --git a/gcc/ada/s-rident.ads b/gcc/ada/s-rident.ads
index bbe4223..b31d212 100644 (file)
--- a/gcc/ada/s-rident.ads
+++ b/gcc/ada/s-rident.ads
@@ -102,6 +102,7 @@ package System.Rident is
       No_Select_Statements,                    -- GNAT (Ravenscar)
       No_Specific_Termination_Handlers,        -- (RM D.7(10.7/2))
       No_Standard_Storage_Pools,               -- GNAT
+      No_Stream_Optimizations,                 -- GNAT
       No_Streams,                              -- GNAT
       No_Task_Allocators,                      -- (RM D.7(7))
       No_Task_Attributes_Package,              -- GNAT

diff --git a/gcc/ada/s-ststop.adb b/gcc/ada/s-ststop.adb
index 12dcdce..ca5c880 100644 (file)
--- a/gcc/ada/s-ststop.adb
+++ b/gcc/ada/s-ststop.adb
@@ -43,6 +43,11 @@ with System.Stream_Attributes; use System;
 
 package body System.Strings.Stream_Ops is
 
+   --  The following type describes the low-level IO mechanism used in package
+   --  Stream_Ops_Internal.
+
+   type IO_Kind is (Byte_IO, Block_IO);
+
    --  The following package provides an IO framework for strings. Depending
    --  on the version of System.Stream_Attributes as well as the size of
    --  formal parameter Character_Type, the package will either utilize block
@@ -53,13 +58,24 @@ package body System.Strings.Stream_Ops is
       type String_Type is array (Positive range <>) of Character_Type;
 
    package Stream_Ops_Internal is
+      function Input
+        (Strm : access Root_Stream_Type'Class;
+         IO   : IO_Kind) return String_Type;
+
+      procedure Output
+        (Strm : access Root_Stream_Type'Class;
+         Item : String_Type;
+         IO   : IO_Kind);
+
       procedure Read
         (Strm : access Root_Stream_Type'Class;
-         Item : out String_Type);
+         Item : out String_Type;
+         IO   : IO_Kind);
 
       procedure Write
         (Strm : access Root_Stream_Type'Class;
-         Item : String_Type);
+         Item : String_Type;
+         IO   : IO_Kind);
    end Stream_Ops_Internal;
 
    -------------------------
@@ -92,28 +108,6 @@ package body System.Strings.Stream_Ops is
 
       subtype String_Block is String_Type (1 .. C_In_Default_Block);
 
-      Flag : Integer;
-      pragma Import (C, Flag, "__gl_canonical_streams");
-      --  This imported value is used to determine whether configuration pragma
-      --  Canonical_Streams is present. A value of zero indicates whether any
-      --  stream-related optimizations are enabled, while a value of one
-      --  indicates a disabled status.
-      --  What is all this rubbish about C flags for a global config pragma???
-
-      Canonical_Streams : constant Boolean := Flag = 1;
-      --  This seems dubious, surely it should be (Flag /= 0) for normal
-      --  C semantics. Why not just import as a pragma Convention C Boolean
-      --  anyway, avoiding the need for junk flag ???
-
-      --  Block IO is used when the low level can support block IO, the size
-      --  of the character type is a multiple of the stream element type and
-      --  the compilation can use stream optimizations.
-
-      Use_Block_IO : constant Boolean :=
-                       Stream_Attributes.Block_IO_OK
-                         and then C_Size mod SE_Size = 0
-                         and then not Canonical_Streams;
-
       --  Conversions to and from Default_Block
 
       function To_Default_Block is
@@ -122,13 +116,74 @@ package body System.Strings.Stream_Ops is
       function To_String_Block is
         new Ada.Unchecked_Conversion (Default_Block, String_Block);
 
+      -----------
+      -- Input --
+      -----------
+
+      function Input
+        (Strm : access Root_Stream_Type'Class;
+         IO   : IO_Kind) return String_Type
+      is
+      begin
+         if Strm = null then
+            raise Constraint_Error;
+         end if;
+
+         declare
+            Low  : Positive;
+            High : Positive;
+
+         begin
+            --  Read the bounds of the string
+
+            Positive'Read (Strm, Low);
+            Positive'Read (Strm, High);
+
+            declare
+               Item : String_Type (Low .. High);
+
+            begin
+               --  Read the character content of the string
+
+               Read (Strm, Item, IO);
+
+               return Item;
+            end;
+         end;
+      end Input;
+
+      ------------
+      -- Output --
+      ------------
+
+      procedure Output
+        (Strm : access Root_Stream_Type'Class;
+         Item : String_Type;
+         IO   : IO_Kind)
+      is
+      begin
+         if Strm = null then
+            raise Constraint_Error;
+         end if;
+
+         --  Write the bounds of the string
+
+         Positive'Write (Strm, Item'First);
+         Positive'Write (Strm, Item'Last);
+
+         --  Write the character content of the string
+
+         Write (Strm, Item, IO);
+      end Output;
+
       ----------
       -- Read --
       ----------
 
       procedure Read
         (Strm : access Root_Stream_Type'Class;
-         Item : out String_Type)
+         Item : out String_Type;
+         IO   : IO_Kind)
       is
       begin
          if Strm = null then
@@ -141,7 +196,11 @@ package body System.Strings.Stream_Ops is
             return;
          end if;
 
-         if Use_Block_IO then
+         --  Block IO
+
+         if IO = Block_IO
+           and then Stream_Attributes.Block_IO_OK
+         then
             declare
                --  Determine the size in BITS of the block necessary to contain
                --  the whole string.
@@ -225,7 +284,7 @@ package body System.Strings.Stream_Ops is
                end if;
             end;
 
-         --  Character-by-character IO
+         --  Byte IO
 
          else
             declare
@@ -246,7 +305,8 @@ package body System.Strings.Stream_Ops is
 
       procedure Write
         (Strm : access Root_Stream_Type'Class;
-         Item : String_Type)
+         Item : String_Type;
+         IO   : IO_Kind)
       is
       begin
          if Strm = null then
@@ -259,7 +319,11 @@ package body System.Strings.Stream_Ops is
             return;
          end if;
 
-         if Use_Block_IO then
+         --  Block IO
+
+         if IO = Block_IO
+           and then Stream_Attributes.Block_IO_OK
+         then
             declare
                --  Determine the size in BITS of the block necessary to contain
                --  the whole string.
@@ -313,7 +377,7 @@ package body System.Strings.Stream_Ops is
                end if;
             end;
 
-         --  Character-by-character IO
+         --  Byte IO
 
          else
             for Index in Item'First .. Item'Last loop
@@ -323,7 +387,7 @@ package body System.Strings.Stream_Ops is
       end Write;
    end Stream_Ops_Internal;
 
-   --  Specific instantiations for different string types
+   --  Specific instantiations for all Ada string types
 
    package String_Ops is
      new Stream_Ops_Internal
@@ -348,32 +412,19 @@ package body System.Strings.Stream_Ops is
      (Strm : access Ada.Streams.Root_Stream_Type'Class) return String
    is
    begin
-      if Strm = null then
-         raise Constraint_Error;
-      end if;
-
-      declare
-         Low  : Positive;
-         High : Positive;
-
-      begin
-         --  Read the bounds of the string
-
-         Positive'Read (Strm, Low);
-         Positive'Read (Strm, High);
-
-         declare
-            Item : String (Low .. High);
-
-         begin
-            --  Read the character content of the string
+      return String_Ops.Input (Strm, Byte_IO);
+   end String_Input;
 
-            String_Read (Strm, Item);
+   -------------------------
+   -- String_Input_Blk_IO --
+   -------------------------
 
-            return Item;
-         end;
-      end;
-   end String_Input;
+   function String_Input_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class) return String
+   is
+   begin
+      return String_Ops.Input (Strm, Block_IO);
+   end String_Input_Blk_IO;
 
    -------------------
    -- String_Output --
@@ -384,19 +435,20 @@ package body System.Strings.Stream_Ops is
       Item : String)
    is
    begin
-      if Strm = null then
-         raise Constraint_Error;
-      end if;
-
-      --  Write the bounds of the string
-
-      Positive'Write (Strm, Item'First);
-      Positive'Write (Strm, Item'Last);
+      String_Ops.Output (Strm, Item, Byte_IO);
+   end String_Output;
 
-      --  Write the character content of the string
+   --------------------------
+   -- String_Output_Blk_IO --
+   --------------------------
 
-      String_Write (Strm, Item);
-   end String_Output;
+   procedure String_Output_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : String)
+   is
+   begin
+      String_Ops.Output (Strm, Item, Block_IO);
+   end String_Output_Blk_IO;
 
    -----------------
    -- String_Read --
@@ -407,9 +459,21 @@ package body System.Strings.Stream_Ops is
       Item : out String)
    is
    begin
-      String_Ops.Read (Strm, Item);
+      String_Ops.Read (Strm, Item, Byte_IO);
    end String_Read;
 
+   ------------------------
+   -- String_Read_Blk_IO --
+   ------------------------
+
+   procedure String_Read_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : out String)
+   is
+   begin
+      String_Ops.Read (Strm, Item, Block_IO);
+   end String_Read_Blk_IO;
+
    ------------------
    -- String_Write --
    ------------------
@@ -419,44 +483,42 @@ package body System.Strings.Stream_Ops is
       Item : String)
    is
    begin
-      String_Ops.Write (Strm, Item);
+      String_Ops.Write (Strm, Item, Byte_IO);
    end String_Write;
 
+   -------------------------
+   -- String_Write_Blk_IO --
+   -------------------------
+
+   procedure String_Write_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : String)
+   is
+   begin
+      String_Ops.Write (Strm, Item, Block_IO);
+   end String_Write_Blk_IO;
+
    -----------------------
    -- Wide_String_Input --
    -----------------------
 
    function Wide_String_Input
-     (Strm : access Ada.Streams.Root_Stream_Type'Class)
-      return Wide_String
+     (Strm : access Ada.Streams.Root_Stream_Type'Class) return Wide_String
    is
    begin
-      if Strm = null then
-         raise Constraint_Error;
-      end if;
-
-      declare
-         Low  : Positive;
-         High : Positive;
-
-      begin
-         --  Read the bounds of the string
-
-         Positive'Read (Strm, Low);
-         Positive'Read (Strm, High);
-
-         declare
-            Item : Wide_String (Low .. High);
-
-         begin
-            --  Read the character content of the string
+      return Wide_String_Ops.Input (Strm, Byte_IO);
+   end Wide_String_Input;
 
-            Wide_String_Read (Strm, Item);
+   ------------------------------
+   -- Wide_String_Input_Blk_IO --
+   ------------------------------
 
-            return Item;
-         end;
-      end;
-   end Wide_String_Input;
+   function Wide_String_Input_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class) return Wide_String
+   is
+   begin
+      return Wide_String_Ops.Input (Strm, Block_IO);
+   end Wide_String_Input_Blk_IO;
 
    ------------------------
    -- Wide_String_Output --
@@ -467,19 +529,20 @@ package body System.Strings.Stream_Ops is
       Item : Wide_String)
    is
    begin
-      if Strm = null then
-         raise Constraint_Error;
-      end if;
-
-      --  Write the bounds of the string
-
-      Positive'Write (Strm, Item'First);
-      Positive'Write (Strm, Item'Last);
+      Wide_String_Ops.Output (Strm, Item, Byte_IO);
+   end Wide_String_Output;
 
-      --  Write the character content of the string
+   -------------------------------
+   -- Wide_String_Output_Blk_IO --
+   -------------------------------
 
-      Wide_String_Write (Strm, Item);
-   end Wide_String_Output;
+   procedure Wide_String_Output_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : Wide_String)
+   is
+   begin
+      Wide_String_Ops.Output (Strm, Item, Block_IO);
+   end Wide_String_Output_Blk_IO;
 
    ----------------------
    -- Wide_String_Read --
@@ -490,9 +553,21 @@ package body System.Strings.Stream_Ops is
       Item : out Wide_String)
    is
    begin
-      Wide_String_Ops.Read (Strm, Item);
+      Wide_String_Ops.Read (Strm, Item, Byte_IO);
    end Wide_String_Read;
 
+   -----------------------------
+   -- Wide_String_Read_Blk_IO --
+   -----------------------------
+
+   procedure Wide_String_Read_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : out Wide_String)
+   is
+   begin
+      Wide_String_Ops.Read (Strm, Item, Block_IO);
+   end Wide_String_Read_Blk_IO;
+
    -----------------------
    -- Wide_String_Write --
    -----------------------
@@ -502,44 +577,42 @@ package body System.Strings.Stream_Ops is
       Item : Wide_String)
    is
    begin
-      Wide_String_Ops.Write (Strm, Item);
+      Wide_String_Ops.Write (Strm, Item, Byte_IO);
    end Wide_String_Write;
 
+   ------------------------------
+   -- Wide_String_Write_Blk_IO --
+   ------------------------------
+
+   procedure Wide_String_Write_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : Wide_String)
+   is
+   begin
+      Wide_String_Ops.Write (Strm, Item, Block_IO);
+   end Wide_String_Write_Blk_IO;
+
    ----------------------------
    -- Wide_Wide_String_Input --
    ----------------------------
 
    function Wide_Wide_String_Input
-     (Strm : access Ada.Streams.Root_Stream_Type'Class)
-      return Wide_Wide_String
+     (Strm : access Ada.Streams.Root_Stream_Type'Class) return Wide_Wide_String
    is
    begin
-      if Strm = null then
-         raise Constraint_Error;
-      end if;
-
-      declare
-         Low  : Positive;
-         High : Positive;
-
-      begin
-         --  Read the bounds of the string
-
-         Positive'Read (Strm, Low);
-         Positive'Read (Strm, High);
-
-         declare
-            Item : Wide_Wide_String (Low .. High);
-
-         begin
-            --  Read the character content of the string
+      return Wide_Wide_String_Ops.Input (Strm, Byte_IO);
+   end Wide_Wide_String_Input;
 
-            Wide_Wide_String_Read (Strm, Item);
+   -----------------------------------
+   -- Wide_Wide_String_Input_Blk_IO --
+   -----------------------------------
 
-            return Item;
-         end;
-      end;
-   end Wide_Wide_String_Input;
+   function Wide_Wide_String_Input_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class) return Wide_Wide_String
+   is
+   begin
+      return Wide_Wide_String_Ops.Input (Strm, Block_IO);
+   end Wide_Wide_String_Input_Blk_IO;
 
    -----------------------------
    -- Wide_Wide_String_Output --
@@ -550,19 +623,20 @@ package body System.Strings.Stream_Ops is
       Item : Wide_Wide_String)
    is
    begin
-      if Strm = null then
-         raise Constraint_Error;
-      end if;
-
-      --  Write the bounds of the string
-
-      Positive'Write (Strm, Item'First);
-      Positive'Write (Strm, Item'Last);
+      Wide_Wide_String_Ops.Output (Strm, Item, Byte_IO);
+   end Wide_Wide_String_Output;
 
-      --  Write the character content of the string
+   ------------------------------------
+   -- Wide_Wide_String_Output_Blk_IO --
+   ------------------------------------
 
-      Wide_Wide_String_Write (Strm, Item);
-   end Wide_Wide_String_Output;
+   procedure Wide_Wide_String_Output_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : Wide_Wide_String)
+   is
+   begin
+      Wide_Wide_String_Ops.Output (Strm, Item, Block_IO);
+   end Wide_Wide_String_Output_Blk_IO;
 
    ---------------------------
    -- Wide_Wide_String_Read --
@@ -573,9 +647,21 @@ package body System.Strings.Stream_Ops is
       Item : out Wide_Wide_String)
    is
    begin
-      Wide_Wide_String_Ops.Read (Strm, Item);
+      Wide_Wide_String_Ops.Read (Strm, Item, Byte_IO);
    end Wide_Wide_String_Read;
 
+   ----------------------------------
+   -- Wide_Wide_String_Read_Blk_IO --
+   ----------------------------------
+
+   procedure Wide_Wide_String_Read_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : out Wide_Wide_String)
+   is
+   begin
+      Wide_Wide_String_Ops.Read (Strm, Item, Block_IO);
+   end Wide_Wide_String_Read_Blk_IO;
+
    ----------------------------
    -- Wide_Wide_String_Write --
    ----------------------------
@@ -585,7 +671,19 @@ package body System.Strings.Stream_Ops is
       Item : Wide_Wide_String)
    is
    begin
-      Wide_Wide_String_Ops.Write (Strm, Item);
+      Wide_Wide_String_Ops.Write (Strm, Item, Byte_IO);
    end Wide_Wide_String_Write;
 
+   -----------------------------------
+   -- Wide_Wide_String_Write_Blk_IO --
+   -----------------------------------
+
+   procedure Wide_Wide_String_Write_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : Wide_Wide_String)
+   is
+   begin
+      Wide_Wide_String_Ops.Write (Strm, Item, Block_IO);
+   end Wide_Wide_String_Write_Blk_IO;
+
 end System.Strings.Stream_Ops;

diff --git a/gcc/ada/s-ststop.ads b/gcc/ada/s-ststop.ads
index f954bcc..432b133 100644 (file)
--- a/gcc/ada/s-ststop.ads
+++ b/gcc/ada/s-ststop.ads
@@ -45,6 +45,8 @@
 --  will be expanded into:
 --
 --     String_Output (Some_Stream, Some_String);
+--       or
+--     String_Output_Blk_IO (Some_Stream, Some_String);
 
 pragma Warnings (Off);
 pragma Compiler_Unit;
@@ -62,18 +64,34 @@ package System.Strings.Stream_Ops is
      (Strm : access Ada.Streams.Root_Stream_Type'Class)
       return String;
 
+   function String_Input_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class)
+      return String;
+
    procedure String_Output
      (Strm : access Ada.Streams.Root_Stream_Type'Class;
       Item : String);
 
+   procedure String_Output_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : String);
+
    procedure String_Read
      (Strm : access Ada.Streams.Root_Stream_Type'Class;
       Item : out String);
 
+   procedure String_Read_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : out String);
+
    procedure String_Write
      (Strm : access Ada.Streams.Root_Stream_Type'Class;
       Item : String);
 
+   procedure String_Write_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : String);
+
    -----------------------------------
    -- Wide_String stream operations --
    -----------------------------------
@@ -82,18 +100,34 @@ package System.Strings.Stream_Ops is
      (Strm : access Ada.Streams.Root_Stream_Type'Class)
       return Wide_String;
 
+   function Wide_String_Input_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class)
+      return Wide_String;
+
    procedure Wide_String_Output
      (Strm : access Ada.Streams.Root_Stream_Type'Class;
       Item : Wide_String);
 
+   procedure Wide_String_Output_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : Wide_String);
+
    procedure Wide_String_Read
      (Strm : access Ada.Streams.Root_Stream_Type'Class;
       Item : out Wide_String);
 
+   procedure Wide_String_Read_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : out Wide_String);
+
    procedure Wide_String_Write
      (Strm : access Ada.Streams.Root_Stream_Type'Class;
       Item : Wide_String);
 
+   procedure Wide_String_Write_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : Wide_String);
+
    ----------------------------------------
    -- Wide_Wide_String stream operations --
    ----------------------------------------
@@ -102,16 +136,32 @@ package System.Strings.Stream_Ops is
      (Strm : access Ada.Streams.Root_Stream_Type'Class)
       return Wide_Wide_String;
 
+   function Wide_Wide_String_Input_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class)
+      return Wide_Wide_String;
+
    procedure Wide_Wide_String_Output
      (Strm : access Ada.Streams.Root_Stream_Type'Class;
       Item : Wide_Wide_String);
 
+   procedure Wide_Wide_String_Output_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : Wide_Wide_String);
+
    procedure Wide_Wide_String_Read
      (Strm : access Ada.Streams.Root_Stream_Type'Class;
       Item : out Wide_Wide_String);
 
+   procedure Wide_Wide_String_Read_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : out Wide_Wide_String);
+
    procedure Wide_Wide_String_Write
      (Strm : access Ada.Streams.Root_Stream_Type'Class;
       Item : Wide_Wide_String);
 
+   procedure Wide_Wide_String_Write_Blk_IO
+     (Strm : access Ada.Streams.Root_Stream_Type'Class;
+      Item : Wide_Wide_String);
+
 end System.Strings.Stream_Ops;

diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 491678e..f62d6c8 100644 (file)
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -5646,18 +5646,6 @@ package body Sem_Prag is
             end if;
          end C_Pass_By_Copy;
 
-         -----------------------
-         -- Canonical_Streams --
-         -----------------------
-
-         --  pragma Canonical_Streams;
-
-         when Pragma_Canonical_Streams =>
-            GNAT_Pragma;
-            Check_Arg_Count (0);
-            Check_Valid_Configuration_Pragma;
-            Canonical_Streams := True;
-
          -----------
          -- Check --
          -----------
@@ -12214,7 +12202,6 @@ package body Sem_Prag is
       Pragma_Atomic                        =>  0,
       Pragma_Atomic_Components             =>  0,
       Pragma_Attach_Handler                => -1,
-      Pragma_Canonical_Streams             => -1,
       Pragma_Check                         => 99,
       Pragma_Check_Name                    =>  0,
       Pragma_Check_Policy                  =>  0,

diff --git a/gcc/ada/snames.adb b/gcc/ada/snames.adb
index ea14cf1..d780bc1 100644 (file)
--- a/gcc/ada/snames.adb
+++ b/gcc/ada/snames.adb
@@ -183,7 +183,6 @@ package body Snames is
      "ada_2005#" &
      "assertion_policy#" &
      "c_pass_by_copy#" &
-     "canonical_streams#" &
      "check_name#" &
      "check_policy#" &
      "compile_time_error#" &

diff --git a/gcc/ada/snames.ads b/gcc/ada/snames.ads
index da6c9a5..85447f7 100644 (file)
--- a/gcc/ada/snames.ads
+++ b/gcc/ada/snames.ads
@@ -341,22 +341,21 @@ package Snames is
    Name_Ada_2005                       : constant Name_Id := N + 122; -- GNAT
    Name_Assertion_Policy               : constant Name_Id := N + 123; -- Ada 05
    Name_C_Pass_By_Copy                 : constant Name_Id := N + 124; -- GNAT
-   Name_Canonical_Streams              : constant Name_Id := N + 125; -- GNAT
-   Name_Check_Name                     : constant Name_Id := N + 126; -- GNAT
-   Name_Check_Policy                   : constant Name_Id := N + 127; -- GNAT
-   Name_Compile_Time_Error             : constant Name_Id := N + 128; -- GNAT
-   Name_Compile_Time_Warning           : constant Name_Id := N + 129; -- GNAT
-   Name_Compiler_Unit                  : constant Name_Id := N + 130; -- GNAT
-   Name_Component_Alignment            : constant Name_Id := N + 131; -- GNAT
-   Name_Convention_Identifier          : constant Name_Id := N + 132; -- GNAT
-   Name_Debug_Policy                   : constant Name_Id := N + 133; -- GNAT
-   Name_Detect_Blocking                : constant Name_Id := N + 134; -- Ada 05
-   Name_Discard_Names                  : constant Name_Id := N + 135;
-   Name_Elaboration_Checks             : constant Name_Id := N + 136; -- GNAT
-   Name_Eliminate                      : constant Name_Id := N + 137; -- GNAT
-   Name_Extend_System                  : constant Name_Id := N + 138; -- GNAT
-   Name_Extensions_Allowed             : constant Name_Id := N + 139; -- GNAT
-   Name_External_Name_Casing           : constant Name_Id := N + 140; -- GNAT
+   Name_Check_Name                     : constant Name_Id := N + 125; -- GNAT
+   Name_Check_Policy                   : constant Name_Id := N + 126; -- GNAT
+   Name_Compile_Time_Error             : constant Name_Id := N + 127; -- GNAT
+   Name_Compile_Time_Warning           : constant Name_Id := N + 128; -- GNAT
+   Name_Compiler_Unit                  : constant Name_Id := N + 129; -- GNAT
+   Name_Component_Alignment            : constant Name_Id := N + 130; -- GNAT
+   Name_Convention_Identifier          : constant Name_Id := N + 131; -- GNAT
+   Name_Debug_Policy                   : constant Name_Id := N + 132; -- GNAT
+   Name_Detect_Blocking                : constant Name_Id := N + 133; -- Ada 05
+   Name_Discard_Names                  : constant Name_Id := N + 134;
+   Name_Elaboration_Checks             : constant Name_Id := N + 135; -- GNAT
+   Name_Eliminate                      : constant Name_Id := N + 136; -- GNAT
+   Name_Extend_System                  : constant Name_Id := N + 137; -- GNAT
+   Name_Extensions_Allowed             : constant Name_Id := N + 138; -- GNAT
+   Name_External_Name_Casing           : constant Name_Id := N + 139; -- GNAT
 
    --  Note: Fast_Math is not in this list because its name matches   -- GNAT
    --  the name of the corresponding attribute. However, it is
@@ -364,49 +363,49 @@ package Snames is
    --  functions Get_Pragma_Id, Is_[Configuration_]Pragma_Id, and
    --  correctly recognize and process Fast_Math.
 
-   Name_Favor_Top_Level                : constant Name_Id := N + 141; -- GNAT
-   Name_Float_Representation           : constant Name_Id := N + 142; -- GNAT
-   Name_Implicit_Packing               : constant Name_Id := N + 143; -- GNAT
-   Name_Initialize_Scalars             : constant Name_Id := N + 144; -- GNAT
-   Name_Interrupt_State                : constant Name_Id := N + 145; -- GNAT
-   Name_License                        : constant Name_Id := N + 146; -- GNAT
-   Name_Locking_Policy                 : constant Name_Id := N + 147;
-   Name_Long_Float                     : constant Name_Id := N + 148; -- VMS
-   Name_No_Run_Time                    : constant Name_Id := N + 149; -- GNAT
-   Name_No_Strict_Aliasing             : constant Name_Id := N + 150; -- GNAT
-   Name_Normalize_Scalars              : constant Name_Id := N + 151;
-   Name_Optimize_Alignment             : constant Name_Id := N + 152; -- GNAT
-   Name_Persistent_BSS                 : constant Name_Id := N + 153; -- GNAT
-   Name_Polling                        : constant Name_Id := N + 154; -- GNAT
-   Name_Priority_Specific_Dispatching  : constant Name_Id := N + 155; -- Ada 05
-   Name_Profile                        : constant Name_Id := N + 156; -- Ada 05
-   Name_Profile_Warnings               : constant Name_Id := N + 157; -- GNAT
-   Name_Propagate_Exceptions           : constant Name_Id := N + 158; -- GNAT
-   Name_Queuing_Policy                 : constant Name_Id := N + 159;
-   Name_Ravenscar                      : constant Name_Id := N + 160; -- GNAT
-   Name_Restricted_Run_Time            : constant Name_Id := N + 161; -- GNAT
-   Name_Restrictions                   : constant Name_Id := N + 162;
-   Name_Restriction_Warnings           : constant Name_Id := N + 163; -- GNAT
-   Name_Reviewable                     : constant Name_Id := N + 164;
-   Name_Source_File_Name               : constant Name_Id := N + 165; -- GNAT
-   Name_Source_File_Name_Project       : constant Name_Id := N + 166; -- GNAT
-   Name_Style_Checks                   : constant Name_Id := N + 167; -- GNAT
-   Name_Suppress                       : constant Name_Id := N + 168;
-   Name_Suppress_Exception_Locations   : constant Name_Id := N + 169; -- GNAT
-   Name_Task_Dispatching_Policy        : constant Name_Id := N + 170;
-   Name_Universal_Data                 : constant Name_Id := N + 171; -- AAMP
-   Name_Unsuppress                     : constant Name_Id := N + 172; -- Ada 05
-   Name_Use_VADS_Size                  : constant Name_Id := N + 173; -- GNAT
-   Name_Validity_Checks                : constant Name_Id := N + 174; -- GNAT
-   Name_Warnings                       : constant Name_Id := N + 175; -- GNAT
-   Name_Wide_Character_Encoding        : constant Name_Id := N + 176; -- GNAT
-   Last_Configuration_Pragma_Name      : constant Name_Id := N + 176;
+   Name_Favor_Top_Level                : constant Name_Id := N + 140; -- GNAT
+   Name_Float_Representation           : constant Name_Id := N + 141; -- GNAT
+   Name_Implicit_Packing               : constant Name_Id := N + 142; -- GNAT
+   Name_Initialize_Scalars             : constant Name_Id := N + 143; -- GNAT
+   Name_Interrupt_State                : constant Name_Id := N + 144; -- GNAT
+   Name_License                        : constant Name_Id := N + 145; -- GNAT
+   Name_Locking_Policy                 : constant Name_Id := N + 146;
+   Name_Long_Float                     : constant Name_Id := N + 147; -- VMS
+   Name_No_Run_Time                    : constant Name_Id := N + 148; -- GNAT
+   Name_No_Strict_Aliasing             : constant Name_Id := N + 149; -- GNAT
+   Name_Normalize_Scalars              : constant Name_Id := N + 150;
+   Name_Optimize_Alignment             : constant Name_Id := N + 151; -- GNAT
+   Name_Persistent_BSS                 : constant Name_Id := N + 152; -- GNAT
+   Name_Polling                        : constant Name_Id := N + 153; -- GNAT
+   Name_Priority_Specific_Dispatching  : constant Name_Id := N + 154; -- Ada 05
+   Name_Profile                        : constant Name_Id := N + 155; -- Ada 05
+   Name_Profile_Warnings               : constant Name_Id := N + 156; -- GNAT
+   Name_Propagate_Exceptions           : constant Name_Id := N + 157; -- GNAT
+   Name_Queuing_Policy                 : constant Name_Id := N + 158;
+   Name_Ravenscar                      : constant Name_Id := N + 159; -- GNAT
+   Name_Restricted_Run_Time            : constant Name_Id := N + 160; -- GNAT
+   Name_Restrictions                   : constant Name_Id := N + 161;
+   Name_Restriction_Warnings           : constant Name_Id := N + 162; -- GNAT
+   Name_Reviewable                     : constant Name_Id := N + 163;
+   Name_Source_File_Name               : constant Name_Id := N + 164; -- GNAT
+   Name_Source_File_Name_Project       : constant Name_Id := N + 165; -- GNAT
+   Name_Style_Checks                   : constant Name_Id := N + 166; -- GNAT
+   Name_Suppress                       : constant Name_Id := N + 167;
+   Name_Suppress_Exception_Locations   : constant Name_Id := N + 168; -- GNAT
+   Name_Task_Dispatching_Policy        : constant Name_Id := N + 169;
+   Name_Universal_Data                 : constant Name_Id := N + 170; -- AAMP
+   Name_Unsuppress                     : constant Name_Id := N + 171; -- Ada 05
+   Name_Use_VADS_Size                  : constant Name_Id := N + 172; -- GNAT
+   Name_Validity_Checks                : constant Name_Id := N + 173; -- GNAT
+   Name_Warnings                       : constant Name_Id := N + 174; -- GNAT
+   Name_Wide_Character_Encoding        : constant Name_Id := N + 175; -- GNAT
+   Last_Configuration_Pragma_Name      : constant Name_Id := N + 175;
 
    --  Remaining pragma names
 
-   Name_Abort_Defer                    : constant Name_Id := N + 177; -- GNAT
-   Name_All_Calls_Remote               : constant Name_Id := N + 178;
-   Name_Annotate                       : constant Name_Id := N + 179; -- GNAT
+   Name_Abort_Defer                    : constant Name_Id := N + 176; -- GNAT
+   Name_All_Calls_Remote               : constant Name_Id := N + 177;
+   Name_Annotate                       : constant Name_Id := N + 178; -- GNAT
 
    --  Note: AST_Entry is not in this list because its name matches   -- VMS
    --  the name of the corresponding attribute. However, it is
@@ -414,83 +413,83 @@ package Snames is
    --  functions Get_Pragma_Id and Is_Pragma_Id correctly recognize
    --  and process Name_AST_Entry.
 
-   Name_Assert                         : constant Name_Id := N + 180; -- Ada 05
-   Name_Asynchronous                   : constant Name_Id := N + 181;
-   Name_Atomic                         : constant Name_Id := N + 182;
-   Name_Atomic_Components              : constant Name_Id := N + 183;
-   Name_Attach_Handler                 : constant Name_Id := N + 184;
-   Name_Check                          : constant Name_Id := N + 185; -- GNAT
-   Name_CIL_Constructor                : constant Name_Id := N + 186; -- GNAT
-   Name_Comment                        : constant Name_Id := N + 187; -- GNAT
-   Name_Common_Object                  : constant Name_Id := N + 188; -- GNAT
-   Name_Complete_Representation        : constant Name_Id := N + 189; -- GNAT
-   Name_Complex_Representation         : constant Name_Id := N + 190; -- GNAT
-   Name_Controlled                     : constant Name_Id := N + 191;
-   Name_Convention                     : constant Name_Id := N + 192;
-   Name_CPP_Class                      : constant Name_Id := N + 193; -- GNAT
-   Name_CPP_Constructor                : constant Name_Id := N + 194; -- GNAT
-   Name_CPP_Virtual                    : constant Name_Id := N + 195; -- GNAT
-   Name_CPP_Vtable                     : constant Name_Id := N + 196; -- GNAT
-   Name_Debug                          : constant Name_Id := N + 197; -- GNAT
-   Name_Elaborate                      : constant Name_Id := N + 198; -- Ada 83
-   Name_Elaborate_All                  : constant Name_Id := N + 199;
-   Name_Elaborate_Body                 : constant Name_Id := N + 200;
-   Name_Export                         : constant Name_Id := N + 201;
-   Name_Export_Exception               : constant Name_Id := N + 202; -- VMS
-   Name_Export_Function                : constant Name_Id := N + 203; -- GNAT
-   Name_Export_Object                  : constant Name_Id := N + 204; -- GNAT
-   Name_Export_Procedure               : constant Name_Id := N + 205; -- GNAT
-   Name_Export_Value                   : constant Name_Id := N + 206; -- GNAT
-   Name_Export_Valued_Procedure        : constant Name_Id := N + 207; -- GNAT
-   Name_External                       : constant Name_Id := N + 208; -- GNAT
-   Name_Finalize_Storage_Only          : constant Name_Id := N + 209; -- GNAT
-   Name_Ident                          : constant Name_Id := N + 210; -- VMS
-   Name_Implemented_By_Entry           : constant Name_Id := N + 211; -- Ada 05
-   Name_Import                         : constant Name_Id := N + 212;
-   Name_Import_Exception               : constant Name_Id := N + 213; -- VMS
-   Name_Import_Function                : constant Name_Id := N + 214; -- GNAT
-   Name_Import_Object                  : constant Name_Id := N + 215; -- GNAT
-   Name_Import_Procedure               : constant Name_Id := N + 216; -- GNAT
-   Name_Import_Valued_Procedure        : constant Name_Id := N + 217; -- GNAT
-   Name_Inline                         : constant Name_Id := N + 218;
-   Name_Inline_Always                  : constant Name_Id := N + 219; -- GNAT
-   Name_Inline_Generic                 : constant Name_Id := N + 220; -- GNAT
-   Name_Inspection_Point               : constant Name_Id := N + 221;
+   Name_Assert                         : constant Name_Id := N + 179; -- Ada 05
+   Name_Asynchronous                   : constant Name_Id := N + 180;
+   Name_Atomic                         : constant Name_Id := N + 181;
+   Name_Atomic_Components              : constant Name_Id := N + 182;
+   Name_Attach_Handler                 : constant Name_Id := N + 183;
+   Name_Check                          : constant Name_Id := N + 184; -- GNAT
+   Name_CIL_Constructor                : constant Name_Id := N + 185; -- GNAT
+   Name_Comment                        : constant Name_Id := N + 186; -- GNAT
+   Name_Common_Object                  : constant Name_Id := N + 187; -- GNAT
+   Name_Complete_Representation        : constant Name_Id := N + 188; -- GNAT
+   Name_Complex_Representation         : constant Name_Id := N + 189; -- GNAT
+   Name_Controlled                     : constant Name_Id := N + 190;
+   Name_Convention                     : constant Name_Id := N + 191;
+   Name_CPP_Class                      : constant Name_Id := N + 192; -- GNAT
+   Name_CPP_Constructor                : constant Name_Id := N + 193; -- GNAT
+   Name_CPP_Virtual                    : constant Name_Id := N + 194; -- GNAT
+   Name_CPP_Vtable                     : constant Name_Id := N + 195; -- GNAT
+   Name_Debug                          : constant Name_Id := N + 196; -- GNAT
+   Name_Elaborate                      : constant Name_Id := N + 197; -- Ada 83
+   Name_Elaborate_All                  : constant Name_Id := N + 198;
+   Name_Elaborate_Body                 : constant Name_Id := N + 199;
+   Name_Export                         : constant Name_Id := N + 200;
+   Name_Export_Exception               : constant Name_Id := N + 201; -- VMS
+   Name_Export_Function                : constant Name_Id := N + 202; -- GNAT
+   Name_Export_Object                  : constant Name_Id := N + 203; -- GNAT
+   Name_Export_Procedure               : constant Name_Id := N + 204; -- GNAT
+   Name_Export_Value                   : constant Name_Id := N + 205; -- GNAT
+   Name_Export_Valued_Procedure        : constant Name_Id := N + 206; -- GNAT
+   Name_External                       : constant Name_Id := N + 207; -- GNAT
+   Name_Finalize_Storage_Only          : constant Name_Id := N + 208; -- GNAT
+   Name_Ident                          : constant Name_Id := N + 209; -- VMS
+   Name_Implemented_By_Entry           : constant Name_Id := N + 210; -- Ada 05
+   Name_Import                         : constant Name_Id := N + 211;
+   Name_Import_Exception               : constant Name_Id := N + 212; -- VMS
+   Name_Import_Function                : constant Name_Id := N + 213; -- GNAT
+   Name_Import_Object                  : constant Name_Id := N + 214; -- GNAT
+   Name_Import_Procedure               : constant Name_Id := N + 215; -- GNAT
+   Name_Import_Valued_Procedure        : constant Name_Id := N + 216; -- GNAT
+   Name_Inline                         : constant Name_Id := N + 217;
+   Name_Inline_Always                  : constant Name_Id := N + 218; -- GNAT
+   Name_Inline_Generic                 : constant Name_Id := N + 219; -- GNAT
+   Name_Inspection_Point               : constant Name_Id := N + 220;
 
    --  Note: Interface is not in this list because its name matches   -- GNAT
    --  an Ada 2005 keyword. However it is included in the definition
    --  of the type Attribute_Id, and the functions Get_Pragma_Id and
    --  Is_Pragma_Id correctly recognize and process Name_Storage_Size.
 
-   Name_Interface_Name                 : constant Name_Id := N + 222; -- GNAT
-   Name_Interrupt_Handler              : constant Name_Id := N + 223;
-   Name_Interrupt_Priority             : constant Name_Id := N + 224;
-   Name_Java_Constructor               : constant Name_Id := N + 225; -- GNAT
-   Name_Java_Interface                 : constant Name_Id := N + 226; -- GNAT
-   Name_Keep_Names                     : constant Name_Id := N + 227; -- GNAT
-   Name_Link_With                      : constant Name_Id := N + 228; -- GNAT
-   Name_Linker_Alias                   : constant Name_Id := N + 229; -- GNAT
-   Name_Linker_Constructor             : constant Name_Id := N + 230; -- GNAT
-   Name_Linker_Destructor              : constant Name_Id := N + 231; -- GNAT
-   Name_Linker_Options                 : constant Name_Id := N + 232;
-   Name_Linker_Section                 : constant Name_Id := N + 233; -- GNAT
-   Name_List                           : constant Name_Id := N + 234;
-   Name_Machine_Attribute              : constant Name_Id := N + 235; -- GNAT
-   Name_Main                           : constant Name_Id := N + 236; -- GNAT
-   Name_Main_Storage                   : constant Name_Id := N + 237; -- GNAT
-   Name_Memory_Size                    : constant Name_Id := N + 238; -- Ada 83
-   Name_No_Body                        : constant Name_Id := N + 239; -- GNAT
-   Name_No_Return                      : constant Name_Id := N + 240; -- GNAT
-   Name_Obsolescent                    : constant Name_Id := N + 241; -- GNAT
-   Name_Optimize                       : constant Name_Id := N + 242;
-   Name_Pack                           : constant Name_Id := N + 243;
-   Name_Page                           : constant Name_Id := N + 244;
-   Name_Passive                        : constant Name_Id := N + 245; -- GNAT
-   Name_Postcondition                  : constant Name_Id := N + 246; -- GNAT
-   Name_Precondition                   : constant Name_Id := N + 247; -- GNAT
-   Name_Preelaborable_Initialization   : constant Name_Id := N + 248; -- Ada 05
-   Name_Preelaborate                   : constant Name_Id := N + 249;
-   Name_Preelaborate_05                : constant Name_Id := N + 250; -- GNAT
+   Name_Interface_Name                 : constant Name_Id := N + 221; -- GNAT
+   Name_Interrupt_Handler              : constant Name_Id := N + 222;
+   Name_Interrupt_Priority             : constant Name_Id := N + 223;
+   Name_Java_Constructor               : constant Name_Id := N + 224; -- GNAT
+   Name_Java_Interface                 : constant Name_Id := N + 225; -- GNAT
+   Name_Keep_Names                     : constant Name_Id := N + 226; -- GNAT
+   Name_Link_With                      : constant Name_Id := N + 227; -- GNAT
+   Name_Linker_Alias                   : constant Name_Id := N + 228; -- GNAT
+   Name_Linker_Constructor             : constant Name_Id := N + 229; -- GNAT
+   Name_Linker_Destructor              : constant Name_Id := N + 230; -- GNAT
+   Name_Linker_Options                 : constant Name_Id := N + 231;
+   Name_Linker_Section                 : constant Name_Id := N + 232; -- GNAT
+   Name_List                           : constant Name_Id := N + 233;
+   Name_Machine_Attribute              : constant Name_Id := N + 234; -- GNAT
+   Name_Main                           : constant Name_Id := N + 235; -- GNAT
+   Name_Main_Storage                   : constant Name_Id := N + 236; -- GNAT
+   Name_Memory_Size                    : constant Name_Id := N + 237; -- Ada 83
+   Name_No_Body                        : constant Name_Id := N + 238; -- GNAT
+   Name_No_Return                      : constant Name_Id := N + 239; -- GNAT
+   Name_Obsolescent                    : constant Name_Id := N + 240; -- GNAT
+   Name_Optimize                       : constant Name_Id := N + 241;
+   Name_Pack                           : constant Name_Id := N + 242;
+   Name_Page                           : constant Name_Id := N + 243;
+   Name_Passive                        : constant Name_Id := N + 244; -- GNAT
+   Name_Postcondition                  : constant Name_Id := N + 245; -- GNAT
+   Name_Precondition                   : constant Name_Id := N + 246; -- GNAT
+   Name_Preelaborable_Initialization   : constant Name_Id := N + 247; -- Ada 05
+   Name_Preelaborate                   : constant Name_Id := N + 248;
+   Name_Preelaborate_05                : constant Name_Id := N + 249; -- GNAT
 
    --  Note: Priority is not in this list because its name matches
    --  the name of the corresponding attribute. However, it is
@@ -498,16 +497,16 @@ package Snames is
    --  functions Get_Pragma_Id and Is_Pragma_Id correctly recognize
    --  and process Priority. Priority is a standard Ada 95 pragma.
 
-   Name_Psect_Object                   : constant Name_Id := N + 251; -- VMS
-   Name_Pure                           : constant Name_Id := N + 252;
-   Name_Pure_05                        : constant Name_Id := N + 253; -- GNAT
-   Name_Pure_Function                  : constant Name_Id := N + 254; -- GNAT
-   Name_Relative_Deadline              : constant Name_Id := N + 255; -- Ada 05
-   Name_Remote_Call_Interface          : constant Name_Id := N + 256;
-   Name_Remote_Types                   : constant Name_Id := N + 257;
-   Name_Share_Generic                  : constant Name_Id := N + 258; -- GNAT
-   Name_Shared                         : constant Name_Id := N + 259; -- Ada 83
-   Name_Shared_Passive                 : constant Name_Id := N + 260;
+   Name_Psect_Object                   : constant Name_Id := N + 250; -- VMS
+   Name_Pure                           : constant Name_Id := N + 251;
+   Name_Pure_05                        : constant Name_Id := N + 252; -- GNAT
+   Name_Pure_Function                  : constant Name_Id := N + 253; -- GNAT
+   Name_Relative_Deadline              : constant Name_Id := N + 254; -- Ada 05
+   Name_Remote_Call_Interface          : constant Name_Id := N + 255;
+   Name_Remote_Types                   : constant Name_Id := N + 256;
+   Name_Share_Generic                  : constant Name_Id := N + 257; -- GNAT
+   Name_Shared                         : constant Name_Id := N + 258; -- Ada 83
+   Name_Shared_Passive                 : constant Name_Id := N + 259;
 
    --  Note: Storage_Size is not in this list because its name
    --  matches the name of the corresponding attribute. However,
@@ -518,30 +517,30 @@ 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 + 261; -- GNAT
-   Name_Static_Elaboration_Desired     : constant Name_Id := N + 262; -- GNAT
-   Name_Stream_Convert                 : constant Name_Id := N + 263; -- GNAT
-   Name_Subtitle                       : constant Name_Id := N + 264; -- GNAT
-   Name_Suppress_All                   : constant Name_Id := N + 265; -- GNAT
-   Name_Suppress_Debug_Info            : constant Name_Id := N + 266; -- GNAT
-   Name_Suppress_Initialization        : constant Name_Id := N + 267; -- GNAT
-   Name_System_Name                    : constant Name_Id := N + 268; -- Ada 83
-   Name_Task_Info                      : constant Name_Id := N + 269; -- GNAT
-   Name_Task_Name                      : constant Name_Id := N + 270; -- GNAT
-   Name_Task_Storage                   : constant Name_Id := N + 271; -- VMS
-   Name_Time_Slice                     : constant Name_Id := N + 272; -- GNAT
-   Name_Title                          : constant Name_Id := N + 273; -- GNAT
-   Name_Unchecked_Union                : constant Name_Id := N + 274; -- Ada 05
-   Name_Unimplemented_Unit             : constant Name_Id := N + 275; -- GNAT
-   Name_Universal_Aliasing             : constant Name_Id := N + 276; -- GNAT
-   Name_Unmodified                     : constant Name_Id := N + 277; -- GNAT
-   Name_Unreferenced                   : constant Name_Id := N + 278; -- GNAT
-   Name_Unreferenced_Objects           : constant Name_Id := N + 279; -- GNAT
-   Name_Unreserve_All_Interrupts       : constant Name_Id := N + 280; -- GNAT
-   Name_Volatile                       : constant Name_Id := N + 281;
-   Name_Volatile_Components            : constant Name_Id := N + 282;
-   Name_Weak_External                  : constant Name_Id := N + 283; -- GNAT
-   Last_Pragma_Name                    : constant Name_Id := N + 283;
+   Name_Source_Reference               : constant Name_Id := N + 260; -- GNAT
+   Name_Static_Elaboration_Desired     : constant Name_Id := N + 261; -- GNAT
+   Name_Stream_Convert                 : constant Name_Id := N + 262; -- GNAT
+   Name_Subtitle                       : constant Name_Id := N + 263; -- GNAT
+   Name_Suppress_All                   : constant Name_Id := N + 264; -- GNAT
+   Name_Suppress_Debug_Info            : constant Name_Id := N + 265; -- GNAT
+   Name_Suppress_Initialization        : constant Name_Id := N + 266; -- GNAT
+   Name_System_Name                    : constant Name_Id := N + 267; -- Ada 83
+   Name_Task_Info                      : constant Name_Id := N + 268; -- GNAT
+   Name_Task_Name                      : constant Name_Id := N + 269; -- GNAT
+   Name_Task_Storage                   : constant Name_Id := N + 270; -- VMS
+   Name_Time_Slice                     : constant Name_Id := N + 271; -- GNAT
+   Name_Title                          : constant Name_Id := N + 272; -- GNAT
+   Name_Unchecked_Union                : constant Name_Id := N + 273; -- Ada 05
+   Name_Unimplemented_Unit             : constant Name_Id := N + 274; -- GNAT
+   Name_Universal_Aliasing             : constant Name_Id := N + 275; -- GNAT
+   Name_Unmodified                     : constant Name_Id := N + 276; -- GNAT
+   Name_Unreferenced                   : constant Name_Id := N + 277; -- GNAT
+   Name_Unreferenced_Objects           : constant Name_Id := N + 278; -- GNAT
+   Name_Unreserve_All_Interrupts       : constant Name_Id := N + 279; -- GNAT
+   Name_Volatile                       : constant Name_Id := N + 280;
+   Name_Volatile_Components            : constant Name_Id := N + 281;
+   Name_Weak_External                  : constant Name_Id := N + 282; -- GNAT
+   Last_Pragma_Name                    : constant Name_Id := N + 282;
 
    --  Language convention names for pragma Convention/Export/Import/Interface
    --  Note that Name_C is not included in this list, since it was already
@@ -552,120 +551,120 @@ package Snames is
    --  Entry and Protected, this is because these conventions cannot be
    --  specified by a pragma.
 
-   First_Convention_Name               : constant Name_Id := N + 284;
-   Name_Ada                            : constant Name_Id := N + 284;
-   Name_Assembler                      : constant Name_Id := N + 285;
-   Name_CIL                            : constant Name_Id := N + 286;
-   Name_COBOL                          : constant Name_Id := N + 287;
-   Name_CPP                            : constant Name_Id := N + 288;
-   Name_Fortran                        : constant Name_Id := N + 289;
-   Name_Intrinsic                      : constant Name_Id := N + 290;
-   Name_Java                           : constant Name_Id := N + 291;
-   Name_Stdcall                        : constant Name_Id := N + 292;
-   Name_Stubbed                        : constant Name_Id := N + 293;
-   Last_Convention_Name                : constant Name_Id := N + 293;
+   First_Convention_Name               : constant Name_Id := N + 283;
+   Name_Ada                            : constant Name_Id := N + 283;
+   Name_Assembler                      : constant Name_Id := N + 284;
+   Name_CIL                            : constant Name_Id := N + 285;
+   Name_COBOL                          : constant Name_Id := N + 286;
+   Name_CPP                            : constant Name_Id := N + 287;
+   Name_Fortran                        : constant Name_Id := N + 288;
+   Name_Intrinsic                      : constant Name_Id := N + 289;
+   Name_Java                           : constant Name_Id := N + 290;
+   Name_Stdcall                        : constant Name_Id := N + 291;
+   Name_Stubbed                        : constant Name_Id := N + 292;
+   Last_Convention_Name                : constant Name_Id := N + 292;
 
    --  The following names are preset as synonyms for Assembler
 
-   Name_Asm                            : constant Name_Id := N + 294;
-   Name_Assembly                       : constant Name_Id := N + 295;
+   Name_Asm                            : constant Name_Id := N + 293;
+   Name_Assembly                       : constant Name_Id := N + 294;
 
    --  The following names are preset as synonyms for C
 
-   Name_Default                        : constant Name_Id := N + 296;
+   Name_Default                        : constant Name_Id := N + 295;
    --  Name_External (previously defined as pragma)
 
    --  The following names are preset as synonyms for CPP
 
-   Name_C_Plus_Plus                    : constant Name_Id := N + 297;
+   Name_C_Plus_Plus                    : constant Name_Id := N + 296;
 
    --  The following names are present as synonyms for Stdcall
 
-   Name_DLL                            : constant Name_Id := N + 298;
-   Name_Win32                          : constant Name_Id := N + 299;
+   Name_DLL                            : constant Name_Id := N + 297;
+   Name_Win32                          : constant Name_Id := N + 298;
 
    --  Other special names used in processing pragmas
 
-   Name_As_Is                          : constant Name_Id := N + 300;
-   Name_Assertion                      : constant Name_Id := N + 301;
-   Name_Attribute_Name                 : constant Name_Id := N + 302;
-   Name_Body_File_Name                 : constant Name_Id := N + 303;
-   Name_Boolean_Entry_Barriers         : constant Name_Id := N + 304;
-   Name_Casing                         : constant Name_Id := N + 305;
-   Name_Code                           : constant Name_Id := N + 306;
-   Name_Component                      : constant Name_Id := N + 307;
-   Name_Component_Size_4               : constant Name_Id := N + 308;
-   Name_Copy                           : constant Name_Id := N + 309;
-   Name_D_Float                        : constant Name_Id := N + 310;
-   Name_Descriptor                     : constant Name_Id := N + 311;
-   Name_Dot_Replacement                : constant Name_Id := N + 312;
-   Name_Dynamic                        : constant Name_Id := N + 313;
-   Name_Entity                         : constant Name_Id := N + 314;
-   Name_Entry_Count                    : constant Name_Id := N + 315;
-   Name_External_Name                  : constant Name_Id := N + 316;
-   Name_First_Optional_Parameter       : constant Name_Id := N + 317;
-   Name_Form                           : constant Name_Id := N + 318;
-   Name_G_Float                        : constant Name_Id := N + 319;
-   Name_Gcc                            : constant Name_Id := N + 320;
-   Name_Gnat                           : constant Name_Id := N + 321;
-   Name_GPL                            : constant Name_Id := N + 322;
-   Name_IEEE_Float                     : constant Name_Id := N + 323;
-   Name_Ignore                         : constant Name_Id := N + 324;
-   Name_Info                           : constant Name_Id := N + 325;
-   Name_Internal                       : constant Name_Id := N + 326;
-   Name_Link_Name                      : constant Name_Id := N + 327;
-   Name_Lowercase                      : constant Name_Id := N + 328;
-   Name_Max_Entry_Queue_Depth          : constant Name_Id := N + 329;
-   Name_Max_Entry_Queue_Length         : constant Name_Id := N + 330;
-   Name_Max_Size                       : constant Name_Id := N + 331;
-   Name_Mechanism                      : constant Name_Id := N + 332;
-   Name_Message                        : constant Name_Id := N + 333;
-   Name_Mixedcase                      : constant Name_Id := N + 334;
-   Name_Modified_GPL                   : constant Name_Id := N + 335;
-   Name_Name                           : constant Name_Id := N + 336;
-   Name_NCA                            : constant Name_Id := N + 337;
-   Name_No                             : constant Name_Id := N + 338;
-   Name_No_Dependence                  : constant Name_Id := N + 339;
-   Name_No_Dynamic_Attachment          : constant Name_Id := N + 340;
-   Name_No_Dynamic_Interrupts          : constant Name_Id := N + 341;
-   Name_No_Requeue                     : constant Name_Id := N + 342;
-   Name_No_Requeue_Statements          : constant Name_Id := N + 343;
-   Name_No_Task_Attributes             : constant Name_Id := N + 344;
-   Name_No_Task_Attributes_Package     : constant Name_Id := N + 345;
-   Name_On                             : constant Name_Id := N + 346;
-   Name_Parameter_Types                : constant Name_Id := N + 347;
-   Name_Reference                      : constant Name_Id := N + 348;
-   Name_Restricted                     : constant Name_Id := N + 349;
-   Name_Result_Mechanism               : constant Name_Id := N + 350;
-   Name_Result_Type                    : constant Name_Id := N + 351;
-   Name_Runtime                        : constant Name_Id := N + 352;
-   Name_SB                             : constant Name_Id := N + 353;
-   Name_Secondary_Stack_Size           : constant Name_Id := N + 354;
-   Name_Section                        : constant Name_Id := N + 355;
-   Name_Semaphore                      : constant Name_Id := N + 356;
-   Name_Short_Descriptor               : constant Name_Id := N + 357;
-   Name_Simple_Barriers                : constant Name_Id := N + 358;
-   Name_Spec_File_Name                 : constant Name_Id := N + 359;
-   Name_State                          : constant Name_Id := N + 360;
-   Name_Static                         : constant Name_Id := N + 361;
-   Name_Stack_Size                     : constant Name_Id := N + 362;
-   Name_Subunit_File_Name              : constant Name_Id := N + 363;
-   Name_Task_Stack_Size_Default        : constant Name_Id := N + 364;
-   Name_Task_Type                      : constant Name_Id := N + 365;
-   Name_Time_Slicing_Enabled           : constant Name_Id := N + 366;
-   Name_Top_Guard                      : constant Name_Id := N + 367;
-   Name_UBA                            : constant Name_Id := N + 368;
-   Name_UBS                            : constant Name_Id := N + 369;
-   Name_UBSB                           : constant Name_Id := N + 370;
-   Name_Unit_Name                      : constant Name_Id := N + 371;
-   Name_Unknown                        : constant Name_Id := N + 372;
-   Name_Unrestricted                   : constant Name_Id := N + 373;
-   Name_Uppercase                      : constant Name_Id := N + 374;
-   Name_User                           : constant Name_Id := N + 375;
-   Name_VAX_Float                      : constant Name_Id := N + 376;
-   Name_VMS                            : constant Name_Id := N + 377;
-   Name_Vtable_Ptr                     : constant Name_Id := N + 378;
-   Name_Working_Storage                : constant Name_Id := N + 379;
+   Name_As_Is                          : constant Name_Id := N + 299;
+   Name_Assertion                      : constant Name_Id := N + 300;
+   Name_Attribute_Name                 : constant Name_Id := N + 301;
+   Name_Body_File_Name                 : constant Name_Id := N + 302;
+   Name_Boolean_Entry_Barriers         : constant Name_Id := N + 303;
+   Name_Casing                         : constant Name_Id := N + 304;
+   Name_Code                           : constant Name_Id := N + 305;
+   Name_Component                      : constant Name_Id := N + 306;
+   Name_Component_Size_4               : constant Name_Id := N + 307;
+   Name_Copy                           : constant Name_Id := N + 308;
+   Name_D_Float                        : constant Name_Id := N + 309;
+   Name_Descriptor                     : constant Name_Id := N + 310;
+   Name_Dot_Replacement                : constant Name_Id := N + 311;
+   Name_Dynamic                        : constant Name_Id := N + 312;
+   Name_Entity                         : constant Name_Id := N + 313;
+   Name_Entry_Count                    : constant Name_Id := N + 314;
+   Name_External_Name                  : constant Name_Id := N + 315;
+   Name_First_Optional_Parameter       : constant Name_Id := N + 316;
+   Name_Form                           : constant Name_Id := N + 317;
+   Name_G_Float                        : constant Name_Id := N + 318;
+   Name_Gcc                            : constant Name_Id := N + 319;
+   Name_Gnat                           : constant Name_Id := N + 320;
+   Name_GPL                            : constant Name_Id := N + 321;
+   Name_IEEE_Float                     : constant Name_Id := N + 322;
+   Name_Ignore                         : constant Name_Id := N + 323;
+   Name_Info                           : constant Name_Id := N + 324;
+   Name_Internal                       : constant Name_Id := N + 325;
+   Name_Link_Name                      : constant Name_Id := N + 326;
+   Name_Lowercase                      : constant Name_Id := N + 327;
+   Name_Max_Entry_Queue_Depth          : constant Name_Id := N + 328;
+   Name_Max_Entry_Queue_Length         : constant Name_Id := N + 329;
+   Name_Max_Size                       : constant Name_Id := N + 330;
+   Name_Mechanism                      : constant Name_Id := N + 331;
+   Name_Message                        : constant Name_Id := N + 332;
+   Name_Mixedcase                      : constant Name_Id := N + 333;
+   Name_Modified_GPL                   : constant Name_Id := N + 334;
+   Name_Name                           : constant Name_Id := N + 335;
+   Name_NCA                            : constant Name_Id := N + 336;
+   Name_No                             : constant Name_Id := N + 337;
+   Name_No_Dependence                  : constant Name_Id := N + 338;
+   Name_No_Dynamic_Attachment          : constant Name_Id := N + 339;
+   Name_No_Dynamic_Interrupts          : constant Name_Id := N + 340;
+   Name_No_Requeue                     : constant Name_Id := N + 341;
+   Name_No_Requeue_Statements          : constant Name_Id := N + 342;
+   Name_No_Task_Attributes             : constant Name_Id := N + 343;
+   Name_No_Task_Attributes_Package     : constant Name_Id := N + 344;
+   Name_On                             : constant Name_Id := N + 345;
+   Name_Parameter_Types                : constant Name_Id := N + 346;
+   Name_Reference                      : constant Name_Id := N + 347;
+   Name_Restricted                     : constant Name_Id := N + 348;
+   Name_Result_Mechanism               : constant Name_Id := N + 349;
+   Name_Result_Type                    : constant Name_Id := N + 350;
+   Name_Runtime                        : constant Name_Id := N + 351;
+   Name_SB                             : constant Name_Id := N + 352;
+   Name_Secondary_Stack_Size           : constant Name_Id := N + 353;
+   Name_Section                        : constant Name_Id := N + 354;
+   Name_Semaphore                      : constant Name_Id := N + 355;
+   Name_Short_Descriptor               : constant Name_Id := N + 356;
+   Name_Simple_Barriers                : constant Name_Id := N + 357;
+   Name_Spec_File_Name                 : constant Name_Id := N + 358;
+   Name_State                          : constant Name_Id := N + 359;
+   Name_Static                         : constant Name_Id := N + 360;
+   Name_Stack_Size                     : constant Name_Id := N + 361;
+   Name_Subunit_File_Name              : constant Name_Id := N + 362;
+   Name_Task_Stack_Size_Default        : constant Name_Id := N + 363;
+   Name_Task_Type                      : constant Name_Id := N + 364;
+   Name_Time_Slicing_Enabled           : constant Name_Id := N + 365;
+   Name_Top_Guard                      : constant Name_Id := N + 366;
+   Name_UBA                            : constant Name_Id := N + 367;
+   Name_UBS                            : constant Name_Id := N + 368;
+   Name_UBSB                           : constant Name_Id := N + 369;
+   Name_Unit_Name                      : constant Name_Id := N + 370;
+   Name_Unknown                        : constant Name_Id := N + 371;
+   Name_Unrestricted                   : constant Name_Id := N + 372;
+   Name_Uppercase                      : constant Name_Id := N + 373;
+   Name_User                           : constant Name_Id := N + 374;
+   Name_VAX_Float                      : constant Name_Id := N + 375;
+   Name_VMS                            : constant Name_Id := N + 376;
+   Name_Vtable_Ptr                     : constant Name_Id := N + 377;
+   Name_Working_Storage                : constant Name_Id := N + 378;
 
    --  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
@@ -679,175 +678,175 @@ 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 + 380;
-   Name_Abort_Signal                   : constant Name_Id := N + 380; -- GNAT
-   Name_Access                         : constant Name_Id := N + 381;
-   Name_Address                        : constant Name_Id := N + 382;
-   Name_Address_Size                   : constant Name_Id := N + 383; -- GNAT
-   Name_Aft                            : constant Name_Id := N + 384;
-   Name_Alignment                      : constant Name_Id := N + 385;
-   Name_Asm_Input                      : constant Name_Id := N + 386; -- GNAT
-   Name_Asm_Output                     : constant Name_Id := N + 387; -- GNAT
-   Name_AST_Entry                      : constant Name_Id := N + 388; -- VMS
-   Name_Bit                            : constant Name_Id := N + 389; -- GNAT
-   Name_Bit_Order                      : constant Name_Id := N + 390;
-   Name_Bit_Position                   : constant Name_Id := N + 391; -- GNAT
-   Name_Body_Version                   : constant Name_Id := N + 392;
-   Name_Callable                       : constant Name_Id := N + 393;
-   Name_Caller                         : constant Name_Id := N + 394;
-   Name_Code_Address                   : constant Name_Id := N + 395; -- GNAT
-   Name_Component_Size                 : constant Name_Id := N + 396;
-   Name_Compose                        : constant Name_Id := N + 397;
-   Name_Constrained                    : constant Name_Id := N + 398;
-   Name_Count                          : constant Name_Id := N + 399;
-   Name_Default_Bit_Order              : constant Name_Id := N + 400; -- GNAT
-   Name_Definite                       : constant Name_Id := N + 401;
-   Name_Delta                          : constant Name_Id := N + 402;
-   Name_Denorm                         : constant Name_Id := N + 403;
-   Name_Digits                         : constant Name_Id := N + 404;
-   Name_Elaborated                     : constant Name_Id := N + 405; -- GNAT
-   Name_Emax                           : constant Name_Id := N + 406; -- Ada 83
-   Name_Enabled                        : constant Name_Id := N + 407; -- GNAT
-   Name_Enum_Rep                       : constant Name_Id := N + 408; -- GNAT
-   Name_Enum_Val                       : constant Name_Id := N + 409; -- GNAT
-   Name_Epsilon                        : constant Name_Id := N + 410; -- Ada 83
-   Name_Exponent                       : constant Name_Id := N + 411;
-   Name_External_Tag                   : constant Name_Id := N + 412;
-   Name_Fast_Math                      : constant Name_Id := N + 413; -- GNAT
-   Name_First                          : constant Name_Id := N + 414;
-   Name_First_Bit                      : constant Name_Id := N + 415;
-   Name_Fixed_Value                    : constant Name_Id := N + 416; -- GNAT
-   Name_Fore                           : constant Name_Id := N + 417;
-   Name_Has_Access_Values              : constant Name_Id := N + 418; -- GNAT
-   Name_Has_Discriminants              : constant Name_Id := N + 419; -- GNAT
-   Name_Has_Tagged_Values              : constant Name_Id := N + 420; -- GNAT
-   Name_Identity                       : constant Name_Id := N + 421;
-   Name_Img                            : constant Name_Id := N + 422; -- GNAT
-   Name_Integer_Value                  : constant Name_Id := N + 423; -- GNAT
-   Name_Invalid_Value                  : constant Name_Id := N + 424; -- GNAT
-   Name_Large                          : constant Name_Id := N + 425; -- Ada 83
-   Name_Last                           : constant Name_Id := N + 426;
-   Name_Last_Bit                       : constant Name_Id := N + 427;
-   Name_Leading_Part                   : constant Name_Id := N + 428;
-   Name_Length                         : constant Name_Id := N + 429;
-   Name_Machine_Emax                   : constant Name_Id := N + 430;
-   Name_Machine_Emin                   : constant Name_Id := N + 431;
-   Name_Machine_Mantissa               : constant Name_Id := N + 432;
-   Name_Machine_Overflows              : constant Name_Id := N + 433;
-   Name_Machine_Radix                  : constant Name_Id := N + 434;
-   Name_Machine_Rounding               : constant Name_Id := N + 435; -- Ada 05
-   Name_Machine_Rounds                 : constant Name_Id := N + 436;
-   Name_Machine_Size                   : constant Name_Id := N + 437; -- GNAT
-   Name_Mantissa                       : constant Name_Id := N + 438; -- Ada 83
-   Name_Max_Size_In_Storage_Elements   : constant Name_Id := N + 439;
-   Name_Maximum_Alignment              : constant Name_Id := N + 440; -- GNAT
-   Name_Mechanism_Code                 : constant Name_Id := N + 441; -- GNAT
-   Name_Mod                            : constant Name_Id := N + 442; -- Ada 05
-   Name_Model_Emin                     : constant Name_Id := N + 443;
-   Name_Model_Epsilon                  : constant Name_Id := N + 444;
-   Name_Model_Mantissa                 : constant Name_Id := N + 445;
-   Name_Model_Small                    : constant Name_Id := N + 446;
-   Name_Modulus                        : constant Name_Id := N + 447;
-   Name_Null_Parameter                 : constant Name_Id := N + 448; -- GNAT
-   Name_Object_Size                    : constant Name_Id := N + 449; -- GNAT
-   Name_Old                            : constant Name_Id := N + 450; -- GNAT
-   Name_Partition_ID                   : constant Name_Id := N + 451;
-   Name_Passed_By_Reference            : constant Name_Id := N + 452; -- GNAT
-   Name_Pool_Address                   : constant Name_Id := N + 453;
-   Name_Pos                            : constant Name_Id := N + 454;
-   Name_Position                       : constant Name_Id := N + 455;
-   Name_Priority                       : constant Name_Id := N + 456; -- Ada 05
-   Name_Range                          : constant Name_Id := N + 457;
-   Name_Range_Length                   : constant Name_Id := N + 458; -- GNAT
-   Name_Result                         : constant Name_Id := N + 459; -- GNAT
-   Name_Round                          : constant Name_Id := N + 460;
-   Name_Safe_Emax                      : constant Name_Id := N + 461; -- Ada 83
-   Name_Safe_First                     : constant Name_Id := N + 462;
-   Name_Safe_Large                     : constant Name_Id := N + 463; -- Ada 83
-   Name_Safe_Last                      : constant Name_Id := N + 464;
-   Name_Safe_Small                     : constant Name_Id := N + 465; -- Ada 83
-   Name_Scale                          : constant Name_Id := N + 466;
-   Name_Scaling                        : constant Name_Id := N + 467;
-   Name_Signed_Zeros                   : constant Name_Id := N + 468;
-   Name_Size                           : constant Name_Id := N + 469;
-   Name_Small                          : constant Name_Id := N + 470;
-   Name_Storage_Size                   : constant Name_Id := N + 471;
-   Name_Storage_Unit                   : constant Name_Id := N + 472; -- GNAT
-   Name_Stream_Size                    : constant Name_Id := N + 473; -- Ada 05
-   Name_Tag                            : constant Name_Id := N + 474;
-   Name_Target_Name                    : constant Name_Id := N + 475; -- GNAT
-   Name_Terminated                     : constant Name_Id := N + 476;
-   Name_To_Address                     : constant Name_Id := N + 477; -- GNAT
-   Name_Type_Class                     : constant Name_Id := N + 478; -- GNAT
-   Name_UET_Address                    : constant Name_Id := N + 479; -- GNAT
-   Name_Unbiased_Rounding              : constant Name_Id := N + 480;
-   Name_Unchecked_Access               : constant Name_Id := N + 481;
-   Name_Unconstrained_Array            : constant Name_Id := N + 482;
-   Name_Universal_Literal_String       : constant Name_Id := N + 483; -- GNAT
-   Name_Unrestricted_Access            : constant Name_Id := N + 484; -- GNAT
-   Name_VADS_Size                      : constant Name_Id := N + 485; -- GNAT
-   Name_Val                            : constant Name_Id := N + 486;
-   Name_Valid                          : constant Name_Id := N + 487;
-   Name_Value_Size                     : constant Name_Id := N + 488; -- GNAT
-   Name_Version                        : constant Name_Id := N + 489;
-   Name_Wchar_T_Size                   : constant Name_Id := N + 490; -- GNAT
-   Name_Wide_Wide_Width                : constant Name_Id := N + 491; -- Ada 05
-   Name_Wide_Width                     : constant Name_Id := N + 492;
-   Name_Width                          : constant Name_Id := N + 493;
-   Name_Word_Size                      : constant Name_Id := N + 494; -- GNAT
+   First_Attribute_Name                : constant Name_Id := N + 379;
+   Name_Abort_Signal                   : constant Name_Id := N + 379; -- GNAT
+   Name_Access                         : constant Name_Id := N + 380;
+   Name_Address                        : constant Name_Id := N + 381;
+   Name_Address_Size                   : constant Name_Id := N + 382; -- GNAT
+   Name_Aft                            : constant Name_Id := N + 383;
+   Name_Alignment                      : constant Name_Id := N + 384;
+   Name_Asm_Input                      : constant Name_Id := N + 385; -- GNAT
+   Name_Asm_Output                     : constant Name_Id := N + 386; -- GNAT
+   Name_AST_Entry                      : constant Name_Id := N + 387; -- VMS
+   Name_Bit                            : constant Name_Id := N + 388; -- GNAT
+   Name_Bit_Order                      : constant Name_Id := N + 389;
+   Name_Bit_Position                   : constant Name_Id := N + 390; -- GNAT
+   Name_Body_Version                   : constant Name_Id := N + 391;
+   Name_Callable                       : constant Name_Id := N + 392;
+   Name_Caller                         : constant Name_Id := N + 393;
+   Name_Code_Address                   : constant Name_Id := N + 394; -- GNAT
+   Name_Component_Size                 : constant Name_Id := N + 395;
+   Name_Compose                        : constant Name_Id := N + 396;
+   Name_Constrained                    : constant Name_Id := N + 397;
+   Name_Count                          : constant Name_Id := N + 398;
+   Name_Default_Bit_Order              : constant Name_Id := N + 399; -- GNAT
+   Name_Definite                       : constant Name_Id := N + 400;
+   Name_Delta                          : constant Name_Id := N + 401;
+   Name_Denorm                         : constant Name_Id := N + 402;
+   Name_Digits                         : constant Name_Id := N + 403;
+   Name_Elaborated                     : constant Name_Id := N + 404; -- GNAT
+   Name_Emax                           : constant Name_Id := N + 405; -- Ada 83
+   Name_Enabled                        : constant Name_Id := N + 406; -- GNAT
+   Name_Enum_Rep                       : constant Name_Id := N + 407; -- GNAT
+   Name_Enum_Val                       : constant Name_Id := N + 408; -- GNAT
+   Name_Epsilon                        : constant Name_Id := N + 409; -- Ada 83
+   Name_Exponent                       : constant Name_Id := N + 410;
+   Name_External_Tag                   : constant Name_Id := N + 411;
+   Name_Fast_Math                      : constant Name_Id := N + 412; -- GNAT
+   Name_First                          : constant Name_Id := N + 413;
+   Name_First_Bit                      : constant Name_Id := N + 414;
+   Name_Fixed_Value                    : constant Name_Id := N + 415; -- GNAT
+   Name_Fore                           : constant Name_Id := N + 416;
+   Name_Has_Access_Values              : constant Name_Id := N + 417; -- GNAT
+   Name_Has_Discriminants              : constant Name_Id := N + 418; -- GNAT
+   Name_Has_Tagged_Values              : constant Name_Id := N + 419; -- GNAT
+   Name_Identity                       : constant Name_Id := N + 420;
+   Name_Img                            : constant Name_Id := N + 421; -- GNAT
+   Name_Integer_Value                  : constant Name_Id := N + 422; -- GNAT
+   Name_Invalid_Value                  : constant Name_Id := N + 423; -- GNAT
+   Name_Large                          : constant Name_Id := N + 424; -- Ada 83
+   Name_Last                           : constant Name_Id := N + 425;
+   Name_Last_Bit                       : constant Name_Id := N + 426;
+   Name_Leading_Part                   : constant Name_Id := N + 427;
+   Name_Length                         : constant Name_Id := N + 428;
+   Name_Machine_Emax                   : constant Name_Id := N + 429;
+   Name_Machine_Emin                   : constant Name_Id := N + 430;
+   Name_Machine_Mantissa               : constant Name_Id := N + 431;
+   Name_Machine_Overflows              : constant Name_Id := N + 432;
+   Name_Machine_Radix                  : constant Name_Id := N + 433;
+   Name_Machine_Rounding               : constant Name_Id := N + 434; -- Ada 05
+   Name_Machine_Rounds                 : constant Name_Id := N + 435;
+   Name_Machine_Size                   : constant Name_Id := N + 436; -- GNAT
+   Name_Mantissa                       : constant Name_Id := N + 437; -- Ada 83
+   Name_Max_Size_In_Storage_Elements   : constant Name_Id := N + 438;
+   Name_Maximum_Alignment              : constant Name_Id := N + 439; -- GNAT
+   Name_Mechanism_Code                 : constant Name_Id := N + 440; -- GNAT
+   Name_Mod                            : constant Name_Id := N + 441; -- Ada 05
+   Name_Model_Emin                     : constant Name_Id := N + 442;
+   Name_Model_Epsilon                  : constant Name_Id := N + 443;
+   Name_Model_Mantissa                 : constant Name_Id := N + 444;
+   Name_Model_Small                    : constant Name_Id := N + 445;
+   Name_Modulus                        : constant Name_Id := N + 446;
+   Name_Null_Parameter                 : constant Name_Id := N + 447; -- GNAT
+   Name_Object_Size                    : constant Name_Id := N + 448; -- GNAT
+   Name_Old                            : constant Name_Id := N + 449; -- GNAT
+   Name_Partition_ID                   : constant Name_Id := N + 450;
+   Name_Passed_By_Reference            : constant Name_Id := N + 451; -- GNAT
+   Name_Pool_Address                   : constant Name_Id := N + 452;
+   Name_Pos                            : constant Name_Id := N + 453;
+   Name_Position                       : constant Name_Id := N + 454;
+   Name_Priority                       : constant Name_Id := N + 455; -- Ada 05
+   Name_Range                          : constant Name_Id := N + 456;
+   Name_Range_Length                   : constant Name_Id := N + 457; -- GNAT
+   Name_Result                         : constant Name_Id := N + 458; -- GNAT
+   Name_Round                          : constant Name_Id := N + 459;
+   Name_Safe_Emax                      : constant Name_Id := N + 460; -- Ada 83
+   Name_Safe_First                     : constant Name_Id := N + 461;
+   Name_Safe_Large                     : constant Name_Id := N + 462; -- Ada 83
+   Name_Safe_Last                      : constant Name_Id := N + 463;
+   Name_Safe_Small                     : constant Name_Id := N + 464; -- Ada 83
+   Name_Scale                          : constant Name_Id := N + 465;
+   Name_Scaling                        : constant Name_Id := N + 466;
+   Name_Signed_Zeros                   : constant Name_Id := N + 467;
+   Name_Size                           : constant Name_Id := N + 468;
+   Name_Small                          : constant Name_Id := N + 469;
+   Name_Storage_Size                   : constant Name_Id := N + 470;
+   Name_Storage_Unit                   : constant Name_Id := N + 471; -- GNAT
+   Name_Stream_Size                    : constant Name_Id := N + 472; -- Ada 05
+   Name_Tag                            : constant Name_Id := N + 473;
+   Name_Target_Name                    : constant Name_Id := N + 474; -- GNAT
+   Name_Terminated                     : constant Name_Id := N + 475;
+   Name_To_Address                     : constant Name_Id := N + 476; -- GNAT
+   Name_Type_Class                     : constant Name_Id := N + 477; -- GNAT
+   Name_UET_Address                    : constant Name_Id := N + 478; -- GNAT
+   Name_Unbiased_Rounding              : constant Name_Id := N + 479;
+   Name_Unchecked_Access               : constant Name_Id := N + 480;
+   Name_Unconstrained_Array            : constant Name_Id := N + 481;
+   Name_Universal_Literal_String       : constant Name_Id := N + 482; -- GNAT
+   Name_Unrestricted_Access            : constant Name_Id := N + 483; -- GNAT
+   Name_VADS_Size                      : constant Name_Id := N + 484; -- GNAT
+   Name_Val                            : constant Name_Id := N + 485;
+   Name_Valid                          : constant Name_Id := N + 486;
+   Name_Value_Size                     : constant Name_Id := N + 487; -- GNAT
+   Name_Version                        : constant Name_Id := N + 488;
+   Name_Wchar_T_Size                   : constant Name_Id := N + 489; -- GNAT
+   Name_Wide_Wide_Width                : constant Name_Id := N + 490; -- Ada 05
+   Name_Wide_Width                     : constant Name_Id := N + 491;
+   Name_Width                          : constant Name_Id := N + 492;
+   Name_Word_Size                      : constant Name_Id := N + 493; -- 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 + 495;
-   Name_Adjacent                       : constant Name_Id := N + 495;
-   Name_Ceiling                        : constant Name_Id := N + 496;
-   Name_Copy_Sign                      : constant Name_Id := N + 497;
-   Name_Floor                          : constant Name_Id := N + 498;
-   Name_Fraction                       : constant Name_Id := N + 499;
-   Name_Image                          : constant Name_Id := N + 500;
-   Name_Input                          : constant Name_Id := N + 501;
-   Name_Machine                        : constant Name_Id := N + 502;
-   Name_Max                            : constant Name_Id := N + 503;
-   Name_Min                            : constant Name_Id := N + 504;
-   Name_Model                          : constant Name_Id := N + 505;
-   Name_Pred                           : constant Name_Id := N + 506;
-   Name_Remainder                      : constant Name_Id := N + 507;
-   Name_Rounding                       : constant Name_Id := N + 508;
-   Name_Succ                           : constant Name_Id := N + 509;
-   Name_Truncation                     : constant Name_Id := N + 510;
-   Name_Value                          : constant Name_Id := N + 511;
-   Name_Wide_Image                     : constant Name_Id := N + 512;
-   Name_Wide_Wide_Image                : constant Name_Id := N + 513;
-   Name_Wide_Value                     : constant Name_Id := N + 514;
-   Name_Wide_Wide_Value                : constant Name_Id := N + 515;
-   Last_Renamable_Function_Attribute   : constant Name_Id := N + 515;
+   First_Renamable_Function_Attribute  : constant Name_Id := N + 494;
+   Name_Adjacent                       : constant Name_Id := N + 494;
+   Name_Ceiling                        : constant Name_Id := N + 495;
+   Name_Copy_Sign                      : constant Name_Id := N + 496;
+   Name_Floor                          : constant Name_Id := N + 497;
+   Name_Fraction                       : constant Name_Id := N + 498;
+   Name_Image                          : constant Name_Id := N + 499;
+   Name_Input                          : constant Name_Id := N + 500;
+   Name_Machine                        : constant Name_Id := N + 501;
+   Name_Max                            : constant Name_Id := N + 502;
+   Name_Min                            : constant Name_Id := N + 503;
+   Name_Model                          : constant Name_Id := N + 504;
+   Name_Pred                           : constant Name_Id := N + 505;
+   Name_Remainder                      : constant Name_Id := N + 506;
+   Name_Rounding                       : constant Name_Id := N + 507;
+   Name_Succ                           : constant Name_Id := N + 508;
+   Name_Truncation                     : constant Name_Id := N + 509;
+   Name_Value                          : constant Name_Id := N + 510;
+   Name_Wide_Image                     : constant Name_Id := N + 511;
+   Name_Wide_Wide_Image                : constant Name_Id := N + 512;
+   Name_Wide_Value                     : constant Name_Id := N + 513;
+   Name_Wide_Wide_Value                : constant Name_Id := N + 514;
+   Last_Renamable_Function_Attribute   : constant Name_Id := N + 514;
 
    --  Attributes that designate procedures
 
-   First_Procedure_Attribute           : constant Name_Id := N + 516;
-   Name_Output                         : constant Name_Id := N + 516;
-   Name_Read                           : constant Name_Id := N + 517;
-   Name_Write                          : constant Name_Id := N + 518;
-   Last_Procedure_Attribute            : constant Name_Id := N + 518;
+   First_Procedure_Attribute           : constant Name_Id := N + 515;
+   Name_Output                         : constant Name_Id := N + 515;
+   Name_Read                           : constant Name_Id := N + 516;
+   Name_Write                          : constant Name_Id := N + 517;
+   Last_Procedure_Attribute            : constant Name_Id := N + 517;
 
    --  Remaining attributes are ones that return entities
 
-   First_Entity_Attribute_Name         : constant Name_Id := N + 519;
-   Name_Elab_Body                      : constant Name_Id := N + 519; -- GNAT
-   Name_Elab_Spec                      : constant Name_Id := N + 520; -- GNAT
-   Name_Storage_Pool                   : constant Name_Id := N + 521;
+   First_Entity_Attribute_Name         : constant Name_Id := N + 518;
+   Name_Elab_Body                      : constant Name_Id := N + 518; -- GNAT
+   Name_Elab_Spec                      : constant Name_Id := N + 519; -- GNAT
+   Name_Storage_Pool                   : constant Name_Id := N + 520;
 
    --  These attributes are the ones that return types
 
-   First_Type_Attribute_Name           : constant Name_Id := N + 522;
-   Name_Base                           : constant Name_Id := N + 522;
-   Name_Class                          : constant Name_Id := N + 523;
-   Name_Stub_Type                      : constant Name_Id := N + 524;
-   Last_Type_Attribute_Name            : constant Name_Id := N + 524;
-   Last_Entity_Attribute_Name          : constant Name_Id := N + 524;
-   Last_Attribute_Name                 : constant Name_Id := N + 524;
+   First_Type_Attribute_Name           : constant Name_Id := N + 521;
+   Name_Base                           : constant Name_Id := N + 521;
+   Name_Class                          : constant Name_Id := N + 522;
+   Name_Stub_Type                      : constant Name_Id := N + 523;
+   Last_Type_Attribute_Name            : constant Name_Id := N + 523;
+   Last_Entity_Attribute_Name          : constant Name_Id := N + 523;
+   Last_Attribute_Name                 : constant Name_Id := N + 523;
 
    --  Names of recognized locking policy identifiers
 
@@ -855,10 +854,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 + 525;
-   Name_Ceiling_Locking                : constant Name_Id := N + 525;
-   Name_Inheritance_Locking            : constant Name_Id := N + 526;
-   Last_Locking_Policy_Name            : constant Name_Id := N + 526;
+   First_Locking_Policy_Name           : constant Name_Id := N + 524;
+   Name_Ceiling_Locking                : constant Name_Id := N + 524;
+   Name_Inheritance_Locking            : constant Name_Id := N + 525;
+   Last_Locking_Policy_Name            : constant Name_Id := N + 525;
 
    --  Names of recognized queuing policy identifiers
 
@@ -866,10 +865,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 + 527;
-   Name_FIFO_Queuing                   : constant Name_Id := N + 527;
-   Name_Priority_Queuing               : constant Name_Id := N + 528;
-   Last_Queuing_Policy_Name            : constant Name_Id := N + 528;
+   First_Queuing_Policy_Name           : constant Name_Id := N + 526;
+   Name_FIFO_Queuing                   : constant Name_Id := N + 526;
+   Name_Priority_Queuing               : constant Name_Id := N + 527;
+   Last_Queuing_Policy_Name            : constant Name_Id := N + 527;
 
    --  Names of recognized task dispatching policy identifiers
 
@@ -877,284 +876,284 @@ 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 + 529;
-   Name_EDF_Across_Priorities            : constant Name_Id := N + 529;
-   Name_FIFO_Within_Priorities           : constant Name_Id := N + 530;
-   Name_Non_Preemptive_Within_Priorities : constant Name_Id := N + 531;
-   Name_Round_Robin_Within_Priorities    : constant Name_Id := N + 532;
-   Last_Task_Dispatching_Policy_Name     : constant Name_Id := N + 532;
+   First_Task_Dispatching_Policy_Name    : constant Name_Id := N + 528;
+   Name_EDF_Across_Priorities            : constant Name_Id := N + 528;
+   Name_FIFO_Within_Priorities           : constant Name_Id := N + 529;
+   Name_Non_Preemptive_Within_Priorities : constant Name_Id := N + 530;
+   Name_Round_Robin_Within_Priorities    : constant Name_Id := N + 531;
+   Last_Task_Dispatching_Policy_Name     : constant Name_Id := N + 531;
 
    --  Names of recognized checks for pragma Suppress
 
-   First_Check_Name                    : constant Name_Id := N + 533;
-   Name_Access_Check                   : constant Name_Id := N + 533;
-   Name_Accessibility_Check            : constant Name_Id := N + 534;
-   Name_Alignment_Check                : constant Name_Id := N + 535; -- GNAT
-   Name_Discriminant_Check             : constant Name_Id := N + 536;
-   Name_Division_Check                 : constant Name_Id := N + 537;
-   Name_Elaboration_Check              : constant Name_Id := N + 538;
-   Name_Index_Check                    : constant Name_Id := N + 539;
-   Name_Length_Check                   : constant Name_Id := N + 540;
-   Name_Overflow_Check                 : constant Name_Id := N + 541;
-   Name_Range_Check                    : constant Name_Id := N + 542;
-   Name_Storage_Check                  : constant Name_Id := N + 543;
-   Name_Tag_Check                      : constant Name_Id := N + 544;
-   Name_Validity_Check                 : constant Name_Id := N + 545; -- GNAT
-   Name_All_Checks                     : constant Name_Id := N + 546;
-   Last_Check_Name                     : constant Name_Id := N + 546;
+   First_Check_Name                    : constant Name_Id := N + 532;
+   Name_Access_Check                   : constant Name_Id := N + 532;
+   Name_Accessibility_Check            : constant Name_Id := N + 533;
+   Name_Alignment_Check                : constant Name_Id := N + 534; -- GNAT
+   Name_Discriminant_Check             : constant Name_Id := N + 535;
+   Name_Division_Check                 : constant Name_Id := N + 536;
+   Name_Elaboration_Check              : constant Name_Id := N + 537;
+   Name_Index_Check                    : constant Name_Id := N + 538;
+   Name_Length_Check                   : constant Name_Id := N + 539;
+   Name_Overflow_Check                 : constant Name_Id := N + 540;
+   Name_Range_Check                    : constant Name_Id := N + 541;
+   Name_Storage_Check                  : constant Name_Id := N + 542;
+   Name_Tag_Check                      : constant Name_Id := N + 543;
+   Name_Validity_Check                 : constant Name_Id := N + 544; -- GNAT
+   Name_All_Checks                     : constant Name_Id := N + 545;
+   Last_Check_Name                     : constant Name_Id := N + 545;
 
    --  Names corresponding to reserved keywords, excluding those already
    --  declared in the attribute list (Access, Delta, Digits, Mod, Range).
 
-   Name_Abort                          : constant Name_Id := N + 547;
-   Name_Abs                            : constant Name_Id := N + 548;
-   Name_Accept                         : constant Name_Id := N + 549;
-   Name_And                            : constant Name_Id := N + 550;
-   Name_All                            : constant Name_Id := N + 551;
-   Name_Array                          : constant Name_Id := N + 552;
-   Name_At                             : constant Name_Id := N + 553;
-   Name_Begin                          : constant Name_Id := N + 554;
-   Name_Body                           : constant Name_Id := N + 555;
-   Name_Case                           : constant Name_Id := N + 556;
-   Name_Constant                       : constant Name_Id := N + 557;
-   Name_Declare                        : constant Name_Id := N + 558;
-   Name_Delay                          : constant Name_Id := N + 559;
-   Name_Do                             : constant Name_Id := N + 560;
-   Name_Else                           : constant Name_Id := N + 561;
-   Name_Elsif                          : constant Name_Id := N + 562;
-   Name_End                            : constant Name_Id := N + 563;
-   Name_Entry                          : constant Name_Id := N + 564;
-   Name_Exception                      : constant Name_Id := N + 565;
-   Name_Exit                           : constant Name_Id := N + 566;
-   Name_For                            : constant Name_Id := N + 567;
-   Name_Function                       : constant Name_Id := N + 568;
-   Name_Generic                        : constant Name_Id := N + 569;
-   Name_Goto                           : constant Name_Id := N + 570;
-   Name_If                             : constant Name_Id := N + 571;
-   Name_In                             : constant Name_Id := N + 572;
-   Name_Is                             : constant Name_Id := N + 573;
-   Name_Limited                        : constant Name_Id := N + 574;
-   Name_Loop                           : constant Name_Id := N + 575;
-   Name_New                            : constant Name_Id := N + 576;
-   Name_Not                            : constant Name_Id := N + 577;
-   Name_Null                           : constant Name_Id := N + 578;
-   Name_Of                             : constant Name_Id := N + 579;
-   Name_Or                             : constant Name_Id := N + 580;
-   Name_Others                         : constant Name_Id := N + 581;
-   Name_Out                            : constant Name_Id := N + 582;
-   Name_Package                        : constant Name_Id := N + 583;
-   Name_Pragma                         : constant Name_Id := N + 584;
-   Name_Private                        : constant Name_Id := N + 585;
-   Name_Procedure                      : constant Name_Id := N + 586;
-   Name_Raise                          : constant Name_Id := N + 587;
-   Name_Record                         : constant Name_Id := N + 588;
-   Name_Rem                            : constant Name_Id := N + 589;
-   Name_Renames                        : constant Name_Id := N + 590;
-   Name_Return                         : constant Name_Id := N + 591;
-   Name_Reverse                        : constant Name_Id := N + 592;
-   Name_Select                         : constant Name_Id := N + 593;
-   Name_Separate                       : constant Name_Id := N + 594;
-   Name_Subtype                        : constant Name_Id := N + 595;
-   Name_Task                           : constant Name_Id := N + 596;
-   Name_Terminate                      : constant Name_Id := N + 597;
-   Name_Then                           : constant Name_Id := N + 598;
-   Name_Type                           : constant Name_Id := N + 599;
-   Name_Use                            : constant Name_Id := N + 600;
-   Name_When                           : constant Name_Id := N + 601;
-   Name_While                          : constant Name_Id := N + 602;
-   Name_With                           : constant Name_Id := N + 603;
-   Name_Xor                            : constant Name_Id := N + 604;
+   Name_Abort                          : constant Name_Id := N + 546;
+   Name_Abs                            : constant Name_Id := N + 547;
+   Name_Accept                         : constant Name_Id := N + 548;
+   Name_And                            : constant Name_Id := N + 549;
+   Name_All                            : constant Name_Id := N + 550;
+   Name_Array                          : constant Name_Id := N + 551;
+   Name_At                             : constant Name_Id := N + 552;
+   Name_Begin                          : constant Name_Id := N + 553;
+   Name_Body                           : constant Name_Id := N + 554;
+   Name_Case                           : constant Name_Id := N + 555;
+   Name_Constant                       : constant Name_Id := N + 556;
+   Name_Declare                        : constant Name_Id := N + 557;
+   Name_Delay                          : constant Name_Id := N + 558;
+   Name_Do                             : constant Name_Id := N + 559;
+   Name_Else                           : constant Name_Id := N + 560;
+   Name_Elsif                          : constant Name_Id := N + 561;
+   Name_End                            : constant Name_Id := N + 562;
+   Name_Entry                          : constant Name_Id := N + 563;
+   Name_Exception                      : constant Name_Id := N + 564;
+   Name_Exit                           : constant Name_Id := N + 565;
+   Name_For                            : constant Name_Id := N + 566;
+   Name_Function                       : constant Name_Id := N + 567;
+   Name_Generic                        : constant Name_Id := N + 568;
+   Name_Goto                           : constant Name_Id := N + 569;
+   Name_If                             : constant Name_Id := N + 570;
+   Name_In                             : constant Name_Id := N + 571;
+   Name_Is                             : constant Name_Id := N + 572;
+   Name_Limited                        : constant Name_Id := N + 573;
+   Name_Loop                           : constant Name_Id := N + 574;
+   Name_New                            : constant Name_Id := N + 575;
+   Name_Not                            : constant Name_Id := N + 576;
+   Name_Null                           : constant Name_Id := N + 577;
+   Name_Of                             : constant Name_Id := N + 578;
+   Name_Or                             : constant Name_Id := N + 579;
+   Name_Others                         : constant Name_Id := N + 580;
+   Name_Out                            : constant Name_Id := N + 581;
+   Name_Package                        : constant Name_Id := N + 582;
+   Name_Pragma                         : constant Name_Id := N + 583;
+   Name_Private                        : constant Name_Id := N + 584;
+   Name_Procedure                      : constant Name_Id := N + 585;
+   Name_Raise                          : constant Name_Id := N + 586;
+   Name_Record                         : constant Name_Id := N + 587;
+   Name_Rem                            : constant Name_Id := N + 588;
+   Name_Renames                        : constant Name_Id := N + 589;
+   Name_Return                         : constant Name_Id := N + 590;
+   Name_Reverse                        : constant Name_Id := N + 591;
+   Name_Select                         : constant Name_Id := N + 592;
+   Name_Separate                       : constant Name_Id := N + 593;
+   Name_Subtype                        : constant Name_Id := N + 594;
+   Name_Task                           : constant Name_Id := N + 595;
+   Name_Terminate                      : constant Name_Id := N + 596;
+   Name_Then                           : constant Name_Id := N + 597;
+   Name_Type                           : constant Name_Id := N + 598;
+   Name_Use                            : constant Name_Id := N + 599;
+   Name_When                           : constant Name_Id := N + 600;
+   Name_While                          : constant Name_Id := N + 601;
+   Name_With                           : constant Name_Id := N + 602;
+   Name_Xor                            : constant Name_Id := N + 603;
 
    --  Names of intrinsic subprograms
 
    --  Note: Asm is missing from this list, since Asm is a legitimate
    --  convention name. So is To_Address, which is a GNAT attribute.
 
-   First_Intrinsic_Name                 : constant Name_Id := N + 605;
-   Name_Divide                          : constant Name_Id := N + 605;
-   Name_Enclosing_Entity                : constant Name_Id := N + 606;
-   Name_Exception_Information           : constant Name_Id := N + 607;
-   Name_Exception_Message               : constant Name_Id := N + 608;
-   Name_Exception_Name                  : constant Name_Id := N + 609;
-   Name_File                            : constant Name_Id := N + 610;
-   Name_Generic_Dispatching_Constructor : constant Name_Id := N + 611;
-   Name_Import_Address                  : constant Name_Id := N + 612;
-   Name_Import_Largest_Value            : constant Name_Id := N + 613;
-   Name_Import_Value                    : constant Name_Id := N + 614;
-   Name_Is_Negative                     : constant Name_Id := N + 615;
-   Name_Line                            : constant Name_Id := N + 616;
-   Name_Rotate_Left                     : constant Name_Id := N + 617;
-   Name_Rotate_Right                    : constant Name_Id := N + 618;
-   Name_Shift_Left                      : constant Name_Id := N + 619;
-   Name_Shift_Right                     : constant Name_Id := N + 620;
-   Name_Shift_Right_Arithmetic          : constant Name_Id := N + 621;
-   Name_Source_Location                 : constant Name_Id := N + 622;
-   Name_Unchecked_Conversion            : constant Name_Id := N + 623;
-   Name_Unchecked_Deallocation          : constant Name_Id := N + 624;
-   Name_To_Pointer                      : constant Name_Id := N + 625;
-   Last_Intrinsic_Name                  : constant Name_Id := N + 625;
+   First_Intrinsic_Name                 : constant Name_Id := N + 604;
+   Name_Divide                          : constant Name_Id := N + 604;
+   Name_Enclosing_Entity                : constant Name_Id := N + 605;
+   Name_Exception_Information           : constant Name_Id := N + 606;
+   Name_Exception_Message               : constant Name_Id := N + 607;
+   Name_Exception_Name                  : constant Name_Id := N + 608;
+   Name_File                            : constant Name_Id := N + 609;
+   Name_Generic_Dispatching_Constructor : constant Name_Id := N + 610;
+   Name_Import_Address                  : constant Name_Id := N + 611;
+   Name_Import_Largest_Value            : constant Name_Id := N + 612;
+   Name_Import_Value                    : constant Name_Id := N + 613;
+   Name_Is_Negative                     : constant Name_Id := N + 614;
+   Name_Line                            : constant Name_Id := N + 615;
+   Name_Rotate_Left                     : constant Name_Id := N + 616;
+   Name_Rotate_Right                    : constant Name_Id := N + 617;
+   Name_Shift_Left                      : constant Name_Id := N + 618;
+   Name_Shift_Right                     : constant Name_Id := N + 619;
+   Name_Shift_Right_Arithmetic          : constant Name_Id := N + 620;
+   Name_Source_Location                 : constant Name_Id := N + 621;
+   Name_Unchecked_Conversion            : constant Name_Id := N + 622;
+   Name_Unchecked_Deallocation          : constant Name_Id := N + 623;
+   Name_To_Pointer                      : constant Name_Id := N + 624;
+   Last_Intrinsic_Name                  : constant Name_Id := N + 624;
 
    --  Names used in processing intrinsic calls
 
-   Name_Free                           : constant Name_Id := N + 626;
+   Name_Free                           : constant Name_Id := N + 625;
 
    --  Reserved words used only in Ada 95
 
-   First_95_Reserved_Word              : constant Name_Id := N + 627;
-   Name_Abstract                       : constant Name_Id := N + 627;
-   Name_Aliased                        : constant Name_Id := N + 628;
-   Name_Protected                      : constant Name_Id := N + 629;
-   Name_Until                          : constant Name_Id := N + 630;
-   Name_Requeue                        : constant Name_Id := N + 631;
-   Name_Tagged                         : constant Name_Id := N + 632;
-   Last_95_Reserved_Word               : constant Name_Id := N + 632;
+   First_95_Reserved_Word              : constant Name_Id := N + 626;
+   Name_Abstract                       : constant Name_Id := N + 626;
+   Name_Aliased                        : constant Name_Id := N + 627;
+   Name_Protected                      : constant Name_Id := N + 628;
+   Name_Until                          : constant Name_Id := N + 629;
+   Name_Requeue                        : constant Name_Id := N + 630;
+   Name_Tagged                         : constant Name_Id := N + 631;
+   Last_95_Reserved_Word               : constant Name_Id := N + 631;
 
    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 + 633;
+   Name_Raise_Exception                : constant Name_Id := N + 632;
 
    --  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 + 634;
-   Name_Aggregate                      : constant Name_Id := N + 635;
-   Name_Archive_Builder                : constant Name_Id := N + 636;
-   Name_Archive_Builder_Append_Option  : constant Name_Id := N + 637;
-   Name_Archive_Indexer                : constant Name_Id := N + 638;
-   Name_Archive_Suffix                 : constant Name_Id := N + 639;
-   Name_Binder                         : constant Name_Id := N + 640;
-   Name_Binder_Prefix                  : constant Name_Id := N + 641;
-   Name_Body_Suffix                    : constant Name_Id := N + 642;
-   Name_Builder                        : constant Name_Id := N + 643;
-   Name_Builder_Switches               : constant Name_Id := N + 644;
-   Name_Compiler                       : constant Name_Id := N + 645;
-   Name_Compiler_Kind                  : constant Name_Id := N + 646;
-   Name_Config_Body_File_Name          : constant Name_Id := N + 647;
-   Name_Config_Body_File_Name_Pattern  : constant Name_Id := N + 648;
-   Name_Config_File_Switches           : constant Name_Id := N + 649;
-   Name_Config_File_Unique             : constant Name_Id := N + 650;
-   Name_Config_Spec_File_Name          : constant Name_Id := N + 651;
-   Name_Config_Spec_File_Name_Pattern  : constant Name_Id := N + 652;
-   Name_Configuration                  : constant Name_Id := N + 653;
-   Name_Cross_Reference                : constant Name_Id := N + 654;
-   Name_Default_Language               : constant Name_Id := N + 655;
-   Name_Default_Switches               : constant Name_Id := N + 656;
-   Name_Dependency_Driver              : constant Name_Id := N + 657;
-   Name_Dependency_File_Kind           : constant Name_Id := N + 658;
-   Name_Dependency_Switches            : constant Name_Id := N + 659;
-   Name_Driver                         : constant Name_Id := N + 660;
-   Name_Excluded_Source_Dirs           : constant Name_Id := N + 661;
-   Name_Excluded_Source_Files          : constant Name_Id := N + 662;
-   Name_Excluded_Source_List_File      : constant Name_Id := N + 663;
-   Name_Exec_Dir                       : constant Name_Id := N + 664;
-   Name_Executable                     : constant Name_Id := N + 665;
-   Name_Executable_Suffix              : constant Name_Id := N + 666;
-   Name_Extends                        : constant Name_Id := N + 667;
-   Name_Externally_Built               : constant Name_Id := N + 668;
-   Name_Finder                         : constant Name_Id := N + 669;
-   Name_Global_Configuration_Pragmas   : constant Name_Id := N + 670;
-   Name_Global_Config_File             : constant Name_Id := N + 671;
-   Name_Gnatls                         : constant Name_Id := N + 672;
-   Name_Gnatstub                       : constant Name_Id := N + 673;
-   Name_Implementation                 : constant Name_Id := N + 674;
-   Name_Implementation_Exceptions      : constant Name_Id := N + 675;
-   Name_Implementation_Suffix          : constant Name_Id := N + 676;
-   Name_Include_Switches               : constant Name_Id := N + 677;
-   Name_Include_Path                   : constant Name_Id := N + 678;
-   Name_Include_Path_File              : constant Name_Id := N + 679;
-   Name_Inherit_Source_Path            : constant Name_Id := N + 680;
-   Name_Language_Kind                  : constant Name_Id := N + 681;
-   Name_Language_Processing            : constant Name_Id := N + 682;
-   Name_Languages                      : constant Name_Id := N + 683;
-   Name_Library                        : constant Name_Id := N + 684;
-   Name_Library_Ali_Dir                : constant Name_Id := N + 685;
-   Name_Library_Auto_Init              : constant Name_Id := N + 686;
-   Name_Library_Auto_Init_Supported    : constant Name_Id := N + 687;
-   Name_Library_Builder                : constant Name_Id := N + 688;
-   Name_Library_Dir                    : constant Name_Id := N + 689;
-   Name_Library_GCC                    : constant Name_Id := N + 690;
-   Name_Library_Interface              : constant Name_Id := N + 691;
-   Name_Library_Kind                   : constant Name_Id := N + 692;
-   Name_Library_Name                   : constant Name_Id := N + 693;
-   Name_Library_Major_Minor_Id_Supported : constant Name_Id := N + 694;
-   Name_Library_Options                : constant Name_Id := N + 695;
-   Name_Library_Partial_Linker         : constant Name_Id := N + 696;
-   Name_Library_Reference_Symbol_File  : constant Name_Id := N + 697;
-   Name_Library_Src_Dir                : constant Name_Id := N + 698;
-   Name_Library_Support                : constant Name_Id := N + 699;
-   Name_Library_Symbol_File            : constant Name_Id := N + 700;
-   Name_Library_Symbol_Policy          : constant Name_Id := N + 701;
-   Name_Library_Version                : constant Name_Id := N + 702;
-   Name_Library_Version_Switches       : constant Name_Id := N + 703;
-   Name_Linker                         : constant Name_Id := N + 704;
-   Name_Linker_Executable_Option       : constant Name_Id := N + 705;
-   Name_Linker_Lib_Dir_Option          : constant Name_Id := N + 706;
-   Name_Linker_Lib_Name_Option         : constant Name_Id := N + 707;
-   Name_Local_Config_File              : constant Name_Id := N + 708;
-   Name_Local_Configuration_Pragmas    : constant Name_Id := N + 709;
-   Name_Locally_Removed_Files          : constant Name_Id := N + 710;
-   Name_Map_File_Option                : constant Name_Id := N + 711;
-   Name_Mapping_File_Switches          : constant Name_Id := N + 712;
-   Name_Mapping_Spec_Suffix            : constant Name_Id := N + 713;
-   Name_Mapping_Body_Suffix            : constant Name_Id := N + 714;
-   Name_Metrics                        : constant Name_Id := N + 715;
-   Name_Naming                         : constant Name_Id := N + 716;
-   Name_Object_Generated               : constant Name_Id := N + 717;
-   Name_Objects_Linked                 : constant Name_Id := N + 718;
-   Name_Objects_Path                   : constant Name_Id := N + 719;
-   Name_Objects_Path_File              : constant Name_Id := N + 720;
-   Name_Object_Dir                     : constant Name_Id := N + 721;
-   Name_Path_Syntax                    : constant Name_Id := N + 722;
-   Name_Pic_Option                     : constant Name_Id := N + 723;
-   Name_Pretty_Printer                 : constant Name_Id := N + 724;
-   Name_Prefix                         : constant Name_Id := N + 725;
-   Name_Project                        : constant Name_Id := N + 726;
-   Name_Roots                          : constant Name_Id := N + 727;
-   Name_Required_Switches              : constant Name_Id := N + 728;
-   Name_Run_Path_Option                : constant Name_Id := N + 729;
-   Name_Runtime_Project                : constant Name_Id := N + 730;
-   Name_Shared_Library_Minimum_Switches : constant Name_Id := N + 731;
-   Name_Shared_Library_Prefix          : constant Name_Id := N + 732;
-   Name_Shared_Library_Suffix          : constant Name_Id := N + 733;
-   Name_Separate_Suffix                : constant Name_Id := N + 734;
-   Name_Source_Dirs                    : constant Name_Id := N + 735;
-   Name_Source_Files                   : constant Name_Id := N + 736;
-   Name_Source_List_File               : constant Name_Id := N + 737;
-   Name_Spec                           : constant Name_Id := N + 738;
-   Name_Spec_Suffix                    : constant Name_Id := N + 739;
-   Name_Specification                  : constant Name_Id := N + 740;
-   Name_Specification_Exceptions       : constant Name_Id := N + 741;
-   Name_Specification_Suffix           : constant Name_Id := N + 742;
-   Name_Stack                          : constant Name_Id := N + 743;
-   Name_Switches                       : constant Name_Id := N + 744;
-   Name_Symbolic_Link_Supported        : constant Name_Id := N + 745;
-   Name_Sync                           : constant Name_Id := N + 746;
-   Name_Synchronize                    : constant Name_Id := N + 747;
-   Name_Toolchain_Description          : constant Name_Id := N + 748;
-   Name_Toolchain_Version              : constant Name_Id := N + 749;
-   Name_Runtime_Library_Dir            : constant Name_Id := N + 750;
+   Name_Ada_Roots                      : constant Name_Id := N + 633;
+   Name_Aggregate                      : constant Name_Id := N + 634;
+   Name_Archive_Builder                : constant Name_Id := N + 635;
+   Name_Archive_Builder_Append_Option  : constant Name_Id := N + 636;
+   Name_Archive_Indexer                : constant Name_Id := N + 637;
+   Name_Archive_Suffix                 : constant Name_Id := N + 638;
+   Name_Binder                         : constant Name_Id := N + 639;
+   Name_Binder_Prefix                  : constant Name_Id := N + 640;
+   Name_Body_Suffix                    : constant Name_Id := N + 641;
+   Name_Builder                        : constant Name_Id := N + 642;
+   Name_Builder_Switches               : constant Name_Id := N + 643;
+   Name_Compiler                       : constant Name_Id := N + 644;
+   Name_Compiler_Kind                  : constant Name_Id := N + 645;
+   Name_Config_Body_File_Name          : constant Name_Id := N + 646;
+   Name_Config_Body_File_Name_Pattern  : constant Name_Id := N + 647;
+   Name_Config_File_Switches           : constant Name_Id := N + 648;
+   Name_Config_File_Unique             : constant Name_Id := N + 649;
+   Name_Config_Spec_File_Name          : constant Name_Id := N + 650;
+   Name_Config_Spec_File_Name_Pattern  : constant Name_Id := N + 651;
+   Name_Configuration                  : constant Name_Id := N + 652;
+   Name_Cross_Reference                : constant Name_Id := N + 653;
+   Name_Default_Language               : constant Name_Id := N + 654;
+   Name_Default_Switches               : constant Name_Id := N + 655;
+   Name_Dependency_Driver              : constant Name_Id := N + 656;
+   Name_Dependency_File_Kind           : constant Name_Id := N + 657;
+   Name_Dependency_Switches            : constant Name_Id := N + 658;
+   Name_Driver                         : constant Name_Id := N + 659;
+   Name_Excluded_Source_Dirs           : constant Name_Id := N + 660;
+   Name_Excluded_Source_Files          : constant Name_Id := N + 661;
+   Name_Excluded_Source_List_File      : constant Name_Id := N + 662;
+   Name_Exec_Dir                       : constant Name_Id := N + 663;
+   Name_Executable                     : constant Name_Id := N + 664;
+   Name_Executable_Suffix              : constant Name_Id := N + 665;
+   Name_Extends                        : constant Name_Id := N + 666;
+   Name_Externally_Built               : constant Name_Id := N + 667;
+   Name_Finder                         : constant Name_Id := N + 668;
+   Name_Global_Configuration_Pragmas   : constant Name_Id := N + 669;
+   Name_Global_Config_File             : constant Name_Id := N + 670;
+   Name_Gnatls                         : constant Name_Id := N + 671;
+   Name_Gnatstub                       : constant Name_Id := N + 672;
+   Name_Implementation                 : constant Name_Id := N + 673;
+   Name_Implementation_Exceptions      : constant Name_Id := N + 674;
+   Name_Implementation_Suffix          : constant Name_Id := N + 675;
+   Name_Include_Switches               : constant Name_Id := N + 676;
+   Name_Include_Path                   : constant Name_Id := N + 677;
+   Name_Include_Path_File              : constant Name_Id := N + 678;
+   Name_Inherit_Source_Path            : constant Name_Id := N + 679;
+   Name_Language_Kind                  : constant Name_Id := N + 680;
+   Name_Language_Processing            : constant Name_Id := N + 681;
+   Name_Languages                      : constant Name_Id := N + 682;
+   Name_Library                        : constant Name_Id := N + 683;
+   Name_Library_Ali_Dir                : constant Name_Id := N + 684;
+   Name_Library_Auto_Init              : constant Name_Id := N + 685;
+   Name_Library_Auto_Init_Supported    : constant Name_Id := N + 686;
+   Name_Library_Builder                : constant Name_Id := N + 687;
+   Name_Library_Dir                    : constant Name_Id := N + 688;
+   Name_Library_GCC                    : constant Name_Id := N + 689;
+   Name_Library_Interface              : constant Name_Id := N + 690;
+   Name_Library_Kind                   : constant Name_Id := N + 691;
+   Name_Library_Name                   : constant Name_Id := N + 692;
+   Name_Library_Major_Minor_Id_Supported : constant Name_Id := N + 693;
+   Name_Library_Options                : constant Name_Id := N + 694;
+   Name_Library_Partial_Linker         : constant Name_Id := N + 695;
+   Name_Library_Reference_Symbol_File  : constant Name_Id := N + 696;
+   Name_Library_Src_Dir                : constant Name_Id := N + 697;
+   Name_Library_Support                : constant Name_Id := N + 698;
+   Name_Library_Symbol_File            : constant Name_Id := N + 699;
+   Name_Library_Symbol_Policy          : constant Name_Id := N + 700;
+   Name_Library_Version                : constant Name_Id := N + 701;
+   Name_Library_Version_Switches       : constant Name_Id := N + 702;
+   Name_Linker                         : constant Name_Id := N + 703;
+   Name_Linker_Executable_Option       : constant Name_Id := N + 704;
+   Name_Linker_Lib_Dir_Option          : constant Name_Id := N + 705;
+   Name_Linker_Lib_Name_Option         : constant Name_Id := N + 706;
+   Name_Local_Config_File              : constant Name_Id := N + 707;
+   Name_Local_Configuration_Pragmas    : constant Name_Id := N + 708;
+   Name_Locally_Removed_Files          : constant Name_Id := N + 709;
+   Name_Map_File_Option                : constant Name_Id := N + 710;
+   Name_Mapping_File_Switches          : constant Name_Id := N + 711;
+   Name_Mapping_Spec_Suffix            : constant Name_Id := N + 712;
+   Name_Mapping_Body_Suffix            : constant Name_Id := N + 713;
+   Name_Metrics                        : constant Name_Id := N + 714;
+   Name_Naming                         : constant Name_Id := N + 715;
+   Name_Object_Generated               : constant Name_Id := N + 716;
+   Name_Objects_Linked                 : constant Name_Id := N + 717;
+   Name_Objects_Path                   : constant Name_Id := N + 718;
+   Name_Objects_Path_File              : constant Name_Id := N + 719;
+   Name_Object_Dir                     : constant Name_Id := N + 720;
+   Name_Path_Syntax                    : constant Name_Id := N + 721;
+   Name_Pic_Option                     : constant Name_Id := N + 722;
+   Name_Pretty_Printer                 : constant Name_Id := N + 723;
+   Name_Prefix                         : constant Name_Id := N + 724;
+   Name_Project                        : constant Name_Id := N + 725;
+   Name_Roots                          : constant Name_Id := N + 726;
+   Name_Required_Switches              : constant Name_Id := N + 727;
+   Name_Run_Path_Option                : constant Name_Id := N + 728;
+   Name_Runtime_Project                : constant Name_Id := N + 729;
+   Name_Shared_Library_Minimum_Switches : constant Name_Id := N + 730;
+   Name_Shared_Library_Prefix          : constant Name_Id := N + 731;
+   Name_Shared_Library_Suffix          : constant Name_Id := N + 732;
+   Name_Separate_Suffix                : constant Name_Id := N + 733;
+   Name_Source_Dirs                    : constant Name_Id := N + 734;
+   Name_Source_Files                   : constant Name_Id := N + 735;
+   Name_Source_List_File               : constant Name_Id := N + 736;
+   Name_Spec                           : constant Name_Id := N + 737;
+   Name_Spec_Suffix                    : constant Name_Id := N + 738;
+   Name_Specification                  : constant Name_Id := N + 739;
+   Name_Specification_Exceptions       : constant Name_Id := N + 740;
+   Name_Specification_Suffix           : constant Name_Id := N + 741;
+   Name_Stack                          : constant Name_Id := N + 742;
+   Name_Switches                       : constant Name_Id := N + 743;
+   Name_Symbolic_Link_Supported        : constant Name_Id := N + 744;
+   Name_Sync                           : constant Name_Id := N + 745;
+   Name_Synchronize                    : constant Name_Id := N + 746;
+   Name_Toolchain_Description          : constant Name_Id := N + 747;
+   Name_Toolchain_Version              : constant Name_Id := N + 748;
+   Name_Runtime_Library_Dir            : constant Name_Id := N + 749;
 
    --  Other miscellaneous names used in front end
 
-   Name_Unaligned_Valid                : constant Name_Id := N + 751;
+   Name_Unaligned_Valid                : constant Name_Id := N + 750;
 
    --  Ada 2005 reserved words
 
-   First_2005_Reserved_Word            : constant Name_Id := N + 752;
-   Name_Interface                      : constant Name_Id := N + 752;
-   Name_Overriding                     : constant Name_Id := N + 753;
-   Name_Synchronized                   : constant Name_Id := N + 754;
-   Last_2005_Reserved_Word             : constant Name_Id := N + 754;
+   First_2005_Reserved_Word            : constant Name_Id := N + 751;
+   Name_Interface                      : constant Name_Id := N + 751;
+   Name_Overriding                     : constant Name_Id := N + 752;
+   Name_Synchronized                   : constant Name_Id := N + 753;
+   Last_2005_Reserved_Word             : constant Name_Id := N + 753;
 
    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 + 754;
+   Last_Predefined_Name                : constant Name_Id := N + 753;
 
    ---------------------------------------
    -- Subtypes Defining Name Categories --
@@ -1395,7 +1394,6 @@ package Snames is
       Pragma_Ada_2005,
       Pragma_Assertion_Policy,
       Pragma_C_Pass_By_Copy,
-      Pragma_Canonical_Streams,
       Pragma_Check_Name,
       Pragma_Check_Policy,
       Pragma_Compile_Time_Error,

diff --git a/gcc/ada/snames.h b/gcc/ada/snames.h
index 5c52b59..5724e17 100644 (file)
--- a/gcc/ada/snames.h
+++ b/gcc/ada/snames.h
@@ -227,170 +227,169 @@ extern unsigned char Get_Pragma_Id (int);
 #define  Pragma_Ada_2005                      3
 #define  Pragma_Assertion_Policy              4
 #define  Pragma_C_Pass_By_Copy                5
-#define  Pragma_Canonical_Streams             6
-#define  Pragma_Check_Name                    7
-#define  Pragma_Check_Policy                  8
-#define  Pragma_Compile_Time_Error            9
-#define  Pragma_Compile_Time_Warning          10
-#define  Pragma_Compiler_Unit                 11
-#define  Pragma_Component_Alignment           12
-#define  Pragma_Convention_Identifier         13
-#define  Pragma_Debug_Policy                  14
-#define  Pragma_Detect_Blocking               15
-#define  Pragma_Discard_Names                 16
-#define  Pragma_Elaboration_Checks            17
-#define  Pragma_Eliminate                     18
-#define  Pragma_Extend_System                 19
-#define  Pragma_Extensions_Allowed            20
-#define  Pragma_External_Name_Casing          21
-#define  Pragma_Favor_Top_Level               22
-#define  Pragma_Float_Representation          23
-#define  Pragma_Implicit_Packing              24
-#define  Pragma_Initialize_Scalars            25
-#define  Pragma_Interrupt_State               26
-#define  Pragma_License                       27
-#define  Pragma_Locking_Policy                28
-#define  Pragma_Long_Float                    29
-#define  Pragma_No_Run_Time                   30
-#define  Pragma_No_Strict_Aliasing            31
-#define  Pragma_Normalize_Scalars             32
-#define  Pragma_Optimize_Alignment            33
-#define  Pragma_Persistent_BSS                34
-#define  Pragma_Polling                       35
-#define  Pragma_Priority_Specific_Dispatching 36
-#define  Pragma_Profile                       37
-#define  Pragma_Profile_Warnings              38
-#define  Pragma_Propagate_Exceptions          39
-#define  Pragma_Queuing_Policy                40
-#define  Pragma_Ravenscar                     41
-#define  Pragma_Restricted_Run_Time           42
-#define  Pragma_Restrictions                  43
-#define  Pragma_Restriction_Warnings          44
-#define  Pragma_Reviewable                    45
-#define  Pragma_Source_File_Name              46
-#define  Pragma_Source_File_Name_Project      47
-#define  Pragma_Style_Checks                  48
-#define  Pragma_Suppress                      49
-#define  Pragma_Suppress_Exception_Locations  50
-#define  Pragma_Task_Dispatching_Policy       51
-#define  Pragma_Universal_Data                52
-#define  Pragma_Unsuppress                    53
-#define  Pragma_Use_VADS_Size                 54
-#define  Pragma_Validity_Checks               55
-#define  Pragma_Warnings                      56
-#define  Pragma_Wide_Character_Encoding       57
-#define  Pragma_Abort_Defer                   58
-#define  Pragma_All_Calls_Remote              59
-#define  Pragma_Annotate                      60
-#define  Pragma_Assert                        61
-#define  Pragma_Asynchronous                  62
-#define  Pragma_Atomic                        63
-#define  Pragma_Atomic_Components             64
-#define  Pragma_Attach_Handler                65
-#define  Pragma_Check                         66
-#define  Pragma_CIL_Constructor               67
-#define  Pragma_Comment                       68
-#define  Pragma_Common_Object                 69
-#define  Pragma_Complete_Representation       70
-#define  Pragma_Complex_Representation        71
-#define  Pragma_Controlled                    72
-#define  Pragma_Convention                    73
-#define  Pragma_CPP_Class                     74
-#define  Pragma_CPP_Constructor               75
-#define  Pragma_CPP_Virtual                   76
-#define  Pragma_CPP_Vtable                    77
-#define  Pragma_Debug                         78
-#define  Pragma_Elaborate                     79
-#define  Pragma_Elaborate_All                 80
-#define  Pragma_Elaborate_Body                81
-#define  Pragma_Export                        82
-#define  Pragma_Export_Exception              83
-#define  Pragma_Export_Function               84
-#define  Pragma_Export_Object                 85
-#define  Pragma_Export_Procedure              86
-#define  Pragma_Export_Value                  87
-#define  Pragma_Export_Valued_Procedure       88
-#define  Pragma_External                      89
-#define  Pragma_Finalize_Storage_Only         90
-#define  Pragma_Ident                         91
-#define  Pragma_Implemented_By_Entry          92
-#define  Pragma_Import                        93
-#define  Pragma_Import_Exception              94
-#define  Pragma_Import_Function               95
-#define  Pragma_Import_Object                 96
-#define  Pragma_Import_Procedure              97
-#define  Pragma_Import_Valued_Procedure       98
-#define  Pragma_Inline                        99
-#define  Pragma_Inline_Always                 100
-#define  Pragma_Inline_Generic                101
-#define  Pragma_Inspection_Point              102
-#define  Pragma_Interface_Name                103
-#define  Pragma_Interrupt_Handler             104
-#define  Pragma_Interrupt_Priority            105
-#define  Pragma_Java_Constructor              106
-#define  Pragma_Java_Interface                107
-#define  Pragma_Keep_Names                    108
-#define  Pragma_Link_With                     109
-#define  Pragma_Linker_Alias                  110
-#define  Pragma_Linker_Constructor            111
-#define  Pragma_Linker_Destructor             112
-#define  Pragma_Linker_Options                113
-#define  Pragma_Linker_Section                114
-#define  Pragma_List                          115
-#define  Pragma_Machine_Attribute             116
-#define  Pragma_Main                          117
-#define  Pragma_Main_Storage                  118
-#define  Pragma_Memory_Size                   119
-#define  Pragma_No_Body                       120
-#define  Pragma_No_Return                     121
-#define  Pragma_Obsolescent                   122
-#define  Pragma_Optimize                      123
-#define  Pragma_Pack                          124
-#define  Pragma_Page                          125
-#define  Pragma_Passive                       126
-#define  Pragma_Postcondition                 127
-#define  Pragma_Precondition                  128
-#define  Pragma_Preelaborable_Initialization  129
-#define  Pragma_Preelaborate                  130
-#define  Pragma_Preelaborate_05               131
-#define  Pragma_Psect_Object                  132
-#define  Pragma_Pure                          133
-#define  Pragma_Pure_05                       134
-#define  Pragma_Pure_Function                 135
-#define  Pragma_Relative_Deadline             136
-#define  Pragma_Remote_Call_Interface         137
-#define  Pragma_Remote_Types                  138
-#define  Pragma_Share_Generic                 139
-#define  Pragma_Shared                        140
-#define  Pragma_Shared_Passive                141
-#define  Pragma_Source_Reference              142
-#define  Pragma_Static_Elaboration_Desired    143
-#define  Pragma_Stream_Convert                144
-#define  Pragma_Subtitle                      145
-#define  Pragma_Suppress_All                  146
-#define  Pragma_Suppress_Debug_Info           147
-#define  Pragma_Suppress_Initialization       148
-#define  Pragma_System_Name                   149
-#define  Pragma_Task_Info                     150
-#define  Pragma_Task_Name                     151
-#define  Pragma_Task_Storage                  152
-#define  Pragma_Time_Slice                    153
-#define  Pragma_Title                         154
-#define  Pragma_Unchecked_Union               155
-#define  Pragma_Unimplemented_Unit            156
-#define  Pragma_Universal_Aliasing            157
-#define  Pragma_Unmodified                    158
-#define  Pragma_Unreferenced                  159
-#define  Pragma_Unreferenced_Objects          160
-#define  Pragma_Unreserve_All_Interrupts      161
-#define  Pragma_Volatile                      162
-#define  Pragma_Volatile_Components           163
-#define  Pragma_Weak_External                 164
-#define  Pragma_AST_Entry                     165
-#define  Pragma_Fast_Math                     166
-#define  Pragma_Interface                     167
-#define  Pragma_Priority                      168
-#define  Pragma_Storage_Size                  169
-#define  Pragma_Storage_Unit                  170
+#define  Pragma_Check_Name                    6
+#define  Pragma_Check_Policy                  7
+#define  Pragma_Compile_Time_Error            8
+#define  Pragma_Compile_Time_Warning          9
+#define  Pragma_Compiler_Unit                 10
+#define  Pragma_Component_Alignment           11
+#define  Pragma_Convention_Identifier         12
+#define  Pragma_Debug_Policy                  13
+#define  Pragma_Detect_Blocking               14
+#define  Pragma_Discard_Names                 15
+#define  Pragma_Elaboration_Checks            16
+#define  Pragma_Eliminate                     17
+#define  Pragma_Extend_System                 18
+#define  Pragma_Extensions_Allowed            19
+#define  Pragma_External_Name_Casing          20
+#define  Pragma_Favor_Top_Level               21
+#define  Pragma_Float_Representation          22
+#define  Pragma_Implicit_Packing              23
+#define  Pragma_Initialize_Scalars            24
+#define  Pragma_Interrupt_State               25
+#define  Pragma_License                       26
+#define  Pragma_Locking_Policy                27
+#define  Pragma_Long_Float                    28
+#define  Pragma_No_Run_Time                   29
+#define  Pragma_No_Strict_Aliasing            30
+#define  Pragma_Normalize_Scalars             31
+#define  Pragma_Optimize_Alignment            32
+#define  Pragma_Persistent_BSS                33
+#define  Pragma_Polling                       34
+#define  Pragma_Priority_Specific_Dispatching 35
+#define  Pragma_Profile                       36
+#define  Pragma_Profile_Warnings              37
+#define  Pragma_Propagate_Exceptions          38
+#define  Pragma_Queuing_Policy                39
+#define  Pragma_Ravenscar                     40
+#define  Pragma_Restricted_Run_Time           41
+#define  Pragma_Restrictions                  42
+#define  Pragma_Restriction_Warnings          43
+#define  Pragma_Reviewable                    44
+#define  Pragma_Source_File_Name              45
+#define  Pragma_Source_File_Name_Project      46
+#define  Pragma_Style_Checks                  47
+#define  Pragma_Suppress                      48
+#define  Pragma_Suppress_Exception_Locations  49
+#define  Pragma_Task_Dispatching_Policy       50
+#define  Pragma_Universal_Data                51
+#define  Pragma_Unsuppress                    52
+#define  Pragma_Use_VADS_Size                 53
+#define  Pragma_Validity_Checks               54
+#define  Pragma_Warnings                      55
+#define  Pragma_Wide_Character_Encoding       56
+#define  Pragma_Abort_Defer                   57
+#define  Pragma_All_Calls_Remote              58
+#define  Pragma_Annotate                      59
+#define  Pragma_Assert                        60
+#define  Pragma_Asynchronous                  61
+#define  Pragma_Atomic                        62
+#define  Pragma_Atomic_Components             63
+#define  Pragma_Attach_Handler                64
+#define  Pragma_Check                         65
+#define  Pragma_CIL_Constructor               66
+#define  Pragma_Comment                       67
+#define  Pragma_Common_Object                 68
+#define  Pragma_Complete_Representation       69
+#define  Pragma_Complex_Representation        70
+#define  Pragma_Controlled                    71
+#define  Pragma_Convention                    72
+#define  Pragma_CPP_Class                     73
+#define  Pragma_CPP_Constructor               74
+#define  Pragma_CPP_Virtual                   75
+#define  Pragma_CPP_Vtable                    76
+#define  Pragma_Debug                         77
+#define  Pragma_Elaborate                     78
+#define  Pragma_Elaborate_All                 79
+#define  Pragma_Elaborate_Body                80
+#define  Pragma_Export                        81
+#define  Pragma_Export_Exception              82
+#define  Pragma_Export_Function               83
+#define  Pragma_Export_Object                 84
+#define  Pragma_Export_Procedure              85
+#define  Pragma_Export_Value                  86
+#define  Pragma_Export_Valued_Procedure       87
+#define  Pragma_External                      88
+#define  Pragma_Finalize_Storage_Only         89
+#define  Pragma_Ident                         90
+#define  Pragma_Implemented_By_Entry          91
+#define  Pragma_Import                        92
+#define  Pragma_Import_Exception              93
+#define  Pragma_Import_Function               94
+#define  Pragma_Import_Object                 95
+#define  Pragma_Import_Procedure              96
+#define  Pragma_Import_Valued_Procedure       97
+#define  Pragma_Inline                        98
+#define  Pragma_Inline_Always                 99
+#define  Pragma_Inline_Generic                100
+#define  Pragma_Inspection_Point              101
+#define  Pragma_Interface_Name                102
+#define  Pragma_Interrupt_Handler             103
+#define  Pragma_Interrupt_Priority            104
+#define  Pragma_Java_Constructor              105
+#define  Pragma_Java_Interface                106
+#define  Pragma_Keep_Names                    107
+#define  Pragma_Link_With                     108
+#define  Pragma_Linker_Alias                  109
+#define  Pragma_Linker_Constructor            110
+#define  Pragma_Linker_Destructor             111
+#define  Pragma_Linker_Options                112
+#define  Pragma_Linker_Section                113
+#define  Pragma_List                          114
+#define  Pragma_Machine_Attribute             115
+#define  Pragma_Main                          116
+#define  Pragma_Main_Storage                  117
+#define  Pragma_Memory_Size                   118
+#define  Pragma_No_Body                       119
+#define  Pragma_No_Return                     120
+#define  Pragma_Obsolescent                   121
+#define  Pragma_Optimize                      122
+#define  Pragma_Pack                          123
+#define  Pragma_Page                          124
+#define  Pragma_Passive                       125
+#define  Pragma_Postcondition                 126
+#define  Pragma_Precondition                  127
+#define  Pragma_Preelaborable_Initialization  128
+#define  Pragma_Preelaborate                  129
+#define  Pragma_Preelaborate_05               130
+#define  Pragma_Psect_Object                  131
+#define  Pragma_Pure                          132
+#define  Pragma_Pure_05                       133
+#define  Pragma_Pure_Function                 134
+#define  Pragma_Relative_Deadline             135
+#define  Pragma_Remote_Call_Interface         136
+#define  Pragma_Remote_Types                  137
+#define  Pragma_Share_Generic                 138
+#define  Pragma_Shared                        139
+#define  Pragma_Shared_Passive                140
+#define  Pragma_Source_Reference              141
+#define  Pragma_Static_Elaboration_Desired    142
+#define  Pragma_Stream_Convert                143
+#define  Pragma_Subtitle                      144
+#define  Pragma_Suppress_All                  145
+#define  Pragma_Suppress_Debug_Info           146
+#define  Pragma_Suppress_Initialization       147
+#define  Pragma_System_Name                   148
+#define  Pragma_Task_Info                     149
+#define  Pragma_Task_Name                     150
+#define  Pragma_Task_Storage                  151
+#define  Pragma_Time_Slice                    152
+#define  Pragma_Title                         153
+#define  Pragma_Unchecked_Union               154
+#define  Pragma_Unimplemented_Unit            155
+#define  Pragma_Universal_Aliasing            156
+#define  Pragma_Unmodified                    157
+#define  Pragma_Unreferenced                  158
+#define  Pragma_Unreferenced_Objects          159
+#define  Pragma_Unreserve_All_Interrupts      160
+#define  Pragma_Volatile                      161
+#define  Pragma_Volatile_Components           162
+#define  Pragma_Weak_External                 163
+#define  Pragma_AST_Entry                     164
+#define  Pragma_Fast_Math                     165
+#define  Pragma_Interface                     166
+#define  Pragma_Priority                      167
+#define  Pragma_Storage_Size                  168
+#define  Pragma_Storage_Unit                  169
 
 /* End of snames.h (C version of Snames package spec) */