Ignore:
Timestamp:
Dec 8, 2020, 6:40:21 PM (3 years ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum
Children:
364a03c
Parents:
0f7a0ea (diff), d7a10af (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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • libcfa/src/concurrency/preemption.cfa

    r0f7a0ea r48f6252  
    405405                #define RELOC_SUFFIX ""
    406406        #endif
    407         #define __cfaasm_label( label ) static struct asm_region label = \
     407        #define __cfaasm_label( label ) struct asm_region label = \
    408408                ({ \
    409409                        struct asm_region region; \
     
    424424                #define RELOC_SUFFIX ""
    425425        #endif
    426         #define __cfaasm_label( label ) static struct asm_region label = \
     426        #define __cfaasm_label( label ) struct asm_region label = \
    427427                ({ \
    428428                        struct asm_region region; \
     
    437437        #ifdef __PIC__
    438438                // Note that this works only for gcc
    439                 #define __cfaasm_label( label ) static struct asm_region label = \
     439                #define __cfaasm_label( label ) struct asm_region label = \
    440440                ({ \
    441441                        struct asm_region region; \
     
    452452                #error this is not the right thing to do
    453453                /*
    454                 #define __cfaasm_label( label ) static struct asm_region label = \
     454                #define __cfaasm_label( label ) struct asm_region label = \
    455455                ({ \
    456456                        struct asm_region region; \
Note: See TracChangeset for help on using the changeset viewer.