diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:43:24 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-04-23 09:43:24 +0200 |
| commit | 4372dc7eaaa81fc04554626b7f02c9759a04a65b (patch) | |
| tree | 0b2bb229d8a9d4cf9604d7ab45eff31dae24cc52 /sysdeps/unix/sysv/linux/s390 | |
| parent | a2975191d0e852ba2501f4cf1588aae76bdad303 (diff) | |
| download | glibc-4372dc7eaaa81fc04554626b7f02c9759a04a65b.tar.gz glibc-4372dc7eaaa81fc04554626b7f02c9759a04a65b.tar.xz glibc-4372dc7eaaa81fc04554626b7f02c9759a04a65b.zip | |
nptl: Move pthread_mutex_timedlock, pthread_mutex_clocklock to libc
The symbols were moved using scripts/move-symbol-to-libc.py. The symbol aliasing follows pthread_cond_timedwait et al. Missing hidden prototypes had to be added to nptl/pthreadP.h for consistency.
Diffstat (limited to 'sysdeps/unix/sysv/linux/s390')
4 files changed, 8 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist index 966ea7045c..832e0ac625 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist @@ -1933,6 +1933,7 @@ GLIBC_2.2 posix_spawnattr_setsigmask F GLIBC_2.2 posix_spawnp F GLIBC_2.2 pread F GLIBC_2.2 pread64 F +GLIBC_2.2 pthread_mutex_timedlock F GLIBC_2.2 putwc F GLIBC_2.2 putwc_unlocked F GLIBC_2.2 putwchar F @@ -2222,6 +2223,7 @@ GLIBC_2.30 __nldbl_warnx F GLIBC_2.30 getdents64 F GLIBC_2.30 gettid F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 tgkill F GLIBC_2.30 twalk_r F GLIBC_2.31 msgctl F @@ -2265,9 +2267,11 @@ GLIBC_2.34 pthread_getspecific F GLIBC_2.34 pthread_key_create F GLIBC_2.34 pthread_key_delete F GLIBC_2.34 pthread_kill F +GLIBC_2.34 pthread_mutex_clocklock F GLIBC_2.34 pthread_mutex_consistent F GLIBC_2.34 pthread_mutex_getprioceiling F GLIBC_2.34 pthread_mutex_setprioceiling F +GLIBC_2.34 pthread_mutex_timedlock F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index fe0a6dd200..3bb82dc45a 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -81,7 +81,6 @@ GLIBC_2.2 pthread_barrierattr_setpshared F GLIBC_2.2 pthread_condattr_getpshared F GLIBC_2.2 pthread_condattr_setpshared F GLIBC_2.2 pthread_getcpuclockid F -GLIBC_2.2 pthread_mutex_timedlock F GLIBC_2.2 pthread_mutexattr_getpshared F GLIBC_2.2 pthread_mutexattr_setpshared F GLIBC_2.2 pthread_rwlock_timedrdlock F @@ -131,7 +130,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F -GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist index a455d5b207..a6b4fefe83 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist @@ -1309,6 +1309,7 @@ GLIBC_2.2 pthread_kill_other_threads_np F GLIBC_2.2 pthread_mutex_destroy F GLIBC_2.2 pthread_mutex_init F GLIBC_2.2 pthread_mutex_lock F +GLIBC_2.2 pthread_mutex_timedlock F GLIBC_2.2 pthread_mutex_unlock F GLIBC_2.2 pthread_once F GLIBC_2.2 pthread_rwlock_rdlock F @@ -2118,6 +2119,7 @@ GLIBC_2.30 __nldbl_warnx F GLIBC_2.30 getdents64 F GLIBC_2.30 gettid F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 tgkill F GLIBC_2.30 twalk_r F GLIBC_2.32 __libc_single_threaded D 0x1 @@ -2158,9 +2160,11 @@ GLIBC_2.34 pthread_getspecific F GLIBC_2.34 pthread_key_create F GLIBC_2.34 pthread_key_delete F GLIBC_2.34 pthread_kill F +GLIBC_2.34 pthread_mutex_clocklock F GLIBC_2.34 pthread_mutex_consistent F GLIBC_2.34 pthread_mutex_getprioceiling F GLIBC_2.34 pthread_mutex_setprioceiling F +GLIBC_2.34 pthread_mutex_timedlock F GLIBC_2.34 pthread_once F GLIBC_2.34 pthread_rwlock_rdlock F GLIBC_2.34 pthread_rwlock_unlock F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index 2cd4eaa781..867bf39eb3 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -45,7 +45,6 @@ GLIBC_2.2 pthread_detach F GLIBC_2.2 pthread_getconcurrency F GLIBC_2.2 pthread_getcpuclockid F GLIBC_2.2 pthread_join F -GLIBC_2.2 pthread_mutex_timedlock F GLIBC_2.2 pthread_mutex_trylock F GLIBC_2.2 pthread_mutexattr_destroy F GLIBC_2.2 pthread_mutexattr_getkind_np F @@ -123,7 +122,6 @@ GLIBC_2.3.3 pthread_tryjoin_np F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F -GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F |