Changeset 640b3df for libcfa/src/interpose_thread.cfa

Timestamp:

Feb 21, 2023, 4:24:34 PM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

257a8f5, ce44c5f

Parents:

1180175 (diff), 9a533ba (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

File:

• libcfa/src/interpose_thread.cfa (modified) (1 diff)

libcfa/src/interpose_thread.cfa

@@ -39 +39 @@
         const char version[]
 ) libcfa_public {
-        const char * error;
-
         static void * library;
         if ( ! library ) {
-                #if defined( RTLD_NEXT )
-                        library = RTLD_NEXT;
-                #else
-                        // missing RTLD_NEXT => must hard-code library name, assuming libstdc++
-                        library = dlopen( "libpthread.so", RTLD_LAZY );
-                        error = dlerror();
-                        if ( error ) {
-                                abort( "interpose_symbol : failed to open libpthread, %s\n", error );
-                        }
-                #endif
+                library = dlopen( "libpthread.so", RTLD_LAZY );
+                const char * error = dlerror();
+                if ( error ) {
+                        abort( "interpose_symbol : failed to open libpthread, %s\n", error );
+                }
         } // if