cvs-hidden

Gbp-Pq: Topic hurd-i386
Gbp-Pq: Name cvs-hidden.diff

diff --git a/libpthread/sysdeps/generic/pt-key-create.c b/libpthread/sysdeps/generic/pt-key-create.c
index de05095cb3e9ac370cde1e55250590a559bc5d42..33f691b4a97b1866e6910bf515acd67ab835e0e2 100644 (file)
--- a/libpthread/sysdeps/generic/pt-key-create.c
+++ b/libpthread/sysdeps/generic/pt-key-create.c
@@ -21,9 +21,10 @@
 #include <pt-internal.h>
 
 int
-pthread_key_create (pthread_key_t *key, void (*destructor) (void *))
+__pthread_key_create (pthread_key_t *key, void (*destructor) (void *))
 {
   return ENOSYS;
 }
 
+strong_alias (__pthread_key_create, pthread_key_create)
 stub_warning (pthread_key_create)

diff --git a/libpthread/sysdeps/generic/shm-directory.h b/libpthread/sysdeps/generic/shm-directory.h
new file mode 100644 (file)
index 0000000..8950284
--- /dev/null
+++ b/libpthread/sysdeps/generic/shm-directory.h
@@ -0,0 +1,31 @@
+/* Header for directory for shm/sem files.  libpthread version.
+   Copyright (C) 2014-2015 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/>.  */
+
+#ifndef _SHM_DIRECTORY_H
+
+#include <sysdeps/posix/shm-directory.h>
+
+/* For libpthread the __shm_directory function lives in libpthread.
+   We don't want PLT calls from there.  But it's also used from
+   librt, so it cannot just be declared hidden.  */
+
+#if IS_IN (libpthread)
+hidden_proto (__shm_directory)
+#endif
+
+#endif  /* shm-directory.h */

diff --git a/libpthread/sysdeps/hurd/pt-key-create.c b/libpthread/sysdeps/hurd/pt-key-create.c
index 42c7c853f31dad462af1718d0afbe8c759781f50..f26ec3696446f417afcee91844686f6b3900b28a 100644 (file)
--- a/libpthread/sysdeps/hurd/pt-key-create.c
+++ b/libpthread/sysdeps/hurd/pt-key-create.c
@@ -108,4 +108,3 @@ __pthread_key_create (pthread_key_t *key, void (*destructor) (void *))
   return 0;
 }
 strong_alias (__pthread_key_create, pthread_key_create)
-hidden_def (__pthread_key_create)