diff options
68 files changed, 196 insertions, 99 deletions
diff --git a/include/mqueue.h b/include/mqueue.h index 8243a637d2..7a2459e603 100644 --- a/include/mqueue.h +++ b/include/mqueue.h @@ -2,21 +2,20 @@ #ifndef _ISOMAC extern __typeof (mq_timedreceive) __mq_timedreceive __nonnull ((2, 5)); +extern __typeof (mq_timedsend) __mq_timedsend __nonnull ((2, 5)); -# if IS_IN (librt) +# if IS_IN (librt) && !PTHREAD_IN_LIBC hidden_proto (mq_timedsend) -extern __typeof (mq_timedsend) __mq_timedsend __nonnull ((2, 5)); hidden_proto (__mq_timedsend) -# if !PTHREAD_IN_LIBC hidden_proto (mq_setattr) hidden_proto (mq_timedreceive) hidden_proto (__mq_timedreceive) -# endif -# endif /* IS_IN (librt) */ +# endif # if PTHREAD_IN_LIBC libc_hidden_proto (mq_setattr) libc_hidden_proto (__mq_timedreceive) +libc_hidden_proto (__mq_timedsend) /* Called from fork so that the new subprocess re-creates the notification thread if necessary. */ @@ -31,7 +30,6 @@ void __mq_notify_fork_subprocess (void) attribute_hidden; extern int __mq_timedsend_time64 (mqd_t mqdes, const char *msg_ptr, size_t msg_len, unsigned int msg_prio, const struct __timespec64 *abs_timeout); -librt_hidden_proto (__mq_timedsend_time64) extern ssize_t __mq_timedreceive_time64 (mqd_t mqdes, char *__restrict msg_ptr, size_t msg_len, @@ -40,8 +38,10 @@ extern ssize_t __mq_timedreceive_time64 (mqd_t mqdes, abs_timeout); # if PTHREAD_IN_LIBC libc_hidden_proto (__mq_timedreceive_time64) +libc_hidden_proto (__mq_timedsend_time64) # else librt_hidden_proto (__mq_timedreceive_time64) +librt_hidden_proto (__mq_timedsend_time64) # endif #endif #endif diff --git a/rt/Makefile b/rt/Makefile index 0cfb4cb95b..eaf4a5a344 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -30,8 +30,6 @@ routines = \ librt-routines = \ librt-compat \ - mq_send \ - mq_timedsend \ mq_unlink \ timer_create \ timer_delete \ @@ -61,8 +59,10 @@ $(librt-routines-var) += \ mq_notify \ mq_open \ mq_receive \ + mq_send \ mq_setattr \ mq_timedreceive \ + mq_timedsend \ 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 541106632e..3363ccb526 100644 --- a/rt/Versions +++ b/rt/Versions @@ -31,8 +31,10 @@ libc { mq_notify; mq_open; mq_receive; + mq_send; mq_setattr; mq_timedreceive; + mq_timedsend; %endif } GLIBC_2.4 { @@ -71,8 +73,10 @@ libc { mq_notify; mq_open; mq_receive; + mq_send; mq_setattr; mq_timedreceive; + mq_timedsend; %endif shm_open; shm_unlink; @@ -129,11 +133,11 @@ librt { mq_notify; mq_open; mq_receive; + mq_send; mq_setattr; mq_timedreceive; -%endif - mq_send; mq_timedsend; +%endif mq_unlink; } GLIBC_2.4 { diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions index cce7c56652..051ecf9390 100644 --- a/sysdeps/unix/sysv/linux/Versions +++ b/sysdeps/unix/sysv/linux/Versions @@ -227,6 +227,7 @@ libc { __lutimes64; __mktime64; __mq_timedreceive_time64; + __mq_timedsend_time64; __msgctl64; __mtx_timedlock64; __nanosleep64; @@ -296,7 +297,6 @@ librt { GLIBC_2.34 { %ifdef TIME64_NON_DEFAULT # 64-bit time_t support - __mq_timedsend_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 cd9d4d91c5..b4edd23bc8 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libc.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libc.abilist @@ -1363,8 +1363,10 @@ 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_send F GLIBC_2.17 mq_setattr F GLIBC_2.17 mq_timedreceive F +GLIBC_2.17 mq_timedsend F GLIBC_2.17 mrand48 F GLIBC_2.17 mrand48_r F GLIBC_2.17 mremap F @@ -2413,8 +2415,10 @@ 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_send F GLIBC_2.34 mq_setattr F GLIBC_2.34 mq_timedreceive F +GLIBC_2.34 mq_timedsend 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 1c3c05932e..4f4c72f3cc 100644 --- a/sysdeps/unix/sysv/linux/aarch64/librt.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/librt.abilist @@ -1,5 +1,3 @@ -GLIBC_2.17 mq_send F -GLIBC_2.17 mq_timedsend F GLIBC_2.17 mq_unlink F GLIBC_2.17 timer_create F GLIBC_2.17 timer_delete F diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 7a894d983e..c2fd6ec79e 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2397,8 +2397,10 @@ 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_send F GLIBC_2.3.4 mq_setattr F GLIBC_2.3.4 mq_timedreceive F +GLIBC_2.3.4 mq_timedsend 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 @@ -2507,8 +2509,10 @@ GLIBC_2.34 mq_getattr F GLIBC_2.34 mq_notify F GLIBC_2.34 mq_open F GLIBC_2.34 |