From 438d9658a90f7cf0fa06e219455629817fae4c65 Mon Sep 17 00:00:00 2001 From: Hristian Kirtchev Date: Wed, 3 Jul 2019 08:14:05 +0000 Subject: [PATCH] [Ada] Update the section on resolving elaboration circularities 2019-07-03 Hristian Kirtchev gcc/ada/ * doc/gnat_ugn/elaboration_order_handling_in_gnat.rst: Update the section on resolving elaboration circularities to eliminate certain combinations of switches which together do not produce the desired effect and confuse users. * gnat_ugn.texi: Regenerate. From-SVN: r272966 --- gcc/ada/ChangeLog | 8 ++++++++ .../elaboration_order_handling_in_gnat.rst | 14 +++++++------- gcc/ada/gnat_ugn.texi | 16 ++++++++-------- 3 files changed, 23 insertions(+), 15 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 755c9fb2bf7..2115a383815 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2019-07-03 Hristian Kirtchev + + * doc/gnat_ugn/elaboration_order_handling_in_gnat.rst: Update + the section on resolving elaboration circularities to eliminate + certain combinations of switches which together do not produce + the desired effect and confuse users. + * gnat_ugn.texi: Regenerate. + 2019-07-03 Arnaud Charlet * bindgen.adb (Gen_Main): Disable generation of reference to diff --git a/gcc/ada/doc/gnat_ugn/elaboration_order_handling_in_gnat.rst b/gcc/ada/doc/gnat_ugn/elaboration_order_handling_in_gnat.rst index a4b8b7fed47..336555cd370 100644 --- a/gcc/ada/doc/gnat_ugn/elaboration_order_handling_in_gnat.rst +++ b/gcc/ada/doc/gnat_ugn/elaboration_order_handling_in_gnat.rst @@ -1056,17 +1056,17 @@ available. If the compilation was performed using a post-18.x version of GNAT, consider using the legacy elaboration model, in the following order: + - Use the relaxed static elaboration model, with compiler switch + :switch:`-gnatJ`. + + - Use the relaxed dynamic elaboration model, with compiler switches + :switch:`-gnatE` :switch:`-gnatJ`. + - Use the legacy static elaboration model, with compiler switch :switch:`-gnatH`. - Use the legacy dynamic elaboration model, with compiler switches - :switch:`-gnatH` :switch:`-gnatE`. - - - Use the relaxed legacy static elaboration model, with compiler switches - :switch:`-gnatH` :switch:`-gnatJ`. - - - Use the relaxed legacy dynamic elaboration model, with compiler switches - :switch:`-gnatH` :switch:`-gnatJ` :switch:`-gnatE`. + :switch:`-gnatE` :switch:`-gnatH`. * *Suppress all elaboration checks* diff --git a/gcc/ada/gnat_ugn.texi b/gcc/ada/gnat_ugn.texi index d09b879963a..d689ea13259 100644 --- a/gcc/ada/gnat_ugn.texi +++ b/gcc/ada/gnat_ugn.texi @@ -28348,20 +28348,20 @@ using the legacy elaboration model, in the following order: @itemize - @item -Use the legacy static elaboration model, with compiler switch -@code{-gnatH}. +Use the relaxed static elaboration model, with compiler switch +@code{-gnatJ}. @item -Use the legacy dynamic elaboration model, with compiler switches -@code{-gnatH} @code{-gnatE}. +Use the relaxed dynamic elaboration model, with compiler switches +@code{-gnatE} @code{-gnatJ}. @item -Use the relaxed legacy static elaboration model, with compiler switches -@code{-gnatH} @code{-gnatJ}. +Use the legacy static elaboration model, with compiler switch +@code{-gnatH}. @item -Use the relaxed legacy dynamic elaboration model, with compiler switches -@code{-gnatH} @code{-gnatJ} @code{-gnatE}. +Use the legacy dynamic elaboration model, with compiler switches +@code{-gnatE} @code{-gnatH}. @end itemize @item -- 2.30.2