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 /sysdeps/unix/sysv/linux/ia64 | |
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 'sysdeps/unix/sysv/linux/ia64')
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/Versions | 1 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/libc.abilist | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/librt.abilist | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/ia64/timer_gettime.c | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/ia64/Versions b/sysdeps/unix/sysv/linux/ia64/Versions index 1d09fca7e3..9a7faf067a 100644 --- a/sysdeps/unix/sysv/linux/ia64/Versions +++ b/sysdeps/unix/sysv/linux/ia64/Versions @@ -30,7 +30,6 @@ libc { librt { GLIBC_2.3.3 { # Changed timer_t. - timer_gettime; timer_settime; } } diff --git a/sysdeps/unix/sysv/linux/ia64/libc.abilist b/sysdeps/unix/sysv/linux/ia64/libc.abilist index 984b58be61..d589ce16d6 100644 --- a/sysdeps/unix/sysv/linux/ia64/libc.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libc.abilist @@ -1768,6 +1768,7 @@ GLIBC_2.2 timelocal F GLIBC_2.2 timer_create F GLIBC_2.2 timer_delete F GLIBC_2.2 timer_getoverrun F +GLIBC_2.2 timer_gettime F GLIBC_2.2 times F GLIBC_2.2 timezone D 0x8 GLIBC_2.2 tmpfile F @@ -2224,6 +2225,7 @@ GLIBC_2.3.3 sys_siglist D 0x208 GLIBC_2.3.3 timer_create F GLIBC_2.3.3 timer_delete F GLIBC_2.3.3 timer_getoverrun F +GLIBC_2.3.3 timer_gettime F GLIBC_2.3.4 __chk_fail F GLIBC_2.3.4 __fprintf_chk F GLIBC_2.3.4 __gets_chk F @@ -2470,6 +2472,7 @@ GLIBC_2.34 thrd_join F GLIBC_2.34 timer_create F GLIBC_2.34 timer_delete F GLIBC_2.34 timer_getoverrun F +GLIBC_2.34 timer_gettime F GLIBC_2.34 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/ia64/librt.abilist b/sysdeps/unix/sysv/linux/ia64/librt.abilist index c56040a5f9..7d8e91b0d9 100644 --- a/sysdeps/unix/sysv/linux/ia64/librt.abilist +++ b/sysdeps/unix/sysv/linux/ia64/librt.abilist @@ -1,7 +1,5 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F -GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F GLIBC_2.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/ia64/timer_gettime.c b/sysdeps/unix/sysv/linux/ia64/timer_gettime.c deleted file mode 100644 index cea524bae5..0000000000 --- a/sysdeps/unix/sysv/linux/ia64/timer_gettime.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c> |