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/sparc | |
| 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/sparc')
6 files changed, 6 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist index 05b4e88794..2af5948dd7 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist @@ -2063,6 +2063,7 @@ GLIBC_2.2 swscanf 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 ungetwc F GLIBC_2.2 vfwprintf F GLIBC_2.2 vfwscanf F @@ -2491,6 +2492,7 @@ GLIBC_2.34 __stat64_time64 F GLIBC_2.34 __thrd_sleep64 F GLIBC_2.34 __time64 F GLIBC_2.34 __timegm64 F +GLIBC_2.34 __timer_gettime64 F GLIBC_2.34 __timerfd_gettime64 F GLIBC_2.34 __timerfd_settime64 F GLIBC_2.34 __timespec_get64 F @@ -2657,6 +2659,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/sparc/sparc32/librt.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist index 0de56c2c15..dc0a3c4dfb 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/librt.abilist @@ -1,9 +1,7 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3 __librt_version_placeholder F GLIBC_2.3.4 __librt_version_placeholder F -GLIBC_2.34 __timer_gettime64 F GLIBC_2.34 __timer_settime64 F GLIBC_2.4 __librt_version_placeholder F GLIBC_2.7 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Versions b/sysdeps/unix/sysv/linux/sparc/sparc64/Versions index d04738fafc..5e8f59ceae 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/Versions +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Versions @@ -14,7 +14,6 @@ libc { librt { GLIBC_2.3.3 { # Changed timer_t. - timer_gettime; timer_settime; } } diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist index 72591794e8..fde5b780a6 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist @@ -1794,6 +1794,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 @@ -2248,6 +2249,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 @@ -2493,6 +2495,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/sparc/sparc64/librt.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist index 34d42d122b..a2de1ecd94 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/librt.abilist @@ -1,8 +1,6 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.3 __librt_version_placeholder 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/sparc/sparc64/timer_gettime.c b/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c deleted file mode 100644 index cea524bae5..0000000000 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/timer_gettime.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/x86_64/timer_gettime.c> |