2015-10-16 Eric Botcazou <ebotcazou@adacore.com>

	* a-tags.ads (Parent_Size): Remove obsolete pragma Export.
	* s-finmas.ads (Header_Offset): Delete.
	* s-finmas.adb (Header_Offset): Likewise.
	(Finalize): Call Header_Size instead of Header_Offset.
	* s-stposu.adb (Allocate_Any_Controlled): Likewise.
	(Deallocate_Any_Controlled): Likewise.

2015-10-16  Arnaud Charlet  <charlet@adacore.com>

	* a-exetim.ads, a-exetim-mingw.ads, a-exetim-default.ads: Whitespace
	cleanup.
	* s-osprim-mingw.adb, einfo.ads, sem_util.adb, sem_util.ads,
	sem_ch4.adb, sem_ch13.adb, s-trasym.adb, s-trasym.ads,
	s-taprop-posix.adb: Minor reformatting.



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

17 files changed, 55 insertions, 48 deletions

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 40e07ce2d0f..228d10c4d24 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,20 @@
+2015-10-16  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* a-tags.ads (Parent_Size): Remove obsolete pragma Export.
+	* s-finmas.ads (Header_Offset): Delete.
+	* s-finmas.adb (Header_Offset): Likewise.
+	(Finalize): Call Header_Size instead of Header_Offset.
+	* s-stposu.adb (Allocate_Any_Controlled): Likewise.
+	(Deallocate_Any_Controlled): Likewise.
+
+2015-10-16  Arnaud Charlet  <charlet@adacore.com>
+
+	* a-exetim.ads, a-exetim-mingw.ads, a-exetim-default.ads: Whitespace
+	cleanup.
+	* s-osprim-mingw.adb, einfo.ads, sem_util.adb, sem_util.ads,
+	sem_ch4.adb, sem_ch13.adb, s-trasym.adb, s-trasym.ads,
+	s-taprop-posix.adb: Minor reformatting.
+
 2015-10-16  Bob Duff  <duff@adacore.com>
 
 	* adadecode.h, adadecode.c (ada_demangle): Remove
diff --git a/gcc/ada/a-exetim-default.ads b/gcc/ada/a-exetim-default.ads
index 3267baad606..56429af4654 100644
--- a/gcc/ada/a-exetim-default.ads
+++ b/gcc/ada/a-exetim-default.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2007-2011, Free Software Foundation, Inc.         --
+--          Copyright (C) 2007-2015, 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 --
@@ -46,8 +46,8 @@ package Ada.Execution_Time is
    CPU_Tick       : constant Ada.Real_Time.Time_Span;
 
    function Clock
-     (T : Ada.Task_Identification.Task_Id
-          := Ada.Task_Identification.Current_Task)
+     (T : Ada.Task_Identification.Task_Id :=
+        Ada.Task_Identification.Current_Task)
       return CPU_Time;
 
    function "+"
diff --git a/gcc/ada/a-exetim-mingw.ads b/gcc/ada/a-exetim-mingw.ads
index 42b861bd3ce..bc458f6700e 100644
--- a/gcc/ada/a-exetim-mingw.ads
+++ b/gcc/ada/a-exetim-mingw.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2009-2012, Free Software Foundation, Inc.         --
+--          Copyright (C) 2009-2015, 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 --
@@ -30,6 +30,7 @@
 --                                                                          --
 -- GNAT was originally developed  by the GNAT team at  New York University. --
 -- Extensive contributions were provided by Ada Core Technologies Inc.      --
+--                                                                          --
 ------------------------------------------------------------------------------
 
 --  This is the Windows native version of this package
@@ -48,7 +49,8 @@ package Ada.Execution_Time is
 
    function Clock
      (T : Ada.Task_Identification.Task_Id :=
-            Ada.Task_Identification.Current_Task) return CPU_Time;
+        Ada.Task_Identification.Current_Task)
+      return CPU_Time;
 
    function "+"
      (Left  : CPU_Time;
@@ -77,9 +79,9 @@ package Ada.Execution_Time is
       TS : out Ada.Real_Time.Time_Span);
 
    function Time_Of
-      (SC : Ada.Real_Time.Seconds_Count;
-       TS : Ada.Real_Time.Time_Span := Ada.Real_Time.Time_Span_Zero)
-       return CPU_Time;
+     (SC : Ada.Real_Time.Seconds_Count;
+      TS : Ada.Real_Time.Time_Span := Ada.Real_Time.Time_Span_Zero)
+      return CPU_Time;
 
    Interrupt_Clocks_Supported          : constant Boolean := False;
    Separate_Interrupt_Clocks_Supported : constant Boolean := False;
diff --git a/gcc/ada/a-exetim.ads b/gcc/ada/a-exetim.ads
index 1dc5f61f9c0..2b0725058c6 100644
--- a/gcc/ada/a-exetim.ads
+++ b/gcc/ada/a-exetim.ads
@@ -38,7 +38,7 @@ package Ada.Execution_Time is
 
    function Clock
      (T : Ada.Task_Identification.Task_Id :=
-            Ada.Task_Identification.Current_Task)
+        Ada.Task_Identification.Current_Task)
       return CPU_Time;
 
    function "+"
@@ -68,9 +68,9 @@ package Ada.Execution_Time is
       TS : out Ada.Real_Time.Time_Span);
 
    function Time_Of
-      (SC : Ada.Real_Time.Seconds_Count;
-       TS : Ada.Real_Time.Time_Span := Ada.Real_Time.Time_Span_Zero)
-       return CPU_Time;
+     (SC : Ada.Real_Time.Seconds_Count;
+      TS : Ada.Real_Time.Time_Span := Ada.Real_Time.Time_Span_Zero)
+      return CPU_Time;
 
    Interrupt_Clocks_Supported          : constant Boolean := False;
    Separate_Interrupt_Clocks_Supported : constant Boolean := False;
diff --git a/gcc/ada/a-tags.ads b/gcc/ada/a-tags.ads
index 53a541b3b78..1d247aac51a 100644
--- a/gcc/ada/a-tags.ads
+++ b/gcc/ada/a-tags.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 1992-2014, Free Software Foundation, Inc.         --
+--          Copyright (C) 1992-2015, 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 --
@@ -526,9 +526,6 @@ private
    --  ancestor is the parent of the type represented by tag T. This function
    --  assumes that _size is always in slot one of the dispatch table.
 
-   pragma Export (Ada, Parent_Size, "ada__tags__parent_size");
-   --  This procedure is used in s-finimp and is thus exported manually
-
    procedure Register_Interface_Offset
      (This         : System.Address;
       Interface_T  : Tag;
diff --git a/gcc/ada/einfo.ads b/gcc/ada/einfo.ads
index 8949ea2bc83..d32f01dd7a7 100644
--- a/gcc/ada/einfo.ads
+++ b/gcc/ada/einfo.ads
@@ -2626,8 +2626,8 @@ package Einfo is
 --       to intrinsic, which causes intrinsic code to be generated.
 
 --    Is_Invariant_Procedure (Flag257)
---       Defined in functions an procedures. Set for a generated invariant
---       procedure to identify it easily in the.
+--       Defined in functions and procedures. Set for a generated invariant
+--       procedure to identify it easily.
 
 --    Is_Itype (Flag91)
 --       Defined in all entities. Set to indicate that a type is an Itype,
@@ -3064,7 +3064,7 @@ package Einfo is
 --       vtable (i.e. the one to be extended by derivation).
 
 --    Is_Tagged_Type (Flag55)
---       Defined in all entities. Set for an entity that is a tagged type.
+--       Defined in all entities, set for an entity that is a tagged type
 
 --    Is_Task_Interface (synthesized)
 --       Defined in types that are interfaces. True if interface is declared as
@@ -4657,8 +4657,8 @@ package Einfo is
       --  type (whether or not it is a general access type).
 
       E_Access_Attribute_Type,
-      --  An access type created for an access attribute (such as 'Access,
-      --  'Unrestricted_Access and Unchecked_Access).
+      --  An access type created for an access attribute (one of 'Access,
+      --  'Unrestricted_Access, or Unchecked_Access).
 
       E_Allocator_Type,
       --  A special internal type used to label allocators and references to
diff --git a/gcc/ada/s-finmas.adb b/gcc/ada/s-finmas.adb
index 918519b6781..c5ddff76955 100644
--- a/gcc/ada/s-finmas.adb
+++ b/gcc/ada/s-finmas.adb
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 B o d y                                  --
 --                                                                          --
---             Copyright (C) 2011, Free Software Foundation, Inc.           --
+--             Copyright (C) 2015, 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- --
@@ -212,7 +212,7 @@ package body System.Finalization_Masters is
          --  Skip the list header in order to offer proper object layout for
          --  finalization.
 
-         Obj_Addr := Curr_Ptr.all'Address + Header_Offset;
+         Obj_Addr := Curr_Ptr.all'Address + Header_Size;
 
          --  Retrieve TSS primitive Finalize_Address depending on the master's
          --  mode of operation.
@@ -327,15 +327,6 @@ package body System.Finalization_Masters is
       return FM_Node'Size / Storage_Unit;
    end Header_Size;
 
-   -------------------
-   -- Header_Offset --
-   -------------------
-
-   function Header_Offset return System.Storage_Elements.Storage_Offset is
-   begin
-      return FM_Node'Size / Storage_Unit;
-   end Header_Offset;
-
    ----------------
    -- Initialize --
    ----------------
diff --git a/gcc/ada/s-finmas.ads b/gcc/ada/s-finmas.ads
index a94a8f99b60..a4e6cb15e48 100644
--- a/gcc/ada/s-finmas.ads
+++ b/gcc/ada/s-finmas.ads
@@ -6,7 +6,7 @@
 --                                                                          --
 --                                 S p e c                                  --
 --                                                                          --
---          Copyright (C) 2011-2013, Free Software Foundation, Inc.         --
+--          Copyright (C) 2011-2015, 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- --
@@ -111,9 +111,6 @@ package System.Finalization_Masters is
    function Finalization_Started (Master : Finalization_Master) return Boolean;
    --  Return the finalization status of a master
 
-   function Header_Offset return System.Storage_Elements.Storage_Offset;
-   --  Return the size of type FM_Node as Storage_Offset
-
    function Header_Size return System.Storage_Elements.Storage_Count;
    --  Return the size of type FM_Node as Storage_Count
 
diff --git a/gcc/ada/s-osprim-mingw.adb b/gcc/ada/s-osprim-mingw.adb
index adda5146bf8..9f7af90c521 100644
--- a/gcc/ada/s-osprim-mingw.adb
+++ b/gcc/ada/s-osprim-mingw.adb
@@ -94,9 +94,9 @@ package body System.OS_Primitives is
    pragma Export (Ada, Monotonic_Clock, "__gnat_monotonic_clock");
    --  Return "absolute" time, represented as an offset relative to "the Unix
    --  Epoch", which is Jan 1, 1970 00:00:00 UTC. This clock implementation is
-   --  immune to the system's clock changes.
-   --  Export this function so that it can be imported from s-taprop-mingw.adb
-   --  without changing the shared spec (s-osprim.ads).
+   --  immune to the system's clock changes. Export this function so that it
+   --  can be imported from s-taprop-mingw.adb without changing the shared
+   --  spec (s-osprim.ads).
 
    procedure Get_Base_Time (Data : in out Clock_Data);
    --  Retrieve the base time and base ticks. These values will be used by
diff --git a/gcc/ada/s-stposu.adb b/gcc/ada/s-stposu.adb
index 16c875aa6d5..c7d2819ca9c 100644
--- a/gcc/ada/s-stposu.adb
+++ b/gcc/ada/s-stposu.adb
@@ -281,7 +281,7 @@ package body System.Storage_Pools.Subpools is
          --     +- Header_And_Padding --+
 
          N_Ptr := Address_To_FM_Node_Ptr
-                    (N_Addr + Header_And_Padding - Header_Offset);
+                    (N_Addr + Header_And_Padding - Header_Size);
 
          --  Prepend the allocated object to the finalization master
 
@@ -414,7 +414,7 @@ package body System.Storage_Pools.Subpools is
 
          --  Convert the bits preceding the object into a list header
 
-         N_Ptr := Address_To_FM_Node_Ptr (Addr - Header_Offset);
+         N_Ptr := Address_To_FM_Node_Ptr (Addr - Header_Size);
 
          --  Detach the object from the related finalization master. This
          --  action does not need to know the prior context used during
diff --git a/gcc/ada/s-taprop-posix.adb b/gcc/ada/s-taprop-posix.adb
index 992f3e7b002..e3b9840dc7a 100644
--- a/gcc/ada/s-taprop-posix.adb
+++ b/gcc/ada/s-taprop-posix.adb
@@ -278,7 +278,7 @@ package body System.Task_Primitives.Operations is
       --  Absolute deadline specified using the tasking clock (CLOCK_RT_Ada)
 
       elsif Mode = Absolute_RT
-              or else OSC.CLOCK_RT_Ada = OSC.CLOCK_REALTIME
+        or else OSC.CLOCK_RT_Ada = OSC.CLOCK_REALTIME
       then
          pragma Warnings (On);
          Abs_Time := Duration'Min (Check_Time + Max_Sensible_Delay, Time);
@@ -295,7 +295,7 @@ package body System.Task_Primitives.Operations is
          declare
             Cal_Check_Time : constant Duration := OS_Primitives.Clock;
             RT_Time        : constant Duration :=
-              Time + Check_Time - Cal_Check_Time;
+                               Time + Check_Time - Cal_Check_Time;
 
          begin
             Abs_Time :=
diff --git a/gcc/ada/s-trasym.adb b/gcc/ada/s-trasym.adb
index 740bef9eeea..1dd0d71529e 100644
--- a/gcc/ada/s-trasym.adb
+++ b/gcc/ada/s-trasym.adb
@@ -35,7 +35,7 @@
 
 pragma Polling (Off);
 --  We must turn polling off for this unit, because otherwise we can get
---  elaboration circularities when polling is turned on
+--  elaboration circularities when polling is turned on.
 
 with Ada.Exceptions.Traceback; use Ada.Exceptions.Traceback;
 with System.Address_Image;
diff --git a/gcc/ada/s-trasym.ads b/gcc/ada/s-trasym.ads
index 5c2812b1308..2aa1d1f335a 100644
--- a/gcc/ada/s-trasym.ads
+++ b/gcc/ada/s-trasym.ads
@@ -64,7 +64,7 @@
 
 pragma Polling (Off);
 --  We must turn polling off for this unit, because otherwise we can get
---  elaboration circularities when polling is turned on
+--  elaboration circularities when polling is turned on.
 
 with Ada.Exceptions;
 
diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb
index 197d1ea9415..68b201b3d25 100644
--- a/gcc/ada/sem_ch13.adb
+++ b/gcc/ada/sem_ch13.adb
@@ -8708,6 +8708,8 @@ package body Sem_Ch13 is
             --  them as such whenever possible, so redundant predicate checks
             --  can be optimized.
 
+            --  Shouldn't Variable_Ref be True for Side_Effect_Free call ???
+
             if Expander_Active then
                Set_Is_Pure (SId, Side_Effect_Free (Expr));
                Set_Is_Inlined (SId);
diff --git a/gcc/ada/sem_ch4.adb b/gcc/ada/sem_ch4.adb
index 0c4a90109db..ebd9a8f7ba7 100644
--- a/gcc/ada/sem_ch4.adb
+++ b/gcc/ada/sem_ch4.adb
@@ -8174,7 +8174,7 @@ package body Sem_Ch4 is
            or else Is_Incomplete_Type (Obj_Type)
          then
 
-            --  Restore previous type if current one is not legal candidate.
+            --  Restore previous type if current one is not legal candidate
 
             Obj_Type := Prev_Obj_Type;
             return;
diff --git a/gcc/ada/sem_util.adb b/gcc/ada/sem_util.adb
index efdf3266a3e..2b929575a95 100644
--- a/gcc/ada/sem_util.adb
+++ b/gcc/ada/sem_util.adb
@@ -7800,6 +7800,7 @@ package body Sem_Util is
 
    function Get_Reference_Discriminant (Typ : Entity_Id) return Entity_Id is
       D : Entity_Id;
+
    begin
       D := First_Discriminant (Typ);
       while Present (D) loop
diff --git a/gcc/ada/sem_util.ads b/gcc/ada/sem_util.ads
index 70ffa636e9f..238a0fa3a93 100644
--- a/gcc/ada/sem_util.ads
+++ b/gcc/ada/sem_util.ads
@@ -910,8 +910,8 @@ package Sem_Util is
    --  any other form.
 
    function Get_Reference_Discriminant (Typ : Entity_Id) return Entity_Id;
-   --  If Typ has Implicit_Dereference, return discriminant specified in
-   --  the corresponding aspect.
+   --  If Typ has Implicit_Dereference, return discriminant specified in the
+   --  corresponding aspect.
 
    function Get_Referenced_Object (N : Node_Id) return Node_Id;
    --  Given a node, return the renamed object if the node represents a renamed