Changeset 23a08aa0 for libcfa/src/concurrency/kernel/startup.cfa

Timestamp:

Sep 19, 2022, 8:11:02 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

aa9f215

Parents:

ebf8ca5 (diff), ae1d151 (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:

fix merge conflict

File:

• libcfa/src/concurrency/kernel/startup.cfa (modified) (2 diffs)

libcfa/src/concurrency/kernel/startup.cfa

@@ -133 +133 @@
 //-----------------------------------------------------------------------------
 // Global state
-thread_local struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
+__thread 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 volatile struct rseq __cfaabi_rseq @= {
                         .cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
                 };