3 files changed, 11 insertions, 5 deletions
diff --git a/nptl/Makefile b/nptl/Makefile
index f8416b240c..8c32937d82 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -153,6 +153,7 @@ routines = \
   sem_clockwait \
   sem_close \
   sem_destroy \
+  sem_getvalue \
   sem_open \
   sem_routines \
   tpp \
@@ -206,7 +207,6 @@ libpthread-routines = \
   pthread_sigqueue \
   pthread_timedjoin \
   pthread_tryjoin \
-  sem_getvalue \
   sem_init \
   sem_post \
   sem_timedwait \
diff --git a/nptl/Versions b/nptl/Versions
index c59bbd8736..dd1c1c7e9e 100644
--- a/nptl/Versions
+++ b/nptl/Versions
@@ -63,6 +63,7 @@ libc {
     pthread_sigmask;
     pthread_testcancel;
     sem_destroy;
+    sem_getvalue;
   }
   GLIBC_2.1 {
     pthread_attr_init;
@@ -82,6 +83,7 @@ libc {
     pthread_rwlockattr_setkind_np;
     pthread_rwlockattr_setpshared;
     sem_destroy;
+    sem_getvalue;
   }
   GLIBC_2.1.1 {
     sem_close;
@@ -257,6 +259,7 @@ libc {
     sem_clockwait;
     sem_close;
     sem_destroy;
+    sem_getvalue;
     sem_open;
     thrd_exit;
     tss_create;
@@ -323,7 +326,6 @@ libpthread {
     pthread_detach;
     pthread_join;
     pthread_sigmask;
-    sem_getvalue;
     sem_init;
     sem_post;
     sem_trywait;
@@ -340,7 +342,6 @@ libpthread {
     pthread_create;
     pthread_getconcurrency;
     pthread_setconcurrency;
-    sem_getvalue;
     sem_init;
     sem_post;
     sem_trywait;
diff --git a/nptl/sem_getvalue.c b/nptl/sem_getvalue.c
index 967a0a016b..7d3a596e8c 100644
--- a/nptl/sem_getvalue.c
+++ b/nptl/sem_getvalue.c
@@ -42,8 +42,13 @@ __new_sem_getvalue (sem_t *sem, int *sval)
 
   return 0;
 }
-versioned_symbol (libpthread, __new_sem_getvalue, sem_getvalue, GLIBC_2_1);
-#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
+versioned_symbol (libc, __new_sem_getvalue, sem_getvalue, GLIBC_2_34);
+
+#if OTHER_SHLIB_COMPAT(libpthread, GLIBC_2_1, GLIBC_2_34)
+compat_symbol (libpthread, __new_sem_getvalue, sem_getvalue, GLIBC_2_1);
+#endif
+
+#if OTHER_SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
 int
 __old_sem_getvalue (sem_t *sem, int *sval)
 {