mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-07 06:43:00 +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:
@@ -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,
|
||||
|
@@ -2064,6 +2064,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
|
||||
@@ -2493,6 +2494,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
|
||||
@@ -2660,6 +2662,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
|
||||
|
@@ -1,7 +1,6 @@
|
||||
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.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
|
||||
|
@@ -10,10 +10,3 @@ libc {
|
||||
wordexp;
|
||||
}
|
||||
}
|
||||
|
||||
librt {
|
||||
GLIBC_2.3.3 {
|
||||
# Changed timer_t.
|
||||
timer_settime;
|
||||
}
|
||||
}
|
||||
|
@@ -1795,6 +1795,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 times F
|
||||
GLIBC_2.2 timezone D 0x8
|
||||
GLIBC_2.2 tmpfile F
|
||||
@@ -2250,6 +2251,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 __chk_fail F
|
||||
GLIBC_2.3.4 __fprintf_chk F
|
||||
GLIBC_2.3.4 __gets_chk F
|
||||
@@ -2496,6 +2498,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
|
||||
|
@@ -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
|
||||
|
@@ -1 +0,0 @@
|
||||
#include <sysdeps/unix/sysv/linux/x86_64/timer_settime.c>
|
Reference in New Issue
Block a user