picnoir/glibc
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

rt: avoid PLT setup in timer_[sg]ettime

Browse source 
The functions __timer_gettime64 and __timer_settime64 live in librt, not
libc.  Use proper hidden aliases so that the callers do not need to set up
the PLT register.

Fixes commits cae1635a70 ("y2038: linux: Provide __timer_settime64
implementation") and 562cdc19c7 ("y2038: linux: Provide __timer_gettime64
implementation").
This commit is contained in:
Andreas Schwab 2020-01-27 10:05:53 +01:00
parent cdeae33d71
commit 6befb33f31
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/time.h
View file

@ -185,7 +185,7 @@ libc_hidden_proto (__futimens64);
#else
extern int __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value);
extern int __timerfd_gettime64 (int fd, struct __itimerspec64 *value);
libc_hidden_proto (__timer_gettime64);
librt_hidden_proto (__timer_gettime64);
libc_hidden_proto (__timerfd_gettime64);
#endif
@ -199,7 +199,7 @@ extern int __timer_settime64 (timer_t timerid, int flags,
extern int __timerfd_settime64 (int fd, int flags,
const struct __itimerspec64 *value,
struct __itimerspec64 *ovalue);
libc_hidden_proto (__timer_settime64);
librt_hidden_proto (__timer_settime64);
libc_hidden_proto (__timerfd_settime64);
#endif

3
sysdeps/unix/sysv/linux/timer_gettime.c
View file

@ -52,6 +52,8 @@ __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value)
}
#if __TIMESIZE != 64
librt_hidden_def (__timer_gettime64)
int
__timer_gettime (timer_t timerid, struct itimerspec *value)
{
@ -67,4 +69,3 @@ __timer_gettime (timer_t timerid, struct itimerspec *value)
}
#endif
weak_alias (__timer_gettime, timer_gettime)
libc_hidden_def (timer_gettime)

3
sysdeps/unix/sysv/linux/timer_settime.c
View file

@ -68,6 +68,8 @@ __timer_settime64 (timer_t timerid, int flags,
}
#if __TIMESIZE != 64
librt_hidden_def (__timer_settime64)
int
__timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
struct itimerspec *ovalue)
@ -89,4 +91,3 @@ __timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
}
#endif
weak_alias (__timer_settime, timer_settime)
libc_hidden_def (timer_settime)