diff options
| author | Hristian Kirtchev <kirtchev@adacore.com> | 2019-07-03 08:14:05 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2019-07-03 08:14:05 +0000 |
| commit | 438d9658a90f7cf0fa06e219455629817fae4c65 (patch) | |
| tree | d5e1e685666974bf979c52810137cb2aca1fb708 | |
| parent | 97edd4267e6fef2da066feafc39c107f2687ee37 (diff) | |
| download | gcc-438d9658a90f7cf0fa06e219455629817fae4c65.zip gcc-438d9658a90f7cf0fa06e219455629817fae4c65.tar.gz gcc-438d9658a90f7cf0fa06e219455629817fae4c65.tar.bz2 | |
[Ada] Update the section on resolving elaboration circularities
2019-07-03 Hristian Kirtchev <kirtchev@adacore.com>
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
| -rw-r--r-- | gcc/ada/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/ada/doc/gnat_ugn/elaboration_order_handling_in_gnat.rst | 14 | ||||
| -rw-r--r-- | gcc/ada/gnat_ugn.texi | 16 |
3 files changed, 23 insertions, 15 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 755c9fb..2115a38 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,11 @@ +2019-07-03 Hristian Kirtchev <kirtchev@adacore.com> + + * 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 <charlet@adacore.com> * 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 a4b8b7f..336555c 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 d09b879..d689ea1 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 |