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 | a1d6ed027b7f3ee603fba77c16508c7edc78d00a (patch) | |
| tree | 82263a780b938b5173d5b47d2acfd3f1a97f5be6 /rt | |
| parent | df6d227e69082c5cab33b60aa676aebf08b7585e (diff) | |
| download | glibc-a1d6ed027b7f3ee603fba77c16508c7edc78d00a.tar.gz glibc-a1d6ed027b7f3ee603fba77c16508c7edc78d00a.tar.xz glibc-a1d6ed027b7f3ee603fba77c16508c7edc78d00a.zip | |
Linux: Move timer_gettime, __timer_gettime64 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. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'rt')
| -rw-r--r-- | rt/Makefile | 2 | ||||
| -rw-r--r-- | rt/Versions | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rt/Makefile b/rt/Makefile index 8d9a03a241..1cb2259629 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -30,7 +30,6 @@ routines = \ librt-routines = \ librt-compat \ - timer_gettime \ timer_settime \ librt-shared-only-routines = librt-compat @@ -63,6 +62,7 @@ $(librt-routines-var) += \ timer_create \ timer_delete \ timer_getoverr \ + timer_gettime \ 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 de78be15dc..d1f05af013 100644 --- a/rt/Versions +++ b/rt/Versions @@ -25,6 +25,7 @@ libc { timer_create; timer_delete; timer_getoverrun; + timer_gettime; %endif shm_open; shm_unlink; @@ -87,6 +88,7 @@ libc { timer_create; timer_delete; timer_getoverrun; + timer_gettime; %endif shm_open; shm_unlink; @@ -134,8 +136,8 @@ librt { timer_create; timer_delete; timer_getoverrun; -%endif timer_gettime; +%endif timer_settime; } GLIBC_2.3.4 { |