[multiple changes]

2015-01-06  Ed Schonberg  <schonberg@adacore.com>

	* sem_ch8.adb: Code clean up.

2015-01-06  Tristan Gingold  <gingold@adacore.com>

	* targparm.ads: Remove obsolete comment.

From-SVN: r219240

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c6159e6..1950ea8 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,11 @@
+2015-01-06  Ed Schonberg  <schonberg@adacore.com>
+
+       * sem_ch8.adb: Code clean up.
+
+2015-01-06  Tristan Gingold  <gingold@adacore.com>
+
+       * targparm.ads: Remove obsolete comment.
+
 2015-01-06  Olivier Hainque  <hainque@adacore.com>
 
         * gcc-interface/decl.c (gnat_to_gnu_entity, case E_Variable): When

diff --git a/gcc/ada/sem_ch8.adb b/gcc/ada/sem_ch8.adb
index 84c5ae5..9218e8a 100644 (file)
--- a/gcc/ada/sem_ch8.adb
+++ b/gcc/ada/sem_ch8.adb
@@ -3454,11 +3454,12 @@ package body Sem_Ch8 is
 
       --  In GNATprove mode, the renamings of actual subprograms are replaced
       --  with wrapper functions that make it easier to propagate axioms to the
-      --  points of call within an instance.
+      --  points of call within an instance. Wrappers are generated if formal
+      --  subprogram is subject to axiomatization.
 
       if Is_Actual
         and then GNATprove_Mode
-        and then Present (Containing_Package_With_Ext_Axioms (Old_S))
+        and then Present (Containing_Package_With_Ext_Axioms (Formal_Spec))
         and then not Inside_A_Generic
       then
          if Ekind (Old_S) = E_Function then

diff --git a/gcc/ada/targparm.ads b/gcc/ada/targparm.ads
index b7d40c6..efb6e02 100644 (file)
--- a/gcc/ada/targparm.ads
+++ b/gcc/ada/targparm.ads
@@ -349,8 +349,6 @@ package Targparm is
    --    The calls to __gnat_initialize and __gnat_finalize are omitted
    --
    --    All finalization and initialization (controlled types) is omitted
-   --
-   --    The routine __gnat_handler_installed is not imported
 
    Preallocated_Stacks_On_Target : Boolean := False;
    --  If this flag is True, then the expander preallocates all task stacks