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 | df6d227e69082c5cab33b60aa676aebf08b7585e (patch) | |
tree | 691811c64b55d6705a433064beee645ac61c386c /sysdeps/unix/sysv/linux/alpha | |
parent | 273a2a2ae8b097672cdc8e9888548b134955af42 (diff) | |
download | glibc-df6d227e69082c5cab33b60aa676aebf08b7585e.tar.gz glibc-df6d227e69082c5cab33b60aa676aebf08b7585e.tar.xz glibc-df6d227e69082c5cab33b60aa676aebf08b7585e.zip |
Linux: Move timer_getoverrun from librt to libc
The symbol was 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: Adhemerva Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux/alpha')
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/Versions | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/libc.abilist | 3 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/librt.abilist | 2 | ||||
-rw-r--r-- | sysdeps/unix/sysv/linux/alpha/timer_getoverr.c | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/Versions b/sysdeps/unix/sysv/linux/alpha/Versions index d4bd056f64..dd5b365d77 100644 --- a/sysdeps/unix/sysv/linux/alpha/Versions +++ b/sysdeps/unix/sysv/linux/alpha/Versions @@ -104,7 +104,7 @@ librt { } GLIBC_2.3.3 { # Changed timer_t. - timer_getoverrun; timer_gettime; + timer_gettime; timer_settime; } } diff --git a/sysdeps/unix/sysv/linux/alpha/libc.abilist b/sysdeps/unix/sysv/linux/alpha/libc.abilist index 985a1deca9..50ab6f3fc1 100644 --- a/sysdeps/unix/sysv/linux/alpha/libc.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libc.abilist @@ -2095,6 +2095,7 @@ GLIBC_2.2 swprintf F 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 ungetwc F GLIBC_2.2 vfwprintf F GLIBC_2.2 vfwscanf F @@ -2357,6 +2358,7 @@ GLIBC_2.3.3 sys_sigabbrev D 0x208 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.4 _OtsAddX F GLIBC_2.3.4 _OtsConvertFloatTX F GLIBC_2.3.4 _OtsConvertFloatXT F @@ -2629,6 +2631,7 @@ GLIBC_2.34 thrd_exit F 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 timespec_getres F GLIBC_2.34 tss_create F GLIBC_2.34 tss_delete F diff --git a/sysdeps/unix/sysv/linux/alpha/librt.abilist b/sysdeps/unix/sysv/linux/alpha/librt.abilist index 3b744cf5a1..34d42d122b 100644 --- a/sysdeps/unix/sysv/linux/alpha/librt.abilist +++ b/sysdeps/unix/sysv/linux/alpha/librt.abilist @@ -1,9 +1,7 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_getoverrun 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_getoverrun F GLIBC_2.3.3 timer_gettime F GLIBC_2.3.3 timer_settime F GLIBC_2.3.4 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/alpha/timer_getoverr.c b/sysdeps/unix/sysv/linux/alpha/timer_getoverr.c deleted file mode 100644 index 22eaff5cda..0000000000 --- a/sysdeps/unix/sysv/linux/alpha/timer_getoverr.c +++ /dev/null @@ -1 +0,0 @@ -#include <sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c> |