about summary refs log tree commit diff
path: root/time/Versions
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2019-09-04 08:18:57 +0200
committerFlorian Weimer <fweimer@redhat.com>2019-09-04 14:39:38 +0200
commit7b5af2d8f2a2b858319a792678b15a0db08764c7 (patch)
tree014a27968a65aaadedc097d9fe9bd1fb62c45896 /time/Versions
parentb5367a08ae810e3c648fb036f2e5766204f9d83f (diff)
downloadglibc-7b5af2d8f2a2b858319a792678b15a0db08764c7.tar.gz
glibc-7b5af2d8f2a2b858319a792678b15a0db08764c7.tar.xz
glibc-7b5af2d8f2a2b858319a792678b15a0db08764c7.zip
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 'time/Versions')
-rw-r--r--time/Versions13
1 files changed, 13 insertions, 0 deletions
diff --git a/time/Versions b/time/Versions
index fd838181e4..8788e192ce 100644
--- a/time/Versions
+++ b/time/Versions
@@ -49,6 +49,10 @@ libc {
   GLIBC_2.2 {
     # w*
     wcsftime;
+
+    # c*; actually in librt in version 2.2, moved to libc in 2.17
+    clock_getres; clock_gettime; clock_settime; clock_getcpuclockid;
+    clock_nanosleep;
   }
   GLIBC_2.3 {
     # these internal names are used by libstdc++
@@ -65,4 +69,13 @@ libc {
   GLIBC_2.16 {
     timespec_get;
   }
+  GLIBC_2.17 {
+    # c*
+    clock_getres; clock_gettime; clock_settime; clock_getcpuclockid;
+    clock_nanosleep;
+  }
+  GLIBC_PRIVATE {
+    # same as clock_gettime; used in other libraries
+    __clock_gettime;
+  }
 }