diff options
68 files changed, 200 insertions, 97 deletions
diff --git a/include/mqueue.h b/include/mqueue.h index 2c40c1e3fc..8243a637d2 100644 --- a/include/mqueue.h +++ b/include/mqueue.h @@ -1,20 +1,22 @@ #include <rt/mqueue.h> #ifndef _ISOMAC +extern __typeof (mq_timedreceive) __mq_timedreceive __nonnull ((2, 5)); + # if IS_IN (librt) hidden_proto (mq_timedsend) extern __typeof (mq_timedsend) __mq_timedsend __nonnull ((2, 5)); hidden_proto (__mq_timedsend) -hidden_proto (mq_timedreceive) -extern __typeof (mq_timedreceive) __mq_timedreceive __nonnull ((2, 5)); -hidden_proto (__mq_timedreceive) # if !PTHREAD_IN_LIBC hidden_proto (mq_setattr) +hidden_proto (mq_timedreceive) +hidden_proto (__mq_timedreceive) # endif # endif /* IS_IN (librt) */ # if PTHREAD_IN_LIBC libc_hidden_proto (mq_setattr) +libc_hidden_proto (__mq_timedreceive) /* Called from fork so that the new subprocess re-creates the notification thread if necessary. */ @@ -36,6 +38,10 @@ extern ssize_t __mq_timedreceive_time64 (mqd_t mqdes, unsigned int *__restrict msg_prio, const struct __timespec64 *__restrict abs_timeout); +# if PTHREAD_IN_LIBC +libc_hidden_proto (__mq_timedreceive_time64) +# else librt_hidden_proto (__mq_timedreceive_time64) +# endif #endif #endif diff --git a/rt/Makefile b/rt/Makefile index c015611f1d..0cfb4cb95b 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -30,9 +30,7 @@ routines = \ librt-routines = \ librt-compat \ - mq_receive \ mq_send \ - mq_timedreceive \ mq_timedsend \ mq_unlink \ timer_create \ @@ -62,7 +60,9 @@ $(librt-routines-var) += \ mq_getattr \ mq_notify \ mq_open \ + mq_receive \ mq_setattr \ + mq_timedreceive \ tests := tst-shm tst-timer tst-timer2 \ tst-aio tst-aio64 tst-aio2 tst-aio3 tst-aio4 tst-aio5 tst-aio6 \ diff --git a/rt/Versions b/rt/Versions index d28a7f6979..541106632e 100644 --- a/rt/Versions +++ b/rt/Versions @@ -30,7 +30,9 @@ libc { mq_getattr; mq_notify; mq_open; + mq_receive; mq_setattr; + mq_timedreceive; %endif } GLIBC_2.4 { @@ -68,7 +70,9 @@ libc { mq_getattr; mq_notify; mq_open; + mq_receive; mq_setattr; + mq_timedreceive; %endif shm_open; shm_unlink; @@ -124,11 +128,11 @@ librt { mq_getattr; mq_notify; mq_open; + mq_receive; mq_setattr; + mq_timedreceive; %endif - mq_receive; mq_send; - mq_timedreceive; mq_timedsend; mq_unlink; } diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index f246a389e1..cce7c56652 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -226,6 +226,7 @@ libc { __lstat64_time64; __lutimes64; __mktime64; + __mq_timedreceive_time64; __msgctl64; __mtx_timedlock64; __nanosleep64; @@ -296,7 +297,6 @@ librt { %ifdef TIME64_NON_DEFAULT # 64-bit time_t support __mq_timedsend_time64; - __mq_timedreceive_time64; __timer_gettime64; __timer_settime64; %endif diff --git a/sysdeps/unix/sysv/linux/aarch64/libc.abilist b/sysdeps/unix/sysv/linux/aarch64/libc.abilist index 07f77027fc..cd9d4d91c5 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1362,7 +1362,9 @@ GLIBC_2.17 mq_close F GLIBC_2.17 mq_getattr F GLIBC_2.17 mq_notify F GLIBC_2.17 mq_open F +GLIBC_2.17 mq_receive F GLIBC_2.17 mq_setattr F +GLIBC_2.17 mq_timedreceive F GLIBC_2.17 mrand48 F GLIBC_2.17 mrand48_r F GLIBC_2.17 mremap F @@ -2410,7 +2412,9 @@ GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F GLIBC_2.34 mq_notify F GLIBC_2.34 mq_open F +GLIBC_2.34 mq_receive F GLIBC_2.34 mq_setattr F +GLIBC_2.34 mq_timedreceive F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F GLIBC_2.34 mtx_lock F diff --git a/sysdeps/unix/sysv/linux/aarch64/librt.abilist b/sysdeps/unix/sysv/linux/aarch64/librt.abilist index 32327b9d62..1c3c05932e 100644 --- a/sysdeps/unix/sysv/linux/aarch64/librt.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/librt.abilist @@ -1,6 +1,4 @@ -GLIBC_2.17 mq_receive F GLIBC_2.17 mq_send F -GLIBC_2.17 mq_timedreceive F GLIBC_2.17 mq_timedsend F GLIBC_2.17 mq_unlink F GLIBC_2.17 timer_create F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 683b320ddc..7a894d983e 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2396,7 +2396,9 @@ GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F GLIBC_2.3.4 mq_notify F GLIBC_2.3.4 mq_open F +GLIBC_2.3.4 mq_receive F GLIBC_2.3.4 mq_setattr F +GLIBC_2.3.4 mq_timedreceive F GLIBC_2.3.4 pthread_attr_getaffinity_np F GLIBC_2.3.4 pthread_attr_setaffinity_np F GLIBC_2.3.4 pthread_getaffinity_np F @@ -2504,7 +2506,9 @@ GLIBC_2.34 mq_close F GLIBC_2.34 mq_getattr F GLIBC_2.34 mq_notify F GLIBC_2.34 mq_open F +GLIBC_2.34 mq_receive F GLIBC_2.34 mq_setattr F +GLIBC_2.34 mq_timedreceive F GLIBC_2.34 mtx_destroy F GLIBC_2.34 mtx_init F GLIBC_2.34 mtx_lock F diff --git a/sysdeps/unix/sysv/linux/alpha/librt.abilist b/sysdeps/unix/sysv/linux/alpha/librt.abilist index bd9a4111f3..6eae7e9482 100644 --- a/sysdeps/unix/sysv/linux/alpha/librt.abilist +++ b/ |