diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:00 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:00 +0200 |
| commit | 273a2a2ae8b097672cdc8e9888548b134955af42 (patch) | |
| tree | a944110b3bfa9a0578aea7c5fc1994d801aee719 /rt | |
| parent | d7d0efec47e76c022c3bcb30cdb4b0501d7a9b2a (diff) | |
| download | glibc-273a2a2ae8b097672cdc8e9888548b134955af42.tar.gz glibc-273a2a2ae8b097672cdc8e9888548b134955af42.tar.xz glibc-273a2a2ae8b097672cdc8e9888548b134955af42.zip | |
Linux: Move timer_create, timer_delete from librt to libc
The symbols were moved using scripts/move-symbol-to-libc.py. timer_create and timer_delete are tied together via the int/timer_t compatibility code. The way the ABI intransition is implemented is changed with this commit: the implementation is now consolidated in one file with a TIMER_T_WAS_INT_COMPAT check. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'rt')
| -rw-r--r-- | rt/Makefile | 4 | ||||
| -rw-r--r-- | rt/Versions | 26 |
2 files changed, 19 insertions, 11 deletions
diff --git a/rt/Makefile b/rt/Makefile index ca3f9e162e..5de91fe213 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -30,8 +30,6 @@ routines = \ librt-routines = \ librt-compat \ - timer_create \ - timer_delete \ timer_getoverr \ timer_gettime \ timer_settime \ @@ -63,6 +61,8 @@ $(librt-routines-var) += \ mq_timedreceive \ mq_timedsend \ mq_unlink \ + timer_create \ + timer_delete \ 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 9a09062a2a..fca804148c 100644 --- a/rt/Versions +++ b/rt/Versions @@ -21,6 +21,10 @@ libc { %endif } GLIBC_2.2 { +%if PTHREAD_IN_LIBC + timer_create; + timer_delete; +%endif shm_open; shm_unlink; } @@ -52,23 +56,23 @@ libc { GLIBC_2.34 { %if PTHREAD_IN_LIBC __mq_open_2; - aio_cancel; aio_cancel64; - aio_init; - aio_error; + aio_cancel; aio_error64; - aio_fsync; + aio_error; aio_fsync64; - aio_read; + aio_fsync; + aio_init; aio_read64; - aio_return; + aio_read; aio_return64; - aio_suspend; + aio_return; aio_suspend64; - aio_write; + aio_suspend; aio_write64; - lio_listio; + aio_write; lio_listio64; + lio_listio; mq_close; mq_getattr; mq_notify; @@ -79,6 +83,8 @@ libc { mq_timedreceive; mq_timedsend; mq_unlink; + timer_create; + timer_delete; %endif shm_open; shm_unlink; @@ -122,8 +128,10 @@ librt { %endif } GLIBC_2.2 { +%if !PTHREAD_IN_LIBC timer_create; timer_delete; +%endif timer_getoverrun; timer_gettime; timer_settime; |