From 55d4456bd21f4be336943c8d5c2d5dc582c06edc Mon Sep 17 00:00:00 2001 From: hjl Date: Tue, 13 Oct 2009 17:29:08 +0000 Subject: Merged with revision 152720. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/ifunc@152722 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/s-taprop-linux.adb | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'gcc/ada/s-taprop-linux.adb') diff --git a/gcc/ada/s-taprop-linux.adb b/gcc/ada/s-taprop-linux.adb index 6d197f76d1d..46b10a3f1f5 100644 --- a/gcc/ada/s-taprop-linux.adb +++ b/gcc/ada/s-taprop-linux.adb @@ -68,9 +68,6 @@ package body System.Task_Primitives.Operations is use System.OS_Primitives; use System.Task_Info; - Use_Alternate_Stack : constant Boolean := Alternate_Stack_Size /= 0; - -- Whether to use an alternate signal stack for stack overflows - ---------------- -- Local Data -- ---------------- @@ -112,6 +109,12 @@ package body System.Task_Primitives.Operations is Foreign_Task_Elaborated : aliased Boolean := True; -- Used to identified fake tasks (i.e., non-Ada Threads) + Use_Alternate_Stack : constant Boolean := Alternate_Stack_Size /= 0; + -- Whether to use an alternate signal stack for stack overflows + + Abort_Handler_Installed : Boolean := False; + -- True if a handler for the abort signal is installed + -------------------- -- Local Packages -- -------------------- @@ -172,6 +175,11 @@ package body System.Task_Primitives.Operations is Old_Set : aliased sigset_t; begin + -- It's not safe to raise an exception when using GCC ZCX mechanism. + -- Note that we still need to install a signal handler, since in some + -- cases (e.g. shutdown of the Server_Task in System.Interrupts) we + -- need to send the Abort signal to a task. + if ZCX_By_Default and then GCC_ZCX_Support then return; end if; @@ -916,11 +924,13 @@ package body System.Task_Primitives.Operations is procedure Abort_Task (T : Task_Id) is Result : Interfaces.C.int; begin - Result := - pthread_kill - (T.Common.LL.Thread, - Signal (System.Interrupt_Management.Abort_Task_Interrupt)); - pragma Assert (Result = 0); + if Abort_Handler_Installed then + Result := + pthread_kill + (T.Common.LL.Thread, + Signal (System.Interrupt_Management.Abort_Task_Interrupt)); + pragma Assert (Result = 0); + end if; end Abort_Task; ---------------- @@ -1264,8 +1274,6 @@ package body System.Task_Primitives.Operations is Enter_Task (Environment_Task); - -- Install the abort-signal handler - if State (System.Interrupt_Management.Abort_Task_Interrupt) /= Default then @@ -1282,6 +1290,7 @@ package body System.Task_Primitives.Operations is act'Unchecked_Access, old_act'Unchecked_Access); pragma Assert (Result = 0); + Abort_Handler_Installed := True; end if; end Initialize; -- cgit v1.2.1