htl: move pthread_mutexattr_setprioceiling, pthread_mutexattr_getprioceiling into libc.

Message-ID: <20241231134909.1166440-9-gfleury@disroot.org>

6 files changed, 24 insertions, 8 deletions

diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c
index 8848287..cb46251 100644
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-getprioceiling.c
@@ -16,19 +16,25 @@
    License along with the GNU C Library;  if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <pthread.h>
+#include <pthreadP.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <shlib-compat.h>
 
 int
-pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp)
+__pthread_mutexattr_getprioceiling (const pthread_mutexattr_t *ap, int *clp)
 {
   (void) ap;
   (void) clp;
   return ENOSYS;
 }
+libc_hidden_def (__pthread_mutexattr_getprioceiling)
+versioned_symbol (libc, __pthread_mutexattr_getprioceiling, pthread_mutexattr_getprioceiling, GLIBC_2_41);
 
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_mutexattr_getprioceiling,pthread_mutexattr_getprioceiling, GLIBC_2_12);
+#endif
 stub_warning (pthread_mutexattr_getprioceiling)
diff --git a/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c b/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c
index a15593a..8515235 100644
--- a/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c
+++ b/sysdeps/mach/hurd/htl/pt-mutexattr-setprioceiling.c
@@ -16,19 +16,25 @@
    License along with the GNU C Library;  if not, see
    <https://www.gnu.org/licenses/>.  */
 
-#include <pthread.h>
+#include <pthreadP.h>
 #include <stdlib.h>
 #include <assert.h>
 #include <pt-internal.h>
 #include "pt-mutex.h"
 #include <hurdlock.h>
+#include <shlib-compat.h>
 
 int
-pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl)
+__pthread_mutexattr_setprioceiling (pthread_mutexattr_t *attrp, int cl)
 {
   (void) attrp;
   (void) cl;
   return ENOSYS;
 }
+libc_hidden_def (__pthread_mutexattr_setprioceiling)
+versioned_symbol (libc, __pthread_mutexattr_setprioceiling, pthread_mutexattr_setprioceiling, GLIBC_2_41);
 
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_12, GLIBC_2_41)
+compat_symbol (libpthread, __pthread_mutexattr_setprioceiling,pthread_mutexattr_setprioceiling, GLIBC_2_12);
+#endif
 stub_warning (pthread_mutexattr_setprioceiling)
diff --git a/sysdeps/mach/hurd/i386/libc.abilist b/sysdeps/mach/hurd/i386/libc.abilist
index 8e364b1..40f35ee 100644
--- a/sysdeps/mach/hurd/i386/libc.abilist
+++ b/sysdeps/mach/hurd/i386/libc.abilist
@@ -64,10 +64,12 @@ GLIBC_2.12 pthread_condattr_setpshared F
 GLIBC_2.12 pthread_equal F
 GLIBC_2.12 pthread_getschedparam F
 GLIBC_2.12 pthread_mutexattr_destroy F
+GLIBC_2.12 pthread_mutexattr_getprioceiling F
 GLIBC_2.12 pthread_mutexattr_getprotocol F
 GLIBC_2.12 pthread_mutexattr_getpshared F
 GLIBC_2.12 pthread_mutexattr_gettype F
 GLIBC_2.12 pthread_mutexattr_init F
+GLIBC_2.12 pthread_mutexattr_setprioceiling F
 GLIBC_2.12 pthread_mutexattr_setprotocol F
 GLIBC_2.12 pthread_mutexattr_setpshared F
 GLIBC_2.12 pthread_mutexattr_settype F
@@ -2533,11 +2535,13 @@ GLIBC_2.41 pthread_condattr_getclock F
 GLIBC_2.41 pthread_condattr_getpshared F
 GLIBC_2.41 pthread_condattr_setclock F
 GLIBC_2.41 pthread_condattr_setpshared F
+GLIBC_2.41 pthread_mutexattr_getprioceiling F
 GLIBC_2.41 pthread_mutexattr_getprotocol F
 GLIBC_2.41 pthread_mutexattr_getpshared F
 GLIBC_2.41 pthread_mutexattr_getrobust F
 GLIBC_2.41 pthread_mutexattr_getrobust_np F
 GLIBC_2.41 pthread_mutexattr_gettype F
+GLIBC_2.41 pthread_mutexattr_setprioceiling F
 GLIBC_2.41 pthread_mutexattr_setprotocol F
 GLIBC_2.41 pthread_mutexattr_setpshared F
 GLIBC_2.41 pthread_mutexattr_setrobust F
diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist
index bc48c00..b925871 100644
--- a/sysdeps/mach/hurd/i386/libpthread.abilist
+++ b/sysdeps/mach/hurd/i386/libpthread.abilist
@@ -50,8 +50,6 @@ GLIBC_2.12 pthread_mutex_timedlock F
 GLIBC_2.12 pthread_mutex_transfer_np F
 GLIBC_2.12 pthread_mutex_trylock F
 GLIBC_2.12 pthread_mutex_unlock F
-GLIBC_2.12 pthread_mutexattr_getprioceiling F
-GLIBC_2.12 pthread_mutexattr_setprioceiling F
 GLIBC_2.12 pthread_once F
 GLIBC_2.12 pthread_rwlock_destroy F
 GLIBC_2.12 pthread_rwlock_init F
diff --git a/sysdeps/mach/hurd/x86_64/libc.abilist b/sysdeps/mach/hurd/x86_64/libc.abilist
index 05a4a8c..aaf55cb 100644
--- a/sysdeps/mach/hurd/x86_64/libc.abilist
+++ b/sysdeps/mach/hurd/x86_64/libc.abilist
@@ -1552,12 +1552,14 @@ GLIBC_2.38 pthread_mutex_init F
 GLIBC_2.38 pthread_mutex_lock F
 GLIBC_2.38 pthread_mutex_unlock F
 GLIBC_2.38 pthread_mutexattr_destroy F
+GLIBC_2.38 pthread_mutexattr_getprioceiling F
 GLIBC_2.38 pthread_mutexattr_getprotocol F
 GLIBC_2.38 pthread_mutexattr_getpshared F
 GLIBC_2.38 pthread_mutexattr_getrobust F
 GLIBC_2.38 pthread_mutexattr_getrobust_np F
 GLIBC_2.38 pthread_mutexattr_gettype F
 GLIBC_2.38 pthread_mutexattr_init F
+GLIBC_2.38 pthread_mutexattr_setprioceiling F
 GLIBC_2.38 pthread_mutexattr_setprotocol F
 GLIBC_2.38 pthread_mutexattr_setpshared F
 GLIBC_2.38 pthread_mutexattr_setrobust F
@@ -2222,11 +2224,13 @@ GLIBC_2.41 pthread_condattr_getclock F
 GLIBC_2.41 pthread_condattr_getpshared F
 GLIBC_2.41 pthread_condattr_setclock F
 GLIBC_2.41 pthread_condattr_setpshared F
+GLIBC_2.41 pthread_mutexattr_getprioceiling F
 GLIBC_2.41 pthread_mutexattr_getprotocol F
 GLIBC_2.41 pthread_mutexattr_getpshared F
 GLIBC_2.41 pthread_mutexattr_getrobust F
 GLIBC_2.41 pthread_mutexattr_getrobust_np F
 GLIBC_2.41 pthread_mutexattr_gettype F
+GLIBC_2.41 pthread_mutexattr_setprioceiling F
 GLIBC_2.41 pthread_mutexattr_setprotocol F
 GLIBC_2.41 pthread_mutexattr_setpshared F
 GLIBC_2.41 pthread_mutexattr_setrobust F
diff --git a/sysdeps/mach/hurd/x86_64/libpthread.abilist b/sysdeps/mach/hurd/x86_64/libpthread.abilist
index b382b48..608901f 100644
--- a/sysdeps/mach/hurd/x86_64/libpthread.abilist
+++ b/sysdeps/mach/hurd/x86_64/libpthread.abilist
@@ -73,8 +73,6 @@ GLIBC_2.38 pthread_mutex_timedlock F
 GLIBC_2.38 pthread_mutex_transfer_np F
 GLIBC_2.38 pthread_mutex_trylock F
 GLIBC_2.38 pthread_mutex_unlock F
-GLIBC_2.38 pthread_mutexattr_getprioceiling F
-GLIBC_2.38 pthread_mutexattr_setprioceiling F
 GLIBC_2.38 pthread_once F
 GLIBC_2.38 pthread_rwlock_clockrdlock F
 GLIBC_2.38 pthread_rwlock_clockwrlock F