From: Patrick Bernardi <bernardi@adacore.com>
Date: Thu, 28 Oct 2021 22:05:16 +0000 (-0400)
Subject: [Ada] Do not indicate a pending abort if the task is already aborting
X-Git-Tag: basepoints/gcc-13~3273
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=09afdaeeeba7e4c1fd00f4c43b5e5b36dbe6cf92;p=thirdparty%2Fgcc.git

[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 --git a/gcc/ada/libgnarl/s-tasini.adb b/gcc/ada/libgnarl/s-tasini.adb
index 9acfa4927d6b..8d242ee33c19 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 f35df576e682..a551d246650f 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 --