From: Sebastian Huber Date: Wed, 7 Jun 2017 09:49:27 +0000 (+0000) Subject: RTEMS: Use TLS for Ada run-time X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e059725b244388bc318ff5fb4a4aeb4cca86abfd;p=gcc.git RTEMS: Use TLS for Ada run-time Do not use the RTEMS-specific task variables for the Ada run-time since they are not available in RTEMS 4.12 or later. Use thread-local storage instead. gcc/ada * Makefile.in (rtems): Use TLS implementation for s-tpopsp.adb. * s-tpopsp-rtems.adb: Delete. From-SVN: r248952 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1b1a8f178dd..e5daf42808b 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,8 @@ +2017-06-07 Sebastian Huber + + * Makefile.in (rtems): Use TLS implementation for s-tpopsp.adb. + * s-tpopsp-rtems.adb: Delete. + 2017-06-02 Olivier Hainque * vx_crtbegin_auto.c: New file. diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index 9566759f760..d44d68a1af6 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1745,7 +1745,7 @@ ifeq ($(strip $(filter-out rtems%,$(target_os))),) s-parame.adb. -- --- -- --- GNARL was developed by the GNARL team at Florida State University. It is -- --- now maintained by Ada Core Technologies Inc. in cooperation with Florida -- --- State University (http://www.gnat.com). -- --- -- ------------------------------------------------------------------------------- - --- This is a RTEMS version of this package which uses a special --- variable for Ada self which is context switched implicitly by RTEMS. --- --- This is the same as the POSIX version except that an RTEMS variable --- is used instead of a POSIX key. - -separate (System.Task_Primitives.Operations) -package body Specific is - - -- The following gives the Ada run-time direct access to a variable - -- context switched by RTEMS at the lowest level. - - ATCB_Key : System.Address; - pragma Import (C, ATCB_Key, "rtems_ada_self"); - - ---------------- - -- Initialize -- - ---------------- - - procedure Initialize (Environment_Task : Task_Id) is - pragma Warnings (Off, Environment_Task); - - begin - ATCB_Key := To_Address (Environment_Task); - end Initialize; - - ------------------- - -- Is_Valid_Task -- - ------------------- - - function Is_Valid_Task return Boolean is - begin - return ATCB_Key /= System.Null_Address; - end Is_Valid_Task; - - --------- - -- Set -- - --------- - - procedure Set (Self_Id : Task_Id) is - begin - ATCB_Key := To_Address (Self_Id); - end Set; - - ---------- - -- Self -- - ---------- - - -- To make Ada tasks and C threads interoperate better, we have added some - -- functionality to Self. Suppose a C main program (with threads) calls an - -- Ada procedure and the Ada procedure calls the tasking runtime system. - -- Eventually, a call will be made to self. Since the call is not coming - -- from an Ada task, there will be no corresponding ATCB. - - -- What we do in Self is to catch references that do not come from - -- recognized Ada tasks, and create an ATCB for the calling thread. - - -- The new ATCB will be "detached" from the normal Ada task master - -- hierarchy, much like the existing implicitly created signal-server - -- tasks. - - function Self return Task_Id is - Result : System.Address; - - begin - Result := ATCB_Key; - - -- If the key value is Null, then it is a non-Ada task. - - if Result /= System.Null_Address then - return To_Task_Id (Result); - else - return Register_Foreign_Thread; - end if; - end Self; - -end Specific;