Changeset 9082d7e8 for libcfa

Timestamp:

Mar 30, 2023, 4:05:59 PM (13 months ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

bd72c28

Parents:

d24b1985 (diff), ff443e5 (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

Location:

libcfa/src

Files:

• concurrency/pthread.cfa (modified) (2 diffs)
• interpose.cfa (modified) (3 diffs)
• interpose_thread.cfa (modified) (2 diffs)

libcfa/src/concurrency/pthread.cfa

@@ -152 +152 @@
 
 //######################### Attr helpers #########################
-struct cfaPthread_attr_t {                                                              // thread attributes
+typedef struct cfaPthread_attr_t {                                              // thread attributes
                 int contentionscope;
                 int detachstate;
@@ -160 +160 @@
                 int inheritsched;
                 struct sched_param param;
-} typedef cfaPthread_attr_t;
+} cfaPthread_attr_t;
 
 static const cfaPthread_attr_t default_attrs {

libcfa/src/interpose.cfa

@@ -10 +10 @@
 // Created On       : Wed Mar 29 16:10:31 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Mar 13 22:39:12 2023
-// Update Count     : 193
+// Last Modified On : Mon Mar 27 21:09:03 2023
+// Update Count     : 196
 //
 
@@ -40 +40 @@
         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 );
+        } // if
+        #else
         originalFunc.ptr = dlsym( library, symbol );
-        if ( ! originalFunc.ptr ) {                                                             // == nullptr
+        #endif // _GNU_SOURCE
+
+        if ( ! originalFunc.ptr ) {                                                     // == nullptr
                 abort( "interpose_symbol : internal error, %s\n", dlerror() );
         } // if
@@ -49 +58 @@
 static generic_fptr_t interpose_symbol( const char symbol[], const char version[] ) {
         void * library;
+
         #if defined( RTLD_NEXT )
         library = RTLD_NEXT;

libcfa/src/interpose_thread.cfa

@@ -14 +14 @@
 //
 
+// BUG in 32-bit gcc with interpose: fixed in >= gcc-9.5, gcc-10.4, gcc-12.2
 #ifdef __i386__                                                                                 // 32-bit architecture
 #undef _GNU_SOURCE
@@ -33 +34 @@
 typedef void (* generic_fptr_t)(void);
 
-generic_fptr_t interpose_symbol(
+generic_fptr_t libcfa_public interpose_symbol(
         generic_fptr_t (*do_interpose_symbol)( void * library, const char symbol[], const char version[] ),
         const char symbol[],
         const char version[]
-) libcfa_public {
+) {
         void * library;