aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2014-12-12 13:17:21 -0800
committerRoland McGrath <roland@hack.frob.com>2014-12-12 15:01:30 -0800
commite4f639e4a106d90c6f3159230788653fd6e40a26 (patch)
tree0273305e960bcb5f46e3debc523eecc312e1bba8 /sysdeps/nptl
parentc76d1ff5149bd03210f2bb8cd64446c51618d016 (diff)
downloadglibc-e4f639e4a106d90c6f3159230788653fd6e40a26.zip
glibc-e4f639e4a106d90c6f3159230788653fd6e40a26.tar.gz
glibc-e4f639e4a106d90c6f3159230788653fd6e40a26.tar.bz2
NPTL: Refactor named semaphore code to use shm-directory.h
Diffstat (limited to 'sysdeps/nptl')
-rw-r--r--sysdeps/nptl/bits/libc-lockP.h12
-rw-r--r--sysdeps/nptl/shm-directory.h31
2 files changed, 43 insertions, 0 deletions
diff --git a/sysdeps/nptl/bits/libc-lockP.h b/sysdeps/nptl/bits/libc-lockP.h
index 78c5453..fa8c866 100644
--- a/sysdeps/nptl/bits/libc-lockP.h
+++ b/sysdeps/nptl/bits/libc-lockP.h
@@ -34,6 +34,12 @@
#include <tls.h>
#include <pthread-functions.h>
+#if IS_IN (libpthread)
+/* This gets us the declarations of the __pthread_* internal names,
+ and hidden_proto for them. */
+# include <nptl/pthreadP.h>
+#endif
+
/* Mutex type. */
#if !IS_IN (libc) && !IS_IN (libpthread)
typedef pthread_mutex_t __libc_lock_t;
@@ -114,6 +120,12 @@ typedef pthread_key_t __libc_key_t;
(__libc_pthread_functions_init ? PTHFCT_CALL (ptr_##FUNC, ARGS) : ELSE)
# define __libc_ptf_call_always(FUNC, ARGS) \
PTHFCT_CALL (ptr_##FUNC, ARGS)
+#elif IS_IN (libpthread)
+# define PTFAVAIL(NAME) 1
+# define __libc_ptf_call(FUNC, ARGS, ELSE) \
+ FUNC ARGS
+# define __libc_ptf_call_always(FUNC, ARGS) \
+ FUNC ARGS
#else
# define PTFAVAIL(NAME) (NAME != NULL)
# define __libc_ptf_call(FUNC, ARGS, ELSE) \
diff --git a/sysdeps/nptl/shm-directory.h b/sysdeps/nptl/shm-directory.h
new file mode 100644
index 0000000..ae4d80a
--- /dev/null
+++ b/sysdeps/nptl/shm-directory.h
@@ -0,0 +1,31 @@
+/* Header for directory for shm/sem files. NPTL version.
+ Copyright (C) 2014 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 NPTL 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 */