public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-5040] [Ada] Do not indicate a pending abort if the task is already aborting
@ 2021-11-09  9:47 Pierre-Marie de Rodat
  0 siblings, 0 replies; only message in thread
From: Pierre-Marie de Rodat @ 2021-11-09  9:47 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:09afdaeeeba7e4c1fd00f4c43b5e5b36dbe6cf92

commit r12-5040-g09afdaeeeba7e4c1fd00f4c43b5e5b36dbe6cf92
Author: Patrick Bernardi <bernardi@adacore.com>
Date:   Thu Oct 28 18:05:16 2021 -0400

    [Ada] Do not indicate a pending abort if the task is already aborting
    
    gcc/ada/
    
            * libgnarl/s-tasini.adb (Check_Abort_Status): Don't return 1 if
            the task is aborting.
            * libgnarl/s-tasini.ads (Check_Abort_Status): Update comment.

Diff:
---
 gcc/ada/libgnarl/s-tasini.adb | 1 +
 gcc/ada/libgnarl/s-tasini.ads | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gcc/ada/libgnarl/s-tasini.adb b/gcc/ada/libgnarl/s-tasini.adb
index 9acfa4927d6..8d242ee33c1 100644
--- a/gcc/ada/libgnarl/s-tasini.adb
+++ b/gcc/ada/libgnarl/s-tasini.adb
@@ -126,6 +126,7 @@ package body System.Tasking.Initialization is
       if Self_ID /= null
         and then Self_ID.Deferral_Level = 0
         and then Self_ID.Pending_ATC_Level < Self_ID.ATC_Nesting_Level
+        and then not Self_ID.Aborting
       then
          return 1;
       else
diff --git a/gcc/ada/libgnarl/s-tasini.ads b/gcc/ada/libgnarl/s-tasini.ads
index f35df576e68..a551d246650 100644
--- a/gcc/ada/libgnarl/s-tasini.ads
+++ b/gcc/ada/libgnarl/s-tasini.ads
@@ -115,7 +115,7 @@ package System.Tasking.Initialization is
 
    function Check_Abort_Status return Integer;
    --  Returns Boolean'Pos (True) iff abort signal should raise
-   --  Standard'Abort_Signal. Only used by IRIX currently.
+   --  Standard'Abort_Signal. Only used by RTEMS currently.
 
    --------------------------
    -- Change Base Priority --


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2021-11-09  9:47 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-11-09  9:47 [gcc r12-5040] [Ada] Do not indicate a pending abort if the task is already aborting Pierre-Marie de Rodat

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).