Merge branch 'master' into master-glibc-2.21

2 files changed, 0 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 2906788..b8dee58 100644
--- a/Makefile
+++ b/Makefile
@@ -149,8 +149,6 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate	    \
 	sem-post sem-timedwait sem-trywait sem-unlink			    \
 	sem-wait							    \
 									    \
-	shm-directory							    \
-									    \
 	cthreads-compat							    \
 	$(SYSDEPS)
 
diff --git a/Versions b/Versions
index f9ac817..19ff26c 100644
--- a/Versions
+++ b/Versions
@@ -136,7 +136,4 @@ libpthread {
     pthread_hurd_cond_wait_np;
     pthread_hurd_cond_timedwait_np;
   }
-  GLIBC_PRIVATE {
-    __shm_directory;
-  }
 }