diff options
| -rw-r--r-- | gcc/ada/s-solita.adb | 14 | ||||
| -rw-r--r-- | gcc/ada/s-tasini.adb | 15 |
2 files changed, 13 insertions, 16 deletions
diff --git a/gcc/ada/s-solita.adb b/gcc/ada/s-solita.adb index 62fd01b5011..0ce4b73fe32 100644 --- a/gcc/ada/s-solita.adb +++ b/gcc/ada/s-solita.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 2004-2006, Free Software Foundation, Inc. -- +-- Copyright (C) 2004-2007, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -48,6 +48,9 @@ with System.Tasking; -- Used for Task_Id -- Cause_Of_Termination +with System.Stack_Checking; +-- Used for Stack_Access + with Ada.Exceptions; -- Used for Exception_Id -- Exception_Occurrence @@ -91,6 +94,9 @@ package body System.Soft_Links.Tasking is procedure Task_Termination_Handler_T (Excep : SSL.EO); -- Task-safe version of the task termination procedure + function Get_Stack_Info return Stack_Checking.Stack_Access; + -- Get access to the current task's Stack_Info + -------------------------- -- Soft-Link Get Bodies -- -------------------------- @@ -105,6 +111,11 @@ package body System.Soft_Links.Tasking is return STPO.Self.Common.Compiler_Data.Sec_Stack_Addr; end Get_Sec_Stack_Addr; + function Get_Stack_Info return Stack_Checking.Stack_Access is + begin + return STPO.Self.Common.Compiler_Data.Pri_Stack_Info'Access; + end Get_Stack_Info; + -------------------------- -- Soft-Link Set Bodies -- -------------------------- @@ -208,6 +219,7 @@ package body System.Soft_Links.Tasking is SSL.Get_Jmpbuf_Address := Get_Jmpbuf_Address'Access; SSL.Set_Jmpbuf_Address := Set_Jmpbuf_Address'Access; SSL.Get_Sec_Stack_Addr := Get_Sec_Stack_Addr'Access; + SSL.Get_Stack_Info := Get_Stack_Info'Access; SSL.Set_Sec_Stack_Addr := Set_Sec_Stack_Addr'Access; SSL.Timed_Delay := Timed_Delay_T'Access; SSL.Task_Termination_Handler := Task_Termination_Handler_T'Access; diff --git a/gcc/ada/s-tasini.adb b/gcc/ada/s-tasini.adb index b22a1b5794d..5b3bb2d29e5 100644 --- a/gcc/ada/s-tasini.adb +++ b/gcc/ada/s-tasini.adb @@ -62,8 +62,6 @@ with System.Soft_Links.Tasking; with System.Tasking.Debug; -- Used for Trace -with System.Stack_Checking; - with System.Parameters; -- used for Single_Lock @@ -104,9 +102,6 @@ package body System.Tasking.Initialization is -- all nested locks must be released before other tasks competing for the -- tasking lock are released. - function Get_Stack_Info return Stack_Checking.Stack_Access; - -- Get access to the current task's Stack_Info - function Get_Current_Excep return SSL.EOA; -- Task-safe version of SSL.Get_Current_Excep @@ -382,7 +377,6 @@ package body System.Tasking.Initialization is SSL.Lock_Task := Task_Lock'Access; SSL.Unlock_Task := Task_Unlock'Access; SSL.Check_Abort_Status := Check_Abort_Status'Access; - SSL.Get_Stack_Info := Get_Stack_Info'Access; SSL.Task_Name := Task_Name'Access; SSL.Update_Exception := Update_Exception'Access; SSL.Get_Current_Excep := Get_Current_Excep'Access; @@ -823,15 +817,6 @@ package body System.Tasking.Initialization is end if; end Wakeup_Entry_Caller; - ---------------------- - -- Soft-Link Bodies -- - ---------------------- - - function Get_Stack_Info return Stack_Checking.Stack_Access is - begin - return STPO.Self.Common.Compiler_Data.Pri_Stack_Info'Access; - end Get_Stack_Info; - ----------------------- -- Soft-Link Dummies -- ----------------------- |