aboutsummaryrefslogtreecommitdiff
path: root/rt
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2019-02-08 10:21:56 +0100
committerFlorian Weimer <fweimer@redhat.com>2019-02-08 10:43:17 +0100
commitf289e656ec8221756519a601042bc9fbe1b310fb (patch)
treed0a6ca2140f0e4a0fa34fd10ee0b0c03266fb196 /rt
parentAdd compiler barriers around modifications of the robust mutex list for pthre... (diff)
downloadglibc-f289e656ec8221756519a601042bc9fbe1b310fb.tar.gz
glibc-f289e656ec8221756519a601042bc9fbe1b310fb.tar.bz2
glibc-f289e656ec8221756519a601042bc9fbe1b310fb.zip
rt: Turn forwards from librt to libc into compat symbols [BZ #24194]
As the result of commit 6e6249d0b461b952d0f544792372663feb6d792a ("BZ#14743: Move clock_* symbols from librt to libc."), in glibc 2.17, clock_gettime, clock_getres, clock_settime, clock_getcpuclockid, clock_nanosleep were added to libc, and the file rt/clock-compat.c was added with forwarders to the actual implementations in libc. These forwarders were wrapped in #if SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_17) so that they are not present for newer architectures (such as powerpc64le) with a 2.17 or later ABI baseline. But the forwarders were not marked as compatibility symbols. As a result, on older architectures, historic configure checks such as AC_CHECK_LIB(rt, clock_gettime) still cause linking against librt, even though this is completely unnecessary. It also creates a needless porting hazard because architectures behave differently when it comes to symbol availability. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
Diffstat (limited to 'rt')
-rw-r--r--rt/clock-compat.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/rt/clock-compat.c b/rt/clock-compat.c
index c603f40b69..d8ced3cdc1 100644
--- a/rt/clock-compat.c
+++ b/rt/clock-compat.c
@@ -30,14 +30,16 @@
#if HAVE_IFUNC
# undef INIT_ARCH
# define INIT_ARCH()
-# define COMPAT_REDIRECT(name, proto, arglist) libc_ifunc (name, &__##name)
+# 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,