[multiple changes]

2014-08-01  Arnaud Charlet  <charlet@adacore.com>

	* exp_attr.adb (Is_Inline_Floating_Point_Attribute): Restore more
	completely previous code since only GCC back-ends are prepared
	to handle e.g. 'Machine attribute.
	* targparm.adb, targparm.ads: Remove remaining refs and
	handling of OpenVMS_On_Target, VAX_Float_On_Target and
	RTX_RTSS_Kernel_Module_On_Target.
	* hostparm.ads (OpenVMS, Max_Debug_Name_Length): Removed,
	no longer used.

2014-08-01  Robert Dewar  <dewar@adacore.com>

	* exp_dist.adb, exp_attr.adb: Minor reformatting.
	* sem_ch3.adb, mlib-tgt-specific-hpux.adb, a-direct.ads,
	a-synbar-posix.adb, exp_ch9.adb, sem_ch10.adb, sem_prag.adb,
	sem_ch12.adb, sem.ads, sem_res.adb, s-exctra.adb, s-soflin.ads,
	g-alveop.ads, sem_ch8.adb, vxaddr2line.adb, sem_cat.ads: Remove
	improper use of shall.

From-SVN: r213440

22 files changed, 133 insertions, 118 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 0d4085f..520f3c8 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,23 @@
+2014-08-01  Arnaud Charlet  <charlet@adacore.com>
+
+	* exp_attr.adb (Is_Inline_Floating_Point_Attribute): Restore more
+	completely previous code since only GCC back-ends are prepared
+	to handle e.g. 'Machine attribute.
+	* targparm.adb, targparm.ads: Remove remaining refs and
+	handling of OpenVMS_On_Target, VAX_Float_On_Target and
+	RTX_RTSS_Kernel_Module_On_Target.
+	* hostparm.ads (OpenVMS, Max_Debug_Name_Length): Removed,
+	no longer used.
+
+2014-08-01  Robert Dewar  <dewar@adacore.com>
+
+	* exp_dist.adb, exp_attr.adb: Minor reformatting.
+	* sem_ch3.adb, mlib-tgt-specific-hpux.adb, a-direct.ads,
+	a-synbar-posix.adb, exp_ch9.adb, sem_ch10.adb, sem_prag.adb,
+	sem_ch12.adb, sem.ads, sem_res.adb, s-exctra.adb, s-soflin.ads,
+	g-alveop.ads, sem_ch8.adb, vxaddr2line.adb, sem_cat.ads: Remove
+	improper use of shall.
+
 2014-08-01  Robert Dewar  <dewar@adacore.com>
 
 	* sem_aggr.adb, exp_atag.adb, layout.adb, nlists.adb, nlists.ads,
diff --git a/gcc/ada/a-direct.ads b/gcc/ada/a-direct.ads
index 9e2f880..a308c00 100644
--- a/gcc/ada/a-direct.ads
+++ b/gcc/ada/a-direct.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2004-2010, Free Software Foundation, Inc.         --
+--          Copyright (C) 2004-2014, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived for use with GNAT from AI-00248,  which is --
 -- expected to be a part of a future expected revised Ada Reference Manual. --
@@ -81,7 +81,7 @@ package Ada.Directories is
 
    function Current_Directory return String;
    --  Returns the full directory name for the current default directory. The
-   --  name returned shall be suitable for a future call to Set_Directory.
+   --  name returned must be suitable for a future call to Set_Directory.
    --  The exception Use_Error is propagated if a default directory is not
    --  supported by the external environment.
 
@@ -121,15 +121,15 @@ package Ada.Directories is
    --  Creates zero or more directories with name New_Directory. Each
    --  non-existent directory named by New_Directory is created. For example,
    --  on a typical Unix system, Create_Path ("/usr/me/my"); would create
-   --  directory "me" in directory "usr", then create directory "my" in
-   --  directory "me". The Form can be used to give system-dependent
+   --  directory "me" in directory "usr", then create directory "my"
+   --  in directory "me". The Form can be used to give system-dependent
    --  characteristics of the directory; the interpretation of the Form
    --  parameter is implementation-defined. A null string for Form specifies
    --  the use of the default options of the implementation of the new
    --  directory. The exception Name_Error is propagated if the string given
-   --  as New_Directory does not allow the identification of any directory.
-   --  The exception Use_Error is propagated if the external environment does
-   --  not support the creation of any directories with the given name (in the
+   --  as New_Directory does not allow the identification of any directory. The
+   --  exception Use_Error is propagated if the external environment does not
+   --  support the creation of any directories with the given name (in the
    --  absence of Name_Error) and form.
    --
    --  The Form parameter is ignored
@@ -139,9 +139,9 @@ package Ada.Directories is
    --  all of its contents (possibly including other directories) are deleted.
    --  The exception Name_Error is propagated if the string given as Directory
    --  does not identify an existing directory. The exception Use_Error is
-   --  propagated if the external environment does not support the deletion of
-   --  the directory or some portion of its contents with the given name (in
-   --  the absence of Name_Error). If Use_Error is propagated, it is
+   --  propagated if the external environment does not support the deletion
+   --  of the directory or some portion of its contents with the given name
+   --  (in the absence of Name_Error). If Use_Error is propagated, it is
    --  unspecified if a portion of the contents of the directory are deleted.
 
    procedure Delete_File (Name : String);
diff --git a/gcc/ada/a-synbar-posix.adb b/gcc/ada/a-synbar-posix.adb
index 73dc9fa..62cf232 100644
--- a/gcc/ada/a-synbar-posix.adb
+++ b/gcc/ada/a-synbar-posix.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                  B o d y                                 --
 --                                                                          --
---          Copyright (C) 1992-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
 --                                                                          --
 -- This specification is derived from the Ada Reference Manual for use with --
 -- GNAT. The copyright notice above, and the license provisions that follow --
@@ -50,7 +50,7 @@ package body Ada.Synchronous_Barriers is
    pragma Import (C, pthread_barrier_init, "pthread_barrier_init");
    --  Initialize barrier with the attributes in attr. The barrier is opened
    --  when count waiters arrived. If attr is null the default barrier
-   --  attributes shall be used.
+   --  attributes are used.
 
    function pthread_barrier_destroy
      (barrier : not null access pthread_barrier_t) return int;
@@ -76,10 +76,11 @@ package body Ada.Synchronous_Barriers is
    overriding procedure Initialize (Barrier : in out Synchronous_Barrier) is
       Result : int;
    begin
-      Result := pthread_barrier_init
-        (barrier => Barrier.POSIX_Barrier'Access,
-         attr    => System.Null_Address,
-         count   => unsigned (Barrier.Release_Threshold));
+      Result :=
+        pthread_barrier_init
+          (barrier => Barrier.POSIX_Barrier'Access,
+           attr    => System.Null_Address,
+           count   => unsigned (Barrier.Release_Threshold));
       pragma Assert (Result = 0);
    end Initialize;
 
@@ -98,8 +99,9 @@ package body Ada.Synchronous_Barriers is
       --  the barrier open.
 
    begin
-      Result := pthread_barrier_wait
-        (barrier => The_Barrier.POSIX_Barrier'Access);
+      Result :=
+        pthread_barrier_wait
+          (barrier => The_Barrier.POSIX_Barrier'Access);
       pragma Assert
         (Result = 0 or else Result = PTHREAD_BARRIER_SERIAL_THREAD);
 
diff --git a/gcc/ada/exp_attr.adb b/gcc/ada/exp_attr.adb
index 9b30795..18ad6d1 100644
--- a/gcc/ada/exp_attr.adb
+++ b/gcc/ada/exp_attr.adb
@@ -7954,17 +7954,30 @@ package body Exp_Attr is
    function Is_Inline_Floating_Point_Attribute (N : Node_Id) return Boolean is
       Id : constant Attribute_Id := Get_Attribute_Id (Attribute_Name (N));
 
+      function Is_GCC_Target return Boolean;
+      --  Return True if we are using a GCC target/back-end
+      --  ??? Note: the implementation is kludgy/fragile
+
+      -------------------
+      -- Is_GCC_Target --
+      -------------------
+
+      function Is_GCC_Target return Boolean is
+      begin
+         return VM_Target = No_VM and then not CodePeer_Mode
+           and then not AAMP_On_Target;
+      end Is_GCC_Target;
+
+   --  Start of processing for Exp_Attr
+
    begin
-      --  Machine and Model can be expanded by the backend, but in CodePeer
-      --  mode, we prefer the front end to do the expansion, because CodePeer
-      --  is not prepared to handle these attributes.
+      --  Machine and Model can be expanded by the GCC backend only
 
       if Id = Attribute_Machine or else Id = Attribute_Model then
-         return not CodePeer_Mode;
+         return Is_GCC_Target;
 
-      --  Remaining cases handled by the back end are Rounding and Truncatation
+      --  Remaining cases handled by all back ends are Rounding and Truncation
       --  when appearing as the operand of a conversion to some integer type.
-      --  CodePeer can handle these cases fine.
 
       elsif Nkind (Parent (N)) /= N_Type_Conversion
         or else not Is_Integer_Type (Etype (Parent (N)))
diff --git a/gcc/ada/exp_ch9.adb b/gcc/ada/exp_ch9.adb
index 55cd2a2..d01e849 100644
--- a/gcc/ada/exp_ch9.adb
+++ b/gcc/ada/exp_ch9.adb
@@ -2425,7 +2425,7 @@ package body Exp_Ch9 is
 
          --  If an inherited subprogram is implemented by a protected procedure
          --  or an entry, then the first parameter of the inherited subprogram
-         --  shall be of mode OUT or IN OUT, or access-to-variable parameter.
+         --  must be of mode OUT or IN OUT, or access-to-variable parameter.
 
          if Ekind (Iface_Op) = E_Procedure
            and then Present (Parameter_Specifications (Iface_Op_Spec))
diff --git a/gcc/ada/exp_dist.adb b/gcc/ada/exp_dist.adb
index e2f1a83..74f9055 100644
--- a/gcc/ada/exp_dist.adb
+++ b/gcc/ada/exp_dist.adb
@@ -528,23 +528,23 @@ package body Exp_Dist is
       RACW_Type                 : Entity_Id := Empty;
       Nod                       : Node_Id);
    --  Build calling stubs for general purpose. The parameters are:
-   --    Decls             : a place to put declarations
-   --    Statements        : a place to put statements
-   --    Target            : PCS-specific target information (see details
-   --                        in RPC_Target declaration).
-   --    Subprogram_Id     : a node containing the subprogram ID
+   --    Decls             : A place to put declarations
+   --    Statements        : A place to put statements
+   --    Target            : PCS-specific target information (see details in
+   --                        RPC_Target declaration).
+   --    Subprogram_Id     : A node containing the subprogram ID
    --    Asynchronous      : True if an APC must be made instead of an RPC.
    --                        The value needs not be supplied if one of the
    --                        Is_Known_... is True.
    --    Is_Known_Async... : True if we know that this is asynchronous
    --    Is_Known_Non_A... : True if we know that this is not asynchronous
-   --    Spec              : a node with a Parameter_Specifications and
-   --                        a Result_Definition if applicable
-   --    Stub_Type         : in case of RACW stubs, parameters of type access
-   --                        to Stub_Type will be marshalled using the
+   --    Spec              : Node with a Parameter_Specifications and a
+   --                        Result_Definition if applicable
+   --    Stub_Type         : For case of RACW stubs, parameters of type access
+   --                        to Stub_Type will be marshalled using the address
    --                        address of the object (the addr field) rather
    --                        than using the 'Write on the stub itself
-   --    Nod               : used to provide sloc for generated code
+   --    Nod               : Used to provide sloc for generated code
 
    function Specific_Build_Stub_Target
      (Loc                   : Source_Ptr;
diff --git a/gcc/ada/g-alveop.ads b/gcc/ada/g-alveop.ads
index eb4db79..351e450 100644
--- a/gcc/ada/g-alveop.ads
+++ b/gcc/ada/g-alveop.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2004-2009, Free Software Foundation, Inc.         --
+--          Copyright (C) 2004-2014, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -7884,12 +7884,12 @@ private
    -- Inlining considerations --
    -----------------------------
 
-   --  The intent in the Hard binding case is to eventually map operations
-   --  to hardware instructions. Needless to say, intermediate function calls
-   --  do not fit this purpose, so all the user visible subprograms shall be
-   --  inlined. In the soft case, the bulk of the work is performed by the
-   --  low level routines, and those exported by this unit are short enough
-   --  for the inlining to make sense and even be beneficial, so...
+   --  The intent in the Hard binding case is to eventually map operations to
+   --  hardware instructions. Needless to say, intermediate function calls do
+   --  not fit this purpose, so all the user visible subprograms are inlined.
+   --  In the soft case, the bulk of the work is performed by the low level
+   --  routines, and those exported by this unit are short enough for the
+   --  inlining to make sense and even be beneficial, so...
 
    pragma Inline_Always (vec_abs);
    pragma Inline_Always (vec_abss);
diff --git a/gcc/ada/hostparm.ads b/gcc/ada/hostparm.ads
index b9b7bf4..253c3be 100644
--- a/gcc/ada/hostparm.ads
+++ b/gcc/ada/hostparm.ads
@@ -41,9 +41,6 @@ package Hostparm is
    -- HOST Parameters --
    ---------------------
 
-   OpenVMS : Boolean := False;
-   --  Set True for OpenVMS host
-
    Direct_Separator : constant Character;
    pragma Import (C, Direct_Separator, "__gnat_dir_separator");
    Normalized_CWD : constant String := "." & Direct_Separator;
@@ -73,9 +70,4 @@ package Hostparm is
    --  If set to true, gnatbind will exclude from consideration all
    --  non-existent .o files.
 
-   Max_Debug_Name_Length : constant := 256;
-   --  If a generated qualified debug name exceeds this length, then it
-   --  is automatically compressed, regardless of the setting of the
-   --  Compress_Debug_Names switch controlled by -gnatC.
-
 end Hostparm;
diff --git a/gcc/ada/mlib-tgt-specific-hpux.adb b/gcc/ada/mlib-tgt-specific-hpux.adb
index 720b086..57e4084 100644
--- a/gcc/ada/mlib-tgt-specific-hpux.adb
+++ b/gcc/ada/mlib-tgt-specific-hpux.adb
@@ -7,7 +7,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                     Copyright (C) 2003-2008, AdaCore                     --
+--                     Copyright (C) 2003-2014, AdaCore                     --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -80,11 +80,10 @@ package body MLib.Tgt.Specific is
 
       Common_Options : constant Argument_List :=
                          Options & new String'(PIC_Option);
-      --  Common set of options to the gcc command performing the link.
-      --  On HPUX, this command eventually resorts to collect2, which may
-      --  generate a C file and compile it on the fly. This compilation shall
-      --  also generate position independent code for the final link to
-      --  succeed.
+      --  Common set of options to the gcc command performing the link. On
+      --  HPUX, this command eventually resorts to collect2, which may generate
+      --  a C file and compile it on the fly. This compilation also generates
+      --  position independent code for the final link to succeed.
    begin
       if Opt.Verbose_Mode then
          Write_Str ("building relocatable shared library ");
diff --git a/gcc/ada/s-exctra.adb b/gcc/ada/s-exctra.adb
index 509f61be..1a05cc1 100644
--- a/gcc/ada/s-exctra.adb
+++ b/gcc/ada/s-exctra.adb
@@ -39,12 +39,12 @@ package body System.Exception_Traces is
    --  Calling the decorator directly from where it is needed would require
    --  introducing nasty dependencies upon the spec of this package (typically
    --  in a-except.adb). We also have to deal with the fact that the traceback
-   --  array within an exception occurrence and the one the decorator shall
-   --  accept are of different types. These are two reasons for which a wrapper
-   --  with a System.Address argument is indeed used to call the decorator
-   --  provided by the user of this package. This wrapper is called via a
-   --  soft-link, which either is null when no decorator is in place or "points
-   --  to" the following function otherwise.
+   --  array within an exception occurrence and the one the decorator accepts
+   --  are of different types. These are two reasons for which a wrapper with
+   --  a System.Address argument is indeed used to call the decorator provided
+   --  by the user of this package. This wrapper is called via a soft-link,
+   --  which either is null when no decorator is in place or "points to" the
+   --  following function otherwise.
 
    function Decorator_Wrapper
      (Traceback : System.Address;
diff --git a/gcc/ada/s-soflin.ads b/gcc/ada/s-soflin.ads
index a339a0e..f850cd2 100644
--- a/gcc/ada/s-soflin.ads
+++ b/gcc/ada/s-soflin.ads
@@ -300,7 +300,7 @@ package System.Soft_Links is
    --  Wrapper to the possible user specified traceback decorator to be
    --  called during automatic output of exception data.
 
-   --  The nullity of this wrapper shall correspond to the nullity of the
+   --  The null value of this wrapper correspond sto the null value of the
    --  current actual decorator. This is ensured first by the null initial
    --  value of the corresponding variables, and then by Set_Trace_Decorator
    --  in g-exctra.adb.
diff --git a/gcc/ada/sem.ads b/gcc/ada/sem.ads
index f70c056..13fc485 100644
--- a/gcc/ada/sem.ads
+++ b/gcc/ada/sem.ads
@@ -651,16 +651,18 @@ package Sem is
    --  external (more global) to it.
 
    procedure Enter_Generic_Scope (S : Entity_Id);
-   --  Shall be called each time a Generic subprogram or package scope is
-   --  entered. S is the entity of the scope.
+   --  Called each time a Generic subprogram or package scope is entered. S is
+   --  the entity of the scope.
+   --
    --  ??? At the moment, only called for package specs because this mechanism
    --  is only used for avoiding freezing of external references in generics
    --  and this can only be an issue if the outer generic scope is a package
    --  spec (otherwise all external entities are already frozen)
 
    procedure Exit_Generic_Scope  (S : Entity_Id);
-   --  Shall be called each time a Generic subprogram or package scope is
-   --  exited. S is the entity of the scope.
+   --  Called each time a Generic subprogram or package scope is exited. S is
+   --  the entity of the scope.
+   --
    --  ??? At the moment, only called for package specs exit.
 
    function Explicit_Suppress (E : Entity_Id; C : Check_Id) return Boolean;
diff --git a/gcc/ada/sem_cat.ads b/gcc/ada/sem_cat.ads
index 1c7f572..5e05a69 100644
--- a/gcc/ada/sem_cat.ads
+++ b/gcc/ada/sem_cat.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2010, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -110,7 +110,7 @@ package Sem_Cat is
    --  the checks cannot be made before knowing if the object is imported.
 
    procedure Validate_RCI_Declarations (P : Entity_Id);
-   --  Apply semantic checks given in  E2.3(10-14)
+   --  Apply semantic checks given in E2.3(10-14)
 
    procedure Validate_RCI_Subprogram_Declaration (N : Node_Id);
    --  Check RCI subprogram declarations for illegal inlining and formals not
@@ -118,10 +118,10 @@ package Sem_Cat is
 
    procedure Validate_Remote_Access_To_Class_Wide_Type (N : Node_Id);
    --  Checks that Storage_Pool and Storage_Size attribute references are
-   --  not applied to remote access-to-class-wide types. And the expected
-   --  type for an allocator shall not be a remote access-to-class-wide
-   --  type. And a remote access-to-class-wide type shall not be an actual
-   --  parameter for a generic formal access type. RM E.2.3(22).
+   --  not applied to remote access-to-class-wide types. Also checks that the
+   --  expected type for an allocator cannot be a remote access-to-class-wide
+   --  type. ALso checks that a remote access-to-class-wide type cannot be an
+   --  actual parameter for a generic formal access type. RM E.2.3(22).
 
    procedure Validate_RT_RAT_Component (N : Node_Id);
    --  Given N, the package library unit declaration node, we should check
diff --git a/gcc/ada/sem_ch10.adb b/gcc/ada/sem_ch10.adb
index c0f874e..3fe718b 100644
--- a/gcc/ada/sem_ch10.adb
+++ b/gcc/ada/sem_ch10.adb
@@ -3,7 +3,7 @@
 --                         GNAT COMPILER COMPONENTS                         --
 --                                                                          --
 --                             S E M _ C H 1 0                              --
---                                                                          --
+--     s                                                                     --
 --                                 B o d y                                  --
 --                                                                          --
 --          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
@@ -3636,7 +3636,7 @@ package body Sem_Ch10 is
       procedure Check_Private_Limited_Withed_Unit (Item : Node_Id);
       --  Check that if a limited_with clause of a given compilation_unit
       --  mentions a descendant of a private child of some library unit, then
-      --  the given compilation_unit shall be the declaration of a private
+      --  the given compilation_unit must be the declaration of a private
       --  descendant of that library unit, or a public descendant of such. The
       --  code is analogous to that of Check_Private_Child_Unit but we cannot
       --  use entities on the limited with_clauses because their units have not
diff --git a/gcc/ada/sem_ch12.adb b/gcc/ada/sem_ch12.adb
index a776894..2faed4c 100644
--- a/gcc/ada/sem_ch12.adb
+++ b/gcc/ada/sem_ch12.adb
@@ -11404,7 +11404,7 @@ package body Sem_Ch12 is
                  ("actual for & cannot be a class-wide type", Actual, Gen_T);
                Abandon_Instantiation (Actual);
 
-            --  Otherwise, the formal and actual shall have the same number
+            --  Otherwise, the formal and actual must have the same number
             --  of discriminants and each discriminant of the actual must
             --  correspond to a discriminant of the formal.
 
diff --git a/gcc/ada/sem_ch3.adb b/gcc/ada/sem_ch3.adb
index 1221e02..53e0b47 100644
--- a/gcc/ada/sem_ch3.adb
+++ b/gcc/ada/sem_ch3.adb
@@ -3421,9 +3421,9 @@ package body Sem_Ch3 is
       --  is considered, so that the Object_Definition node is still the same
       --  as in source code.
 
-      --  In SPARK, the nominal subtype shall be given by a subtype mark and
-      --  shall not be unconstrained. (The only exception to this is the
-      --  admission of declarations of constants of type String.)
+      --  In SPARK, the nominal subtype is always given by a subtype mark
+      --  and must not be unconstrained. (The only exception to this is the
+      --  acceptance of declarations of constants of type String.)
 
       if not
         Nkind_In (Object_Definition (N), N_Identifier, N_Expanded_Name)
@@ -7073,10 +7073,10 @@ package body Sem_Ch3 is
 
    --  Furthermore if a KNOWN_DISCRIMINANT_PART is provided, then [3.7(13-18)]:
 
-   --  o The parent subtype shall be constrained;
+   --  o The parent subtype must be constrained;
 
    --  o If the parent type is not a tagged type, then each discriminant of
-   --    the derived type shall be used in the constraint defining a parent
+   --    the derived type must be used in the constraint defining a parent
    --    subtype. [Implementation note: This ensures that the new discriminant
    --    can share storage with an existing discriminant.]
 
@@ -7333,8 +7333,8 @@ package body Sem_Ch3 is
    --  [7.3(10-13)]:
 
    --  o If a private extension inherits known discriminants from the ancestor
-   --    subtype, then the full view shall also inherit its discriminants from
-   --    the ancestor subtype and the parent subtype of the full view shall be
+   --    subtype, then the full view must also inherit its discriminants from
+   --    the ancestor subtype and the parent subtype of the full view must be
    --    constrained if and only if the ancestor subtype is constrained.
 
    --  o If a partial view has unknown discriminants, then the full view may
@@ -7342,10 +7342,10 @@ package body Sem_Ch3 is
    --    discriminants.
 
    --  o If a partial view has neither known nor unknown discriminants, then
-   --    the full view shall define a definite subtype.
+   --    the full view must define a definite subtype.
 
    --  o If the ancestor subtype of a private extension has constrained
-   --    discriminants, then the parent subtype of the full view shall impose a
+   --    discriminants, then the parent subtype of the full view must impose a
    --    statically matching constraint on those discriminants.
 
    --  This means that only the following forms of private extensions are
diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
index f2c79d2..43eeeb2 100644
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -1007,10 +1007,10 @@ package body Sem_Ch8 is
 
          Resolve (Nam, T);
 
-         --  Ada 2005 (AI-231): "In the case where the type is defined by an
+         --  Ada 2005 (AI-231): In the case where the type is defined by an
          --  access_definition, the renamed entity shall be of an access-to-
          --  constant type if and only if the access_definition defines an
-         --  access-to-constant type" ARM 8.5.1(4)
+         --  access-to-constant type. ARM 8.5.1(4)
 
          if Constant_Present (Access_Definition (N))
            and then not Is_Access_Constant (Etype (Nam))
diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb
index 586a84e..c5f7789 100644
--- a/gcc/ada/sem_prag.adb
+++ b/gcc/ada/sem_prag.adb
@@ -3466,14 +3466,14 @@ package body Sem_Prag is
               and then Is_Private_Descendant (Pack_Id)
             then
                --  A variable or state abstraction which is part of the
-               --  visible state of a private child unit (or a public
-               --  descendant thereof) shall have its Part_Of indicator
-               --  specified; the Part_Of indicator shall denote a state
-               --  abstraction declared by either the parent unit of the
-               --  private unit or by a public descendant of that parent unit.
-
-               --  Find nearest nearest private ancestor (which can be the
-               --  current unit itself).
+               --  visible state of a private child unit (or one of its public
+               --  descendants) must have its Part_Of indicator specified. The
+               --  Part_Of indicator must denote a state abstraction declared
+               --  by either the parent unit of the private unit or by a public
+               --  descendant of that parent unit.
+
+               --  Find nearest private ancestor (which can be the current unit
+               --  itself).
 
                Parent_Unit := Pack_Id;
                while Present (Parent_Unit) loop
diff --git a/gcc/ada/sem_res.adb b/gcc/ada/sem_res.adb
index 38e25f0..4d0cfe3 100644
--- a/gcc/ada/sem_res.adb
+++ b/gcc/ada/sem_res.adb
@@ -5224,7 +5224,7 @@ package body Sem_Res is
       Eval_Arithmetic_Op (N);
 
       --  In SPARK, a multiplication or division with operands of fixed point
-      --  types shall be qualified or explicitly converted to identify the
+      --  types must be qualified or explicitly converted to identify the
       --  result type.
 
       if (Is_Fixed_Point_Type (Etype (L))
diff --git a/gcc/ada/targparm.adb b/gcc/ada/targparm.adb
index 84ed202..b7f800b 100644
--- a/gcc/ada/targparm.adb
+++ b/gcc/ada/targparm.adb
@@ -55,7 +55,6 @@ package body Targparm is
       MOV,  --   Machine_Overflows
       MRN,  --   Machine_Rounds
       PAS,  --   Preallocated_Stacks
-      RTX,  --   RTX_RTSS_Kernel_Module
       SAG,  --   Support_Aggregates
       SAP,  --   Support_Atomic_Primitives
       SCA,  --   Support_Composite_Assign
@@ -91,7 +90,6 @@ package body Targparm is
    MOV_Str : aliased constant Source_Buffer := "Machine_Overflows";
    MRN_Str : aliased constant Source_Buffer := "Machine_Rounds";
    PAS_Str : aliased constant Source_Buffer := "Preallocated_Stacks";
-   RTX_Str : aliased constant Source_Buffer := "RTX_RTSS_Kernel_Module";
    SAG_Str : aliased constant Source_Buffer := "Support_Aggregates";
    SAP_Str : aliased constant Source_Buffer := "Support_Atomic_Primitives";
    SCA_Str : aliased constant Source_Buffer := "Support_Composite_Assign";
@@ -127,7 +125,6 @@ package body Targparm is
       MOV_Str'Access,
       MRN_Str'Access,
       PAS_Str'Access,
-      RTX_Str'Access,
       SAG_Str'Access,
       SAP_Str'Access,
       SCA_Str'Access,
@@ -660,7 +657,6 @@ package body Targparm is
                      when MOV => Machine_Overflows_On_Target         := Result;
                      when MRN => Machine_Rounds_On_Target            := Result;
                      when PAS => Preallocated_Stacks_On_Target       := Result;
-                     when RTX => RTX_RTSS_Kernel_Module_On_Target    := Result;
                      when SAG => Support_Aggregates_On_Target        := Result;
                      when SAP => Support_Atomic_Primitives_On_Target := Result;
                      when SCA => Support_Composite_Assign_On_Target  := Result;
diff --git a/gcc/ada/targparm.ads b/gcc/ada/targparm.ads
index 2fcc9a3..b7d40c6 100644
--- a/gcc/ada/targparm.ads
+++ b/gcc/ada/targparm.ads
@@ -203,15 +203,6 @@ package Targparm is
    AAMP_On_Target : Boolean := False;
    --  Set to True if target is AAMP
 
-   OpenVMS_On_Target : Boolean := False;
-   --  Set to True if target is OpenVMS
-
-   VAX_Float_On_Target : Boolean := False;
-   --  Set to True if target float format is VAX Float
-
-   RTX_RTSS_Kernel_Module_On_Target : Boolean := False;
-   --  Set to True if target is RTSS module for RTX
-
    type Virtual_Machine_Kind is (No_VM, JVM_Target, CLI_Target);
    VM_Target : Virtual_Machine_Kind := No_VM;
    --  Kind of virtual machine targetted
diff --git a/gcc/ada/vxaddr2line.adb b/gcc/ada/vxaddr2line.adb
index b65ebc6..edcc95c 100644
--- a/gcc/ada/vxaddr2line.adb
+++ b/gcc/ada/vxaddr2line.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---                     Copyright (C) 2002-2013, AdaCore                     --
+--                     Copyright (C) 2002-2014, AdaCore                     --
 --                                                                          --
 -- GNAT is free software;  you can  redistribute it  and/or modify it under --
 -- terms of the  GNU General Public License as published  by the Free Soft- --
@@ -41,18 +41,18 @@
 --    selects the target architecture. In the absence of this parameter the
 --    default variant is chosen based on the Detect_Arch result. Generally,
 --    this parameter will only be used if vxaddr2line is recompiled manually.
---    Otherwise, the command name will always be of the form
---    <target>-vxaddr2line where there is no ambiguity on the target's
---    architecture.
+--    Otherwise, the command name will always be of the form:
+--      <target>-vxaddr2line
+--    where there is no ambiguity on the target's architecture.
 
 --  <exe_file> :
 --    The name of the partially linked binary file for the application.
 
 --  <ref_address> :
---    Runtime address (on the target) of a reference symbol you choose,
---    which name shall match the value of the Ref_Symbol variable declared
---    below. A symbol with a small offset from the beginning of the text
---    segment is better, so "adainit" is a good choice.
+--    Runtime address (on the target) of a reference symbol you choose. This
+--    name must match the value of the Ref_Symbol variable declared below.
+--    A symbol with a small offset from the beginning of the text segment is
+--    better, so "adainit" is a good choice.
 
 --  <backtrace addresses> :
 --    The call chain addresses you obtained at run time on the target and
@@ -78,7 +78,7 @@ procedure VxAddr2Line is
    --  Instantiate Modular_IO to have Put
 
    Ref_Symbol : constant String := "adainit";
-   --  This is the name of the reference symbol which runtime address shall
+   --  This is the name of the reference symbol whose runtime address must
    --  be provided as the <ref_address> argument.
 
    --  All supported architectures