diff options
| author | Zack Weinberg <zackw@panix.com> | 2019-09-04 08:18:57 +0200 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2019-09-04 14:39:38 +0200 |
| commit | 7b5af2d8f2a2b858319a792678b15a0db08764c7 (patch) | |
| tree | 014a27968a65aaadedc097d9fe9bd1fb62c45896 /sysdeps/posix/clock_getres.c | |
| parent | b5367a08ae810e3c648fb036f2e5766204f9d83f (diff) | |
| download | glibc-7b5af2d8f2a2b858319a792678b15a0db08764c7.zip glibc-7b5af2d8f2a2b858319a792678b15a0db08764c7.tar.gz glibc-7b5af2d8f2a2b858319a792678b15a0db08764c7.tar.bz2 | |
Finish move of clock_* functions to libc. [BZ #24959]
In glibc 2.17, the functions clock_getcpuclockid, clock_getres,
clock_gettime, clock_nanosleep, and clock_settime were moved from
librt.so to libc.so, leaving compatibility stubs behind. Now that the
dynamic linker no longer insists on finding versioned symbols in the
same library that originally defined them, we do not need the stubs
anymore, and this means we don't need GLIBC_PRIVATE __-prefix aliases
for most of the functions anymore either. (clock_gettime still needs
one.) For ports added before 2.17, libc.so needs to provide two
symbol versions for each, the default at GLIBC_2.17 plus a compat
version matching what librt had.
While I'm at it, move the clock_*.c files and their tests from rt/ to
time/.
Diffstat (limited to 'sysdeps/posix/clock_getres.c')
| -rw-r--r-- | sysdeps/posix/clock_getres.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sysdeps/posix/clock_getres.c b/sysdeps/posix/clock_getres.c index 01024a3..e529cad 100644 --- a/sysdeps/posix/clock_getres.c +++ b/sysdeps/posix/clock_getres.c @@ -22,7 +22,7 @@ #include <unistd.h> #include <sys/param.h> #include <libc-internal.h> - +#include <shlib-compat.h> static inline int realtime_getres (struct timespec *res) @@ -62,4 +62,11 @@ __clock_getres (clockid_t clock_id, struct timespec *res) return retval; } -weak_alias (__clock_getres, clock_getres) + +versioned_symbol (libc, __clock_getres, clock_getres, GLIBC_2_17); +/* clock_getres moved to libc in version 2.17; + old binaries may expect the symbol version it had in librt. */ +#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_17) +strong_alias (__clock_getres, __clock_getres_2); +compat_symbol (libc, __clock_getres_2, clock_getres, GLIBC_2_2); +#endif |