aboutsummaryrefslogtreecommitdiff
path: root/nptl
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-12-11 22:58:48 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-12-11 22:58:48 +0000
commitfc00cf7bcdf3367da105d86185411f7b7eced239 (patch)
tree221af9a36258492d9194134a7ce8565621ef1a0d /nptl
parent73b0c1a19c679745897b9fa2efef0c00469efa92 (diff)
downloadglibc-fc00cf7bcdf3367da105d86185411f7b7eced239.zip
glibc-fc00cf7bcdf3367da105d86185411f7b7eced239.tar.gz
glibc-fc00cf7bcdf3367da105d86185411f7b7eced239.tar.bz2
Move semaphore.h to sysdeps/pthread/.
Carlos reported failures in conform/ tests in environments where the compiler used could only find headers in glibc's source and build trees, not any previously installed headers <https://sourceware.org/ml/libc-alpha/2014-09/msg00040.html>. This patch moves nptl/semaphore.h to sysdeps/pthread/semaphore.h so that it can be found by builds from all glibc subdirectories; it's not in any way NPTL-specific. (I left the Makefile setting to install this header in nptl/, but maybe it should move as well - it's just not clear to me what ifeq ($(subdir),...) conditional should be used to select the directory to associate the header with for installation purposes. The path in the toplevel Makefile used for begin-end-check also remains hardcoded; it's a known todo issue to rework that test to run in each subdirectory checking the headers installed from that subdirectory, rather than a separate hardcoded list.) Tested for x86_64 (testsuite, and that installed stripped shared libraries are unchanged by the patch). I did *not* test a configuration such as that in which Carlos saw failure. * nptl/semaphore.h: Move to ... * sysdeps/pthread/semaphore.h: ... here. * Makefile (installed-headers): Change nptl/semaphore.h to sysdeps/pthread/semaphore.h.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/semaphore.h78
1 files changed, 0 insertions, 78 deletions
diff --git a/nptl/semaphore.h b/nptl/semaphore.h
deleted file mode 100644
index 763db34..0000000
--- a/nptl/semaphore.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright (C) 2002-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 _SEMAPHORE_H
-#define _SEMAPHORE_H 1
-
-#include <features.h>
-#include <sys/types.h>
-#ifdef __USE_XOPEN2K
-# define __need_timespec
-# include <time.h>
-#endif
-
-/* Get the definition for sem_t. */
-#include <bits/semaphore.h>
-
-
-__BEGIN_DECLS
-
-/* Initialize semaphore object SEM to VALUE. If PSHARED then share it
- with other processes. */
-extern int sem_init (sem_t *__sem, int __pshared, unsigned int __value)
- __THROW;
-/* Free resources associated with semaphore object SEM. */
-extern int sem_destroy (sem_t *__sem) __THROW;
-
-/* Open a named semaphore NAME with open flags OFLAG. */
-extern sem_t *sem_open (const char *__name, int __oflag, ...) __THROW;
-
-/* Close descriptor for named semaphore SEM. */
-extern int sem_close (sem_t *__sem) __THROW;
-
-/* Remove named semaphore NAME. */
-extern int sem_unlink (const char *__name) __THROW;
-
-/* Wait for SEM being posted.
-
- This function is a cancellation point and therefore not marked with
- __THROW. */
-extern int sem_wait (sem_t *__sem);
-
-#ifdef __USE_XOPEN2K
-/* Similar to `sem_wait' but wait only until ABSTIME.
-
- This function is a cancellation point and therefore not marked with
- __THROW. */
-extern int sem_timedwait (sem_t *__restrict __sem,
- const struct timespec *__restrict __abstime);
-#endif
-
-/* Test whether SEM is posted. */
-extern int sem_trywait (sem_t *__sem) __THROWNL;
-
-/* Post SEM. */
-extern int sem_post (sem_t *__sem) __THROWNL;
-
-/* Get current value of SEM and store it in *SVAL. */
-extern int sem_getvalue (sem_t *__restrict __sem, int *__restrict __sval)
- __THROW;
-
-
-__END_DECLS
-
-#endif /* semaphore.h */