Ignore:
Timestamp:
Aug 31, 2022, 2:03:03 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, ast-experimental, master, pthread-emulation
Children:
9d67a6d
Parents:
38a238d (diff), 594e1db (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
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • libcfa/src/concurrency/kernel/fwd.hfa

    r38a238d r67a1c67  
    3535extern "C" {
    3636        extern "Cforall" {
    37                 extern __attribute__((aligned(64))) _Thread_local struct KernelThreadData {
     37                extern __attribute__((aligned(64))) __thread struct KernelThreadData {
    3838                        struct thread$          * volatile this_thread;
    3939                        struct processor        * volatile this_processor;

  • libcfa/src/concurrency/kernel/private.hfa

    r38a238d r67a1c67  
    8888#elif defined(CFA_HAVE_LINUX_RSEQ_H)
    8989        extern "Cforall" {
    90                 extern __attribute__((aligned(64))) _Thread_local volatile struct rseq __cfaabi_rseq;
     90                extern __attribute__((aligned(64))) __thread volatile struct rseq __cfaabi_rseq;
    9191        }
    9292#else

  • libcfa/src/concurrency/kernel/startup.cfa

    r38a238d r67a1c67  
    133133//-----------------------------------------------------------------------------
    134134// Global state
    135 _Thread_local struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
     135__thread struct KernelThreadData __cfaabi_tls __attribute__ ((tls_model ( "initial-exec" ))) @= {
    136136        NULL,                                                                                           // cannot use 0p
    137137        NULL,
    … …  
    153153#elif defined(CFA_HAVE_LINUX_RSEQ_H)
    154154        extern "Cforall" {
    155                 __attribute__((aligned(64))) _Thread_local volatile struct rseq __cfaabi_rseq @= {
     155                __attribute__((aligned(64))) __thread volatile struct rseq __cfaabi_rseq @= {
    156156                        .cpu_id : RSEQ_CPU_ID_UNINITIALIZED,
    157157                };

  • libcfa/src/concurrency/preemption.cfa

    r38a238d r67a1c67  
    666666// Kernel Signal Handlers
    667667//=============================================================================================
    668 __cfaabi_dbg_debug_do( static _Thread_local void * last_interrupt = 0; )
     668__cfaabi_dbg_debug_do( static __thread void * last_interrupt = 0; )
    669669
    670670// Context switch signal handler
Note: See TracChangeset for help on using the changeset viewer.