Changeset cdbab55 for libcfa/src/concurrency/kernel.cfa

Timestamp:

Aug 21, 2018, 2:24:29 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, stuck-waitfor-destruct

Children:

2a6292d

Parents:

2b79a70 (diff), efa8b6af (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:/u/cforall/software/cfa/cfa-cc

File:

• libcfa/src/concurrency/kernel.cfa (moved) (moved from src/libcfa/concurrency/kernel.c ) (2 diffs)

libcfa/src/concurrency/kernel.cfa

@@ -27 +27 @@
 
 //CFA Includes
-#include "time"
-#include "kernel_private.h"
-#include "preemption.h"
-#include "startup.h"
+#include "time.hfa"
+#include "kernel_private.hfa"
+#include "preemption.hfa"
+#include "startup.hfa"
 
 //Private includes
@@ -833 +833 @@
 // Debug
 __cfaabi_dbg_debug_do(
-        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
-                this.prev_name = prev_name;
-                this.prev_thrd = kernelTLS.this_thread;
+        extern "C" {
+                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
+                        this.prev_name = prev_name;
+                        this.prev_thrd = kernelTLS.this_thread;
+                }
         }
 )