Changes in / [3b2b37f:cc22003]

Location:

src

Files:

• driver/cfa.cc (modified) (1 diff)
• libcfa/bits/locks.h (modified) (2 diffs)
• libcfa/concurrency/kernel.c (modified) (1 diff)
• libcfa/startup.c (modified) (1 diff)

src/driver/cfa.cc

@@ -347 +347 @@
                 args[nargs] = "--undefined=__cfaabi_appready_startup";
                 nargs += 1;
-                args[nargs] = "-Xlinker";
-                nargs += 1;
-                args[nargs] = "--undefined=__cfaabi_dbg_record";
-                nargs += 1;
 
                 // include the cfa library in case it's needed

src/libcfa/bits/locks.h

@@ -64 +64 @@
                 extern void disable_interrupts();
                 extern void enable_interrupts_noPoll();
-
-                #ifdef __CFA_DEBUG__
-                        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
-                #else
-                        #define __cfaabi_dbg_record(x, y)
-                #endif
         }
 
@@ -77 +71 @@
                 this.lock = 0;
         }
+
+
+        #ifdef __CFA_DEBUG__
+                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name);
+        #else
+                #define __cfaabi_dbg_record(x, y)
+        #endif
 
         // Lock the spinlock, return false if already acquired

src/libcfa/concurrency/kernel.c

@@ -833 +833 @@
 // Debug
 __cfaabi_dbg_debug_do(
-        extern "C" {
-                void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
-                        this.prev_name = prev_name;
-                        this.prev_thrd = kernelTLS.this_thread;
-                }
+        void __cfaabi_dbg_record(__spinlock_t & this, const char * prev_name) {
+                this.prev_name = prev_name;
+                this.prev_thrd = kernelTLS.this_thread;
         }
 )

src/libcfa/startup.c

@@ -40 +40 @@
 
 struct __spinlock_t;
-extern "C" {
-        void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {}
-}
+void __cfaabi_dbg_record(struct __spinlock_t & this, const char * prev_name) __attribute__(( weak )) {}
 
 // Local Variables: //