diff options
author | Arnaud Charlet <charlet@adacore.com> | 2021-07-12 06:14:15 -0400 |
---|---|---|
committer | Pierre-Marie de Rodat <derodat@adacore.com> | 2021-09-22 15:01:41 +0000 |
commit | d232417a8832c480abeb1c28abd66978b85e5081 (patch) | |
tree | 50aedc5876fbc1d100628a2cbbc977c92f000d8d /gcc | |
parent | ab857d1a3b4b726262c4c9d31c22d214a3ffee53 (diff) | |
download | gcc-d232417a8832c480abeb1c28abd66978b85e5081.zip gcc-d232417a8832c480abeb1c28abd66978b85e5081.tar.gz gcc-d232417a8832c480abeb1c28abd66978b85e5081.tar.bz2 |
[Ada] Make Ada.Task_Initialization compatible with No_Elaboration_Code_All
gcc/ada/
* libgnarl/a-tasini.ads, libgnarl/a-tasini.adb: Make compatible
with No_Elaboration_Code_All.
* libgnarl/s-taskin.ads, libgnarl/s-tassta.adb: Adjust
accordingly.
Diffstat (limited to 'gcc')
-rw-r--r-- | gcc/ada/libgnarl/a-tasini.adb | 12 | ||||
-rw-r--r-- | gcc/ada/libgnarl/a-tasini.ads | 3 | ||||
-rw-r--r-- | gcc/ada/libgnarl/s-taskin.ads | 8 | ||||
-rw-r--r-- | gcc/ada/libgnarl/s-tassta.adb | 9 |
4 files changed, 17 insertions, 15 deletions
diff --git a/gcc/ada/libgnarl/a-tasini.adb b/gcc/ada/libgnarl/a-tasini.adb index c0dfe70..a8981d6 100644 --- a/gcc/ada/libgnarl/a-tasini.adb +++ b/gcc/ada/libgnarl/a-tasini.adb @@ -26,13 +26,13 @@ -- -- ------------------------------------------------------------------------------ -with Ada.Unchecked_Conversion; -with System.Tasking; - package body Ada.Task_Initialization is - function To_STIH is new Ada.Unchecked_Conversion - (Initialization_Handler, System.Tasking.Initialization_Handler); + Global_Initialization_Handler : Initialization_Handler := null; + pragma Atomic (Global_Initialization_Handler); + pragma Export (Ada, Global_Initialization_Handler, + "__gnat_global_initialization_handler"); + -- Global handler called when each task initializes. -------------------------------- -- Set_Initialization_Handler -- @@ -40,7 +40,7 @@ package body Ada.Task_Initialization is procedure Set_Initialization_Handler (Handler : Initialization_Handler) is begin - System.Tasking.Global_Initialization_Handler := To_STIH (Handler); + Global_Initialization_Handler := Handler; end Set_Initialization_Handler; end Ada.Task_Initialization; diff --git a/gcc/ada/libgnarl/a-tasini.ads b/gcc/ada/libgnarl/a-tasini.ads index dd2a17c..2366145 100644 --- a/gcc/ada/libgnarl/a-tasini.ads +++ b/gcc/ada/libgnarl/a-tasini.ads @@ -30,7 +30,8 @@ -- when tasks start. package Ada.Task_Initialization is - pragma Preelaborate (Task_Initialization); + pragma Preelaborate; + pragma No_Elaboration_Code_All; type Initialization_Handler is access procedure; diff --git a/gcc/ada/libgnarl/s-taskin.ads b/gcc/ada/libgnarl/s-taskin.ads index 5c03829..cf560b5 100644 --- a/gcc/ada/libgnarl/s-taskin.ads +++ b/gcc/ada/libgnarl/s-taskin.ads @@ -368,14 +368,6 @@ package System.Tasking is -- Used to represent protected procedures to be executed when task -- terminates. - type Initialization_Handler is access procedure; - pragma Favor_Top_Level (Initialization_Handler); - -- Use to represent procedures to be executed at task initialization. - - Global_Initialization_Handler : Initialization_Handler := null; - pragma Atomic (Global_Initialization_Handler); - -- Global handler called when each task initializes. - ------------------------------------ -- Dispatching domain definitions -- ------------------------------------ diff --git a/gcc/ada/libgnarl/s-tassta.adb b/gcc/ada/libgnarl/s-tassta.adb index 88850c2..bbc7d14 100644 --- a/gcc/ada/libgnarl/s-tassta.adb +++ b/gcc/ada/libgnarl/s-tassta.adb @@ -35,6 +35,7 @@ pragma Partition_Elaboration_Policy (Concurrent); with Ada.Exceptions; with Ada.Unchecked_Deallocation; +with Ada.Task_Initialization; with System.Interrupt_Management; with System.Tasking.Debug; @@ -1177,6 +1178,14 @@ package body System.Tasking.Stages is Debug.Signal_Debug_Event (Debug.Debug_Event_Run, Self_ID); end if; + declare + use Ada.Task_Initialization; + + Global_Initialization_Handler : Initialization_Handler; + pragma Atomic (Global_Initialization_Handler); + pragma Import (Ada, Global_Initialization_Handler, + "__gnat_global_initialization_handler"); + begin -- We are separating the following portion of the code in order to -- place the exception handlers in a different block. In this way, |