mirror of https://gitee.com/Nocallback/glibc.git
Browse Source
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/.fw/bug25112
Zack Weinberg
7 years ago
committed by
Florian Weimer
Florian Weimer
72 changed files with 382 additions and 243 deletions
@ -1,63 +0,0 @@ |
|||
/* ABI compatibility redirects for clock_* symbols in librt.
|
|||
Copyright (C) 2012-2019 Free Software Foundation, Inc. |
|||
This file is part of the GNU C Library. |
|||
|
|||
The GNU C Library is free software; you can redistribute it and/or |
|||
modify it under the terms of the GNU Lesser General Public |
|||
License as published by the Free Software Foundation; either |
|||
version 2.1 of the License, or (at your option) any later version. |
|||
|
|||
The GNU C Library is distributed in the hope that it will be useful, |
|||
but WITHOUT ANY WARRANTY; without even the implied warranty of |
|||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
|||
Lesser General Public License for more details. |
|||
|
|||
You should have received a copy of the GNU Lesser General Public |
|||
License along with the GNU C Library; if not, see |
|||
<http://www.gnu.org/licenses/>. */
|
|||
|
|||
#include <shlib-compat.h> |
|||
|
|||
/* The clock_* symbols were originally defined in librt and so
|
|||
are part of its ABI. As of 2.17, they have moved to libc. |
|||
So we supply definitions for librt that just redirect to |
|||
their libc counterparts. */ |
|||
|
|||
#if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_17) |
|||
|
|||
#include <time.h> |
|||
|
|||
#if HAVE_IFUNC |
|||
# undef INIT_ARCH |
|||
# define INIT_ARCH() |
|||
# define COMPAT_REDIRECT(name, proto, arglist) libc_ifunc (name, &__##name) \ |
|||
compat_symbol (librt, name, name, GLIBC_2_2); |
|||
#else |
|||
# define COMPAT_REDIRECT(name, proto, arglist) \ |
|||
int \ |
|||
name proto \ |
|||
{ \ |
|||
return __##name arglist; \ |
|||
} \ |
|||
compat_symbol (librt, name, name, GLIBC_2_2); |
|||
#endif |
|||
|
|||
COMPAT_REDIRECT (clock_getres, |
|||
(clockid_t clock_id, struct timespec *res), |
|||
(clock_id, res)) |
|||
COMPAT_REDIRECT (clock_gettime, |
|||
(clockid_t clock_id, struct timespec *tp), |
|||
(clock_id, tp)) |
|||
COMPAT_REDIRECT (clock_settime, |
|||
(clockid_t clock_id, const struct timespec *tp), |
|||
(clock_id, tp)) |
|||
COMPAT_REDIRECT (clock_getcpuclockid, |
|||
(pid_t pid, clockid_t *clock_id), |
|||
(pid, clock_id)) |
|||
COMPAT_REDIRECT (clock_nanosleep, |
|||
(clockid_t clock_id, int flags, |
|||
const struct timespec *req, |
|||
struct timespec *rem), |
|||
(clock_id, flags, req, rem)) |
|||
|
|||
#endif |
|||
Loading…
Reference in new issue