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 | 477910b83e5ef3b3aa78b11808433846989461c8 (patch) | |
tree | 48e855cdf2c9a0a92ca1aef958a38ed85ddcc833 /sysdeps/unix/sysv/linux/m68k | |
parent | a1d6ed027b7f3ee603fba77c16508c7edc78d00a (diff) | |
download | glibc-477910b83e5ef3b3aa78b11808433846989461c8.tar.gz glibc-477910b83e5ef3b3aa78b11808433846989461c8.tar.xz glibc-477910b83e5ef3b3aa78b11808433846989461c8.zip |
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 <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/unix/sysv/linux/m68k')
4 files changed, 8 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist index 7e986dcfd5..ddbaeb3660 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist @@ -273,6 +273,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 @@ -440,6 +441,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 @@ -2339,6 +2341,7 @@ GLIBC_2.4 timer_create F GLIBC_2.4 timer_delete F GLIBC_2.4 timer_getoverrun F GLIBC_2.4 timer_gettime F +GLIBC_2.4 timer_settime F GLIBC_2.4 times F GLIBC_2.4 timezone D 0x4 GLIBC_2.4 tmpfile F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist index 2f84162558..0010b34d5c 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/librt.abilist @@ -1,3 +1,2 @@ -GLIBC_2.34 __timer_settime64 F -GLIBC_2.4 timer_settime F +GLIBC_2.4 __librt_version_placeholder F GLIBC_2.7 __librt_version_placeholder F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist index 97fe827b8d..3295de3102 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist @@ -2066,6 +2066,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 @@ -2473,6 +2474,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 @@ -2640,6 +2642,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/m68k/m680x0/librt.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist index 179d1d53da..6d24ce527d 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/librt.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/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 |