Changeset a0dbf20 for libcfa/src/concurrency/kernel

Timestamp:

Aug 30, 2022, 6:30:32 PM (23 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

4858a88

Parents:

a8dd247 (diff), 01ba701 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

libcfa/src/concurrency/kernel

Files:

• fwd.hfa (modified) (1 diff)
• private.hfa (modified) (1 diff)
• startup.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel/fwd.hfa

@@ -35 +35 @@
 extern "C" {
         extern "Cforall" {
-                extern __attribute__((aligned(64))) thread_local struct KernelThreadData {
+                extern __attribute__((aligned(64))) _Thread_local struct KernelThreadData {
                         struct thread$          * volatile this_thread;
                         struct processor        * volatile this_processor;

libcfa/src/concurrency/kernel/private.hfa

@@ -88 +88 @@
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
         extern "Cforall" {
-                extern __attribute__((aligned(64))) thread_local volatile struct rseq __cfaabi_rseq;
+                extern __attribute__((aligned(64))) _Thread_local volatile struct rseq __cfaabi_rseq;
         }
 #else

libcfa/src/concurrency/kernel/startup.cfa

@@ -133 +133 @@
 //-----------------------------------------------------------------------------
 // Global state
-thread_local struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
+_Thread_local struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
         NULL,                                                                                           // cannot use 0p
         NULL,
@@ -153 +153 @@
 #elif defined(CFA_HAVE_LINUX_RSEQ_H)
         extern "Cforall" {
-                __attribute__((aligned(64))) thread_local volatile struct rseq __cfaabi_rseq @= {
+                __attribute__((aligned(64))) _Thread_local volatile struct rseq __cfaabi_rseq @= {
                         .cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
                 };