diff options
| author | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:01 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2021-06-28 09:51:01 +0200 |
| commit | 477910b83e5ef3b3aa78b11808433846989461c8 (patch) | |
| tree | 48e855cdf2c9a0a92ca1aef958a38ed85ddcc833 /rt/Versions | |
| parent | a1d6ed027b7f3ee603fba77c16508c7edc78d00a (diff) | |
| download | glibc-477910b83e5ef3b3aa78b11808433846989461c8.tar.gz glibc-477910b83e5ef3b3aa78b11808433846989461c8.tar.xz glibc-477910b83e5ef3b3aa78b11808433846989461c8.zip | |
Linux: Move timer_settime, __timer_settime64 from librt to libc
The symbols were moved using scripts/move-symbol-to-libc.py. 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. The shared librt is now empty, so this commit adds a placeholder symbol at the base version, GLIBC_2.2, and potentially at the GLIBC_2.3.3 version as well (the leftover from the int/timer_t ABI transition). Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'rt/Versions')
| -rw-r--r-- | rt/Versions | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/rt/Versions b/rt/Versions index d1f05af013..7e41beae06 100644 --- a/rt/Versions +++ b/rt/Versions @@ -26,6 +26,7 @@ libc { timer_delete; timer_getoverrun; timer_gettime; + timer_settime; %endif shm_open; shm_unlink; @@ -89,6 +90,7 @@ libc { timer_delete; timer_getoverrun; timer_gettime; + timer_settime; %endif shm_open; shm_unlink; @@ -132,13 +134,15 @@ librt { %endif } GLIBC_2.2 { -%if !PTHREAD_IN_LIBC +%if PTHREAD_IN_LIBC + __librt_version_placeholder; +%else timer_create; timer_delete; timer_getoverrun; timer_gettime; -%endif timer_settime; +%endif } GLIBC_2.3.4 { %if PTHREAD_IN_LIBC |