From 477910b83e5ef3b3aa78b11808433846989461c8 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 28 Jun 2021 09:51:01 +0200 Subject: 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 --- sysdeps/unix/sysv/linux/i386/libc.abilist | 3 +++ sysdeps/unix/sysv/linux/i386/librt.abilist | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'sysdeps/unix/sysv/linux/i386') diff --git a/sysdeps/unix/sysv/linux/i386/libc.abilist b/sysdeps/unix/sysv/linux/i386/libc.abilist index bd3824cb88..1accf0a9c1 100644 --- a/sysdeps/unix/sysv/linux/i386/libc.abilist +++ b/sysdeps/unix/sysv/linux/i386/libc.abilist @@ -2110,6 +2110,7 @@ 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 timer_settime F GLIBC_2.2 ungetwc F GLIBC_2.2 versionsort64 F GLIBC_2.2 vfwprintf F @@ -2530,6 +2531,7 @@ 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 __timer_settime64 F GLIBC_2.34 __timerfd_gettime64 F GLIBC_2.34 __timerfd_settime64 F GLIBC_2.34 __timespec_get64 F @@ -2697,6 +2699,7 @@ 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 timer_settime 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/i386/librt.abilist b/sysdeps/unix/sysv/linux/i386/librt.abilist index 179d1d53da..6d24ce527d 100644 --- a/sysdeps/unix/sysv/linux/i386/librt.abilist +++ b/sysdeps/unix/sysv/linux/i386/librt.abilist @@ -1,6 +1,5 @@ GLIBC_2.1 __librt_version_placeholder F -GLIBC_2.2 timer_settime F +GLIBC_2.2 __librt_version_placeholder F GLIBC_2.3.4 __librt_version_placeholder F -GLIBC_2.34 __timer_settime64 F GLIBC_2.4 __librt_version_placeholder F GLIBC_2.7 __librt_version_placeholder F -- cgit 1.4.1