Changes in libcfa/src/interpose.cfa [032234bd:9cd5bd2]

File:

• libcfa/src/interpose.cfa (modified) (4 diffs)

libcfa/src/interpose.cfa

@@ -42 +42 @@
 
 typedef void (* generic_fptr_t)(void);
+static generic_fptr_t do_interpose_symbol( void * library, const char symbol[], const char version[] ) {
+        const char * error;
+
+        union { generic_fptr_t fptr; void * ptr; } originalFunc;
+
+        #if defined( _GNU_SOURCE )
+                if ( version ) {
+                        originalFunc.ptr = dlvsym( library, symbol, version );
+                } else {
+                        originalFunc.ptr = dlsym( library, symbol );
+                }
+        #else
+                originalFunc.ptr = dlsym( library, symbol );
+        #endif // _GNU_SOURCE
+
+        error = dlerror();
+        if ( error ) abort( "interpose_symbol : internal error, %s\n", error );
+
+        return originalFunc.fptr;
+}
+
 static generic_fptr_t interpose_symbol( const char symbol[], const char version[] ) {
         const char * error;
 
         static void * library;
+        static void * pthread_library;
         if ( ! library ) {
                 #if defined( RTLD_NEXT )
@@ -58 +80 @@
                 #endif
         } // if
-
-        union { generic_fptr_t fptr; void * ptr; } originalFunc;
-
-        #if defined( _GNU_SOURCE )
-                if ( version ) {
-                        originalFunc.ptr = dlvsym( library, symbol, version );
-                } else {
-                        originalFunc.ptr = dlsym( library, symbol );
-                }
-        #else
-                originalFunc.ptr = dlsym( library, symbol );
-        #endif // _GNU_SOURCE
-
-        error = dlerror();
-        if ( error ) abort( "interpose_symbol : internal error, %s\n", error );
-
-        return originalFunc.fptr;
+        if ( ! pthread_library ) {
+                #if defined( RTLD_NEXT )
+                        pthread_library = RTLD_NEXT;
+                #else
+                        // missing RTLD_NEXT => must hard-code library name, assuming libstdc++
+                        pthread_library = dlopen( "libpthread.so", RTLD_LAZY );
+                        error = dlerror();
+                        if ( error ) {
+                                abort( "interpose_symbol : failed to open libpthread, %s\n", error );
+                        }
+                #endif
+        } // if
+
+        return do_interpose_symbol(library, symbol, version);
 }
 
@@ -97 +116 @@
 
 extern "C" {
+        void __cfathreadabi_interpose_startup( generic_fptr_t (*do_interpose_symbol)( void * library, const char symbol[], const char version[] ) ) __attribute__((weak));
         void __cfaabi_interpose_startup( void ) {
                 const char *version = 0p;
@@ -108 +128 @@
                 INTERPOSE_LIBC( exit , version );
 #pragma GCC diagnostic pop
+
+                if(__cfathreadabi_interpose_startup) __cfathreadabi_interpose_startup( do_interpose_symbol );
 
                 // As a precaution (and necessity), errors that result in termination are delivered on a separate stack because