aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorPatrick Bernardi <bernardi@adacore.com>2021-10-28 18:05:16 -0400
committerPierre-Marie de Rodat <derodat@adacore.com>2021-11-09 09:44:50 +0000
commit09afdaeeeba7e4c1fd00f4c43b5e5b36dbe6cf92 (patch)
tree7f6616e5872b0372397e4e7ae940fbb9617560ef /gcc
parentf6174ec5bd9c2560f009c8c84170944b08535330 (diff)
downloadgcc-09afdaeeeba7e4c1fd00f4c43b5e5b36dbe6cf92.zip
gcc-09afdaeeeba7e4c1fd00f4c43b5e5b36dbe6cf92.tar.gz
gcc-09afdaeeeba7e4c1fd00f4c43b5e5b36dbe6cf92.tar.bz2
[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.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/libgnarl/s-tasini.adb1
-rw-r--r--gcc/ada/libgnarl/s-tasini.ads2
2 files changed, 2 insertions, 1 deletions
diff --git a/gcc/ada/libgnarl/s-tasini.adb b/gcc/ada/libgnarl/s-tasini.adb
index 9acfa49..8d242ee 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 f35df576..a551d24 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 --