From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1914) id 86DA23858430; Wed, 22 Sep 2021 15:09:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 86DA23858430 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Pierre-Marie de Rodat To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-3794] [Ada] Make Ada.Task_Initialization compatible with No_Elaboration_Code_All X-Act-Checkin: gcc X-Git-Author: Arnaud Charlet X-Git-Refname: refs/heads/master X-Git-Oldrev: ab857d1a3b4b726262c4c9d31c22d214a3ffee53 X-Git-Newrev: d232417a8832c480abeb1c28abd66978b85e5081 Message-Id: <20210922150948.86DA23858430@sourceware.org> Date: Wed, 22 Sep 2021 15:09:48 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Sep 2021 15:09:48 -0000 https://gcc.gnu.org/g:d232417a8832c480abeb1c28abd66978b85e5081 commit r12-3794-gd232417a8832c480abeb1c28abd66978b85e5081 Author: Arnaud Charlet Date: Mon Jul 12 06:14:15 2021 -0400 [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. Diff: --- gcc/ada/libgnarl/a-tasini.adb | 12 ++++++------ gcc/ada/libgnarl/a-tasini.ads | 3 ++- gcc/ada/libgnarl/s-taskin.ads | 8 -------- 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 c0dfe705879..a8981d6dd69 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 dd2a17c6b14..2366145da04 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 5c03829f1e9..cf560b569fb 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 88850c24693..bbc7d14d5d8 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,