Changeset 640b3df for libcfa/src/interpose.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.cfa (modified) (3 diffs)

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jan  5 22:23:57 2023
-// Update Count     : 180
+// Last Modified On : Sun Feb 19 17:09:16 2023
+// Update Count     : 183
 //
 
@@ -45 +45 @@
         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
-
+        originalFunc.ptr = dlsym( library, symbol );
         error = dlerror();
         if ( error ) abort( "interpose_symbol : internal error, %s\n", error );
@@ -62 +53 @@
 
 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 )
-                        library = RTLD_NEXT;
-                #else
-                        // missing RTLD_NEXT => must hard-code library name, assuming libstdc++
-                        library = dlopen( "libc.so.6", RTLD_LAZY );
-                        error = dlerror();
-                        if ( error ) {
-                                abort( "interpose_symbol : failed to open libc, %s\n", error );
-                        }
-                #endif
+                library = dlopen( "libc.so.6", RTLD_LAZY );
+                const char * error = dlerror();
+                if ( error ) {
+                        abort( "interpose_symbol : failed to open libc, %s\n", error );
+                } // if
         } // if
         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
+                pthread_library = dlopen( "libpthread.so", RTLD_LAZY );
+                const char * error = dlerror();
+                if ( error ) {
+                        abort( "interpose_symbol : failed to open libpthread, %s\n", error );
+                } // if
         } // if