Changeset 0a73148 for src/libcfa/interpose.c

Timestamp:

Jul 13, 2018, 6:36:34 PM (6 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

File:

• src/libcfa/interpose.c (modified) (2 diffs)

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"