1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00

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>
This commit is contained in:
Florian Weimer
2021-06-28 09:51:01 +02:00
parent a1d6ed027b
commit 477910b83e
84 changed files with 245 additions and 212 deletions

View File

@ -102,8 +102,4 @@ librt {
GLIBC_2.3 {
__librt_version_placeholder;
}
GLIBC_2.3.3 {
# Changed timer_t.
timer_settime;
}
}

View File

@ -2097,6 +2097,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 vfwprintf F
GLIBC_2.2 vfwscanf F
@ -2361,6 +2362,7 @@ 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.3 timer_settime F
GLIBC_2.3.4 _OtsAddX F
GLIBC_2.3.4 _OtsConvertFloatTX F
GLIBC_2.3.4 _OtsConvertFloatXT F
@ -2635,6 +2637,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

View File

@ -16,7 +16,7 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
#include <rt/librt-compat.c>
#include <sysdeps/unix/sysv/linux/librt-compat.c>
#if SHLIB_COMPAT (librt, GLIBC_2_3, GLIBC_2_34)
compat_symbol (librt, __librt_version_placeholder_1,

View File

@ -1,7 +1,7 @@
GLIBC_2.1 __librt_version_placeholder F
GLIBC_2.2 timer_settime F
GLIBC_2.2 __librt_version_placeholder F
GLIBC_2.3 __librt_version_placeholder F
GLIBC_2.3.3 timer_settime F
GLIBC_2.3.3 __librt_version_placeholder F
GLIBC_2.3.4 __librt_version_placeholder F
GLIBC_2.4 __librt_version_placeholder F
GLIBC_2.7 __librt_version_placeholder F

View File

@ -1 +0,0 @@
#include <sysdeps/unix/sysv/linux/x86_64/timer_settime.c>