From 3e1199e0345c7029db845faa7b4fc4cb14120db9 Mon Sep 17 00:00:00 2001 From: Arnaud Charlet Date: Wed, 3 Jul 2019 08:13:46 +0000 Subject: [PATCH] [Ada] Clarify wording on documentation for No_Multiple_Elaboration 2019-07-03 Arnaud Charlet gcc/ada/ * doc/gnat_rm/standard_and_implementation_defined_restrictions.rst: Clarify wording on No_Multiple_Elaboration. * gnat_rm.texi: Regenerate. From-SVN: r272962 --- gcc/ada/ChangeLog | 6 ++++++ ..._and_implementation_defined_restrictions.rst | 17 ++++++++--------- gcc/ada/gnat_rm.texi | 17 ++++++++--------- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index b2360635585..ada9c2b4a56 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2019-07-03 Arnaud Charlet + + * doc/gnat_rm/standard_and_implementation_defined_restrictions.rst: + Clarify wording on No_Multiple_Elaboration. + * gnat_rm.texi: Regenerate. + 2019-07-03 Ed Schonberg * sem_ch8.adb (Find_Selected_Component): If the prefix is the diff --git a/gcc/ada/doc/gnat_rm/standard_and_implementation_defined_restrictions.rst b/gcc/ada/doc/gnat_rm/standard_and_implementation_defined_restrictions.rst index 0b9f6dc30a6..7b599bec22f 100644 --- a/gcc/ada/doc/gnat_rm/standard_and_implementation_defined_restrictions.rst +++ b/gcc/ada/doc/gnat_rm/standard_and_implementation_defined_restrictions.rst @@ -510,15 +510,14 @@ No_Multiple_Elaboration ----------------------- .. index:: No_Multiple_Elaboration -[GNAT] When this restriction is active, we are not requesting control-flow -preservation with -fpreserve-control-flow, and the static elaboration model is -used, the compiler is allowed to suppress the elaboration counter normally -associated with the unit, even if the unit has elaboration code. This counter -is typically used to check for access before elaboration and to control -multiple elaboration attempts. If the restriction is used, then the -situations in which multiple elaboration is possible, including non-Ada main -programs and Stand Alone libraries, are not permitted and will be diagnosed -by the binder. +[GNAT] When this restriction is active and the static elaboration model is +used, and -fpreserve-control-flow is not used, the compiler is allowed to +suppress the elaboration counter normally associated with the unit, even if +the unit has elaboration code. This counter is typically used to check for +access before elaboration and to control multiple elaboration attempts. If the +restriction is used, then the situations in which multiple elaboration is +possible, including non-Ada main programs and Stand Alone libraries, are not +permitted and will be diagnosed by the binder. No_Nested_Finalization ---------------------- diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi index e4324473396..39a24abbd98 100644 --- a/gcc/ada/gnat_rm.texi +++ b/gcc/ada/gnat_rm.texi @@ -12674,15 +12674,14 @@ Long_Integer'Size. @geindex No_Multiple_Elaboration -[GNAT] When this restriction is active, we are not requesting control-flow -preservation with -fpreserve-control-flow, and the static elaboration model is -used, the compiler is allowed to suppress the elaboration counter normally -associated with the unit, even if the unit has elaboration code. This counter -is typically used to check for access before elaboration and to control -multiple elaboration attempts. If the restriction is used, then the -situations in which multiple elaboration is possible, including non-Ada main -programs and Stand Alone libraries, are not permitted and will be diagnosed -by the binder. +[GNAT] When this restriction is active and the static elaboration model is +used, and -fpreserve-control-flow is not used, the compiler is allowed to +suppress the elaboration counter normally associated with the unit, even if +the unit has elaboration code. This counter is typically used to check for +access before elaboration and to control multiple elaboration attempts. If the +restriction is used, then the situations in which multiple elaboration is +possible, including non-Ada main programs and Stand Alone libraries, are not +permitted and will be diagnosed by the binder. @node No_Nested_Finalization,No_Protected_Type_Allocators,No_Multiple_Elaboration,Partition-Wide Restrictions @anchor{gnat_rm/standard_and_implementation_defined_restrictions no-nested-finalization}@anchor{1e1} -- 2.30.2