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

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>
This commit is contained in:
Florian Weimer
2021-06-28 09:51:00 +02:00
parent 273a2a2ae8
commit df6d227e69
79 changed files with 107 additions and 95 deletions

View File

@ -20,17 +20,33 @@
#include <time.h>
#include <sysdep.h>
#include "kernel-posix-timers.h"
#ifdef timer_getoverrun_alias
# define timer_getoverrun timer_getoverrun_alias
#endif
#include <shlib-compat.h>
int
timer_getoverrun (timer_t timerid)
___timer_getoverrun (timer_t timerid)
{
#undef timer_getoverrun
kernel_timer_t ktimerid = timerid_to_kernel_timer (timerid);
return INLINE_SYSCALL_CALL (timer_getoverrun, ktimerid);
}
versioned_symbol (libc, ___timer_getoverrun, timer_getoverrun, GLIBC_2_34);
libc_hidden_ver (___timer_getoverrun, __timer_getoverrun)
#if TIMER_T_WAS_INT_COMPAT
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_3_3, GLIBC_2_34)
compat_symbol (librt, ___timer_getoverrun, timer_getoverrun, GLIBC_2_3_3);
# endif
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
int
__timer_getoverrun_old (int timerid)
{
return __timer_getoverrun (__timer_compat_list[timerid]);
}
compat_symbol (librt, __timer_getoverrun_old, timer_getoverrun, GLIBC_2_2);
# endif /* OTHER_SHLIB_COMPAT */
#else /* !TIMER_T_WAS_INT_COMPAT */
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_34)
compat_symbol (librt, ___timer_getoverrun, timer_getoverrun, GLIBC_2_2);
# endif
#endif /* !TIMER_T_WAS_INT_COMPAT */