Changeset 0a73148 for src/libcfa

Timestamp:

Jul 13, 2018, 6:36:34 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

6da49249

Parents:

6b8b767 (diff), ae144af (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:

fix conflict

Location:

src/libcfa

Files:

• bits/defs.h (modified) (1 diff)
• concurrency/invoke.h (modified) (2 diffs)
• concurrency/monitor (modified) (1 diff)
• containers/result (modified) (1 diff)
• interpose.c (modified) (2 diffs)

src/libcfa/bits/defs.h

@@ -28 +28 @@
 
 #ifdef __cforall
-#define __cfa_anonymous_object
+#define __cfa_anonymous_object(x) inline struct x
 #else
-#define __cfa_anonymous_object __cfa_anonymous_object
+#define __cfa_anonymous_object(x) x __cfa_anonymous_object
 #endif
 

src/libcfa/concurrency/invoke.h

@@ -93 +93 @@
 
                 // list of acceptable functions, null if any
-                __small_array_t(struct __acceptable_t) __cfa_anonymous_object;
+                __cfa_anonymous_object( __small_array_t(struct __acceptable_t) );
         };
 
@@ -121 +121 @@
         struct __monitor_group_t {
                 // currently held monitors
-                __small_array_t(monitor_desc*) __cfa_anonymous_object;
+                __cfa_anonymous_object( __small_array_t(monitor_desc*) );
 
                 // last function that acquired monitors

src/libcfa/concurrency/monitor

@@ -138 +138 @@
 
 struct __acceptable_t {
-        __monitor_group_t;
+        inline struct __monitor_group_t;
         bool is_dtor;
 };

src/libcfa/containers/result

@@ -28 +28 @@
 struct result {
         bool has_value;
-        inner_result(T, E);
+        inline union inner_result(T, E);
 };
 

src/libcfa/interpose.c

@@ -33 +33 @@
 // Interposing helpers
 //=============================================================================================
+
+void preload_libgcc(void) {
+        dlopen( "libgcc_s.so.1", RTLD_NOW );
+        if ( const char * error = dlerror() ) abort( "interpose_symbol : internal error pre-loading libgcc, %s\n", error );
+}
 
 typedef void (* generic_fptr_t)(void);
@@ -92 +97 @@
                 const char *version = NULL;
 
+                preload_libgcc();
+
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"