Changeset 90a8125 for libcfa/src/bits

Timestamp:

Jun 3, 2022, 3:10:01 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

7affcda

Parents:

bf0263c (diff), fc134a48 (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/bits

Files:

• debug.cfa (modified) (2 diffs)
• defs.hfa (modified) (1 diff)
• weakso_locks.cfa (modified) (1 diff)

libcfa/src/bits/debug.cfa

@@ -21 +21 @@
 #include <unistd.h>
 
+#include "bits/defs.hfa"
+
 enum { buffer_size = 4096 };
 static char buffer[ buffer_size ];
 
 extern "C" {
-        void __cfaabi_bits_write( int fd, const char in_buffer[], int len ) {
+        // would be cool to remove libcfa_public but it's needed for libcfathread
+        void __cfaabi_bits_write( int fd, const char in_buffer[], int len ) libcfa_public {
                 // ensure all data is written
                 for ( int count = 0, retcode; count < len; count += retcode ) {
@@ -44 +47 @@
         void __cfaabi_bits_release() __attribute__((__weak__)) {}
 
-        int __cfaabi_bits_print_safe  ( int fd, const char fmt[], ... ) __attribute__(( format(printf, 2, 3) )) {
+        // would be cool to remove libcfa_public but it's needed for libcfathread
+        int __cfaabi_bits_print_safe  ( int fd, const char fmt[], ... ) __attribute__(( format(printf, 2, 3) )) libcfa_public {
                 va_list args;
 

libcfa/src/bits/defs.hfa

@@ -36 +36 @@
 #define __cfa_dlink(x) struct { struct x * next; struct x * back; } __dlink_substitute
 #endif
+
+#define libcfa_public __attribute__((visibility("default")))
 
 #ifdef __cforall

libcfa/src/bits/weakso_locks.cfa

@@ -18 +18 @@
 #include "bits/weakso_locks.hfa"
 
+#pragma GCC visibility push(default)
+
 void  ?{}( blocking_lock &, bool, bool ) {}
 void ^?{}( blocking_lock & ) {}