Changeset 48f6252 for libcfa/src

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

Location:

libcfa/src

Files:

• Makefile.am (modified) (3 diffs)
• concurrency/preemption.cfa (modified) (4 diffs)

libcfa/src/Makefile.am

@@ -43 +43 @@
         clock.hfa \
         exception.hfa \
+        exception.h \
         gmp.hfa \
         math.hfa \
@@ -77 +78 @@
         bits/debug.cfa \
         exception.c \
-        exception.h \
         interpose.cfa \
         lsda.h \
@@ -87 +87 @@
 # not all platforms support concurrency, add option do disable it
 inst_thread_headers_nosrc = \
+        bits/collection.hfa \
         bits/random.hfa \
+        bits/sequence.hfa \
         concurrency/clib/cfathread.h \
         concurrency/invoke.h \

libcfa/src/concurrency/preemption.cfa

@@ -405 +405 @@
                 #define RELOC_SUFFIX ""
         #endif
-        #define __cfaasm_label( label ) static struct asm_region label = \
+        #define __cfaasm_label( label ) struct asm_region label = \
                 ({ \
                         struct asm_region region; \
@@ -424 +424 @@
                 #define RELOC_SUFFIX ""
         #endif
-        #define __cfaasm_label( label ) static struct asm_region label = \
+        #define __cfaasm_label( label ) struct asm_region label = \
                 ({ \
                         struct asm_region region; \
@@ -437 +437 @@
         #ifdef __PIC__
                 // Note that this works only for gcc
-                #define __cfaasm_label( label ) static struct asm_region label = \
+                #define __cfaasm_label( label ) struct asm_region label = \
                 ({ \
                         struct asm_region region; \
@@ -452 +452 @@
                 #error this is not the right thing to do
                 /*
-                #define __cfaasm_label( label ) static struct asm_region label = \
+                #define __cfaasm_label( label ) struct asm_region label = \
                 ({ \
                         struct asm_region region; \