aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2021-04-23 09:48:09 +0200
committerFlorian Weimer <fweimer@redhat.com>2021-04-23 09:51:57 +0200
commit8a229ee93c17cf5d0aff9ba81a3acfa146f1dae0 (patch)
treedfbbd845ec25b62352f05927dc1980b9958c05e1
parent241ac38c333ae2539182f214dc641d0956f6ff6d (diff)
downloadglibc-8a229ee93c17cf5d0aff9ba81a3acfa146f1dae0.tar.xz
glibc-8a229ee93c17cf5d0aff9ba81a3acfa146f1dae0.zip
nptl: Move pthread_mutexattr_setpshared into libc
The symbol was moved using scripts/move-symbol-to-libc.py.
-rw-r--r--nptl/Makefile2
-rw-r--r--nptl/Versions3
-rw-r--r--nptl/pthread_mutexattr_setpshared.c11
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/aarch64/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/alpha/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/alpha/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/arc/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/arc/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/arm/be/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/arm/be/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/arm/le/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/arm/le/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/csky/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/csky/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/hppa/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/hppa/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/i386/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/i386/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/ia64/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/ia64/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/be/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/be/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/le/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/microblaze/le/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/nios2/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/nios2/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/riscv/rv32/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/riscv/rv32/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/riscv/rv64/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/sh/be/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/sh/be/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/sh/le/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/sh/le/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/64/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist1
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist1
64 files changed, 76 insertions, 33 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index 96a01e1c0d..1565beb84f 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -112,6 +112,7 @@ routines = \
pthread_mutexattr_init \
pthread_mutexattr_setprioceiling \
pthread_mutexattr_setprotocol \
+ pthread_mutexattr_setpshared \
pthread_once \
pthread_rwlock_rdlock \
pthread_rwlock_unlock \
@@ -171,7 +172,6 @@ libpthread-routines = \
pthread_getname \
pthread_join \
pthread_join_common \
- pthread_mutexattr_setpshared \
pthread_mutexattr_setrobust \
pthread_mutexattr_settype \
pthread_rwlock_clockrdlock \
diff --git a/nptl/Versions b/nptl/Versions
index 8dc6d3a4ff..e2909143e7 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -73,6 +73,7 @@ libc {
__pthread_rwlock_wrlock;
pthread_mutex_timedlock;
pthread_mutexattr_getpshared;
+ pthread_mutexattr_setpshared;
}
GLIBC_2.2.3 {
pthread_getattr_np;
@@ -156,6 +157,7 @@ libc {
pthread_mutexattr_init;
pthread_mutexattr_setprioceiling;
pthread_mutexattr_setprotocol;
+ pthread_mutexattr_setpshared;
pthread_once;
pthread_rwlock_rdlock;
pthread_rwlock_unlock;
@@ -295,7 +297,6 @@ libpthread {
pthread_condattr_getpshared;
pthread_condattr_setpshared;
pthread_getcpuclockid;
- pthread_mutexattr_setpshared;
pthread_rwlock_timedrdlock;
pthread_rwlock_timedwrlock;
pthread_spin_destroy;
diff --git a/nptl/pthread_mutexattr_setpshared.c b/nptl/pthread_mutexattr_setpshared.c
index 8f21594019..f3d52ff9d9 100644
--- a/nptl/pthread_mutexattr_setpshared.c
+++ b/nptl/pthread_mutexattr_setpshared.c
@@ -19,10 +19,10 @@
#include <errno.h>
#include <pthreadP.h>
#include <futex-internal.h>
-
+#include <shlib-compat.h>
int
-pthread_mutexattr_setpshared (pthread_mutexattr_t *attr, int pshared)
+__pthread_mutexattr_setpshared (pthread_mutexattr_t *attr, int pshared)
{
struct pthread_mutexattr *iattr;
@@ -39,3 +39,10 @@ pthread_mutexattr_setpshared (pthread_mutexattr_t *attr, int pshared)
return 0;
}
+versioned_symbol (libc, __pthread_mutexattr_setpshared,
+ pthread_mutexattr_setpshared, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT (libpthread, GLIBC_2_2, GLIBC_2_34)
+compat_symbol (libpthread, __pthread_mutexattr_setpshared,
+ pthread_mutexattr_setpshared, GLIBC_2_2);
+#endif
diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
index a9f309f95a..5e18004595 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist
@@ -1489,6 +1489,7 @@ GLIBC_2.17 pthread_mutexattr_gettype F
GLIBC_2.17 pthread_mutexattr_init F
GLIBC_2.17 pthread_mutexattr_setprioceiling F
GLIBC_2.17 pthread_mutexattr_setprotocol F
+GLIBC_2.17 pthread_mutexattr_setpshared F
GLIBC_2.17 pthread_once F
GLIBC_2.17 pthread_rwlock_rdlock F
GLIBC_2.17 pthread_rwlock_unlock F
@@ -2254,6 +2255,7 @@ GLIBC_2.34 pthread_mutexattr_gettype F
GLIBC_2.34 pthread_mutexattr_init F
GLIBC_2.34 pthread_mutexattr_setprioceiling F
GLIBC_2.34 pthread_mutexattr_setprotocol F
+GLIBC_2.34 pthread_mutexattr_setpshared 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/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
index 01d3b48af4..db738a763a 100644
--- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist
@@ -44,7 +44,6 @@ GLIBC_2.17 pthread_getcpuclockid F
GLIBC_2.17 pthread_getname_np F
GLIBC_2.17 pthread_join F
GLIBC_2.17 pthread_mutexattr_setkind_np F
-GLIBC_2.17 pthread_mutexattr_setpshared F
GLIBC_2.17 pthread_mutexattr_setrobust F
GLIBC_2.17 pthread_mutexattr_setrobust_np F
GLIBC_2.17 pthread_mutexattr_settype F
diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist
index 4a4c6b63ea..c76b3b7629 100644
--- a/sysdeps/unix/sysv/linux/alpha/libc.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist
@@ -1976,6 +1976,7 @@ GLIBC_2.2 pread F
GLIBC_2.2 pread64 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 putwc F
GLIBC_2.2 putwc_unlocked F
GLIBC_2.2 putwchar F
@@ -2336,6 +2337,7 @@ GLIBC_2.34 pthread_mutexattr_gettype F
GLIBC_2.34 pthread_mutexattr_init F
GLIBC_2.34 pthread_mutexattr_setprioceiling F
GLIBC_2.34 pthread_mutexattr_setprotocol F
+GLIBC_2.34 pthread_mutexattr_setpshared 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/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
index 69a17809f9..b81fee1a8e 100644
--- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
+++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist
@@ -71,7 +71,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_mutexattr_setpshared F
GLIBC_2.2 pthread_rwlock_timedrdlock F
GLIBC_2.2 pthread_rwlock_timedwrlock F
GLIBC_2.2 pthread_spin_destroy F
diff --git a/sysdeps/unix/sysv/linux/arc/libc.abilist b/sysdeps/unix/sysv/linux/arc/libc.abilist
index 6a21e0e7b9..101b3fdd3c 100644
--- a/sysdeps/unix/sysv/linux/arc/libc.abilist
+++ b/sysdeps/unix/sysv/linux/arc/libc.abilist
@@ -1417,6 +1417,7 @@ GLIBC_2.32 pthread_mutexattr_gettype F
GLIBC_2.32 pthread_mutexattr_init F
GLIBC_2.32 pthread_mutexattr_setprioceiling F
GLIBC_2.32 pthread_mutexattr_setprotocol F
+GLIBC_2.32 pthread_mutexattr_setpshared F
GLIBC_2.32 pthread_once F
GLIBC_2.32 pthread_rwlock_rdlock F
GLIBC_2.32 pthread_rwlock_unlock F
@@ -2013,6 +201