From 544b59bf47adfe1acda09de77b71afebdb83ce02 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 13 Jan 2017 09:35:01 +0100 Subject: configure: Remove HAVE_SEMAPHORE_H support --- cpukit/configure.ac | 5 +- cpukit/posix/Makefile.am | 3 - cpukit/posix/include/semaphore.h | 158 --------------------------------------- cpukit/posix/preinstall.am | 5 -- 4 files changed, 1 insertion(+), 170 deletions(-) delete mode 100644 cpukit/posix/include/semaphore.h (limited to 'cpukit') diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 0a043af959..2a1ab64620 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -136,12 +136,9 @@ AC_CHECK_FUNCS([ttyname getcwd]) # Check if the installed toolchain provides these headers # and error out if not. -AC_CHECK_HEADERS([tar.h errno.h sched.h sys/cdefs.h sys/queue.h],, +AC_CHECK_HEADERS([tar.h errno.h sched.h semaphore.h sys/cdefs.h sys/queue.h],, [RTEMS_TOOL_CHAIN_ERROR]) -AC_CHECK_HEADERS([semaphore.h]) -AM_CONDITIONAL([HAVE_SEMAPHORE_H],[test x"$ac_cv_header_semaphore_h" = x"yes"]) - AC_CHECK_HEADERS([threads.h]) AM_CONDITIONAL([HAVE_THREADS_H],[test x"$ac_cv_header_threads_h" = x"yes"]) diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am index 9cc10438da..8323de8f8b 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -27,9 +27,6 @@ if HAS_PTHREADS # include include_HEADERS = include/aio.h include_HEADERS += include/mqueue.h -if !HAVE_SEMAPHORE_H -include_HEADERS += include/semaphore.h -endif # include/rtems/posix include_rtems_posix_HEADERS += include/rtems/posix/aio_misc.h diff --git a/cpukit/posix/include/semaphore.h b/cpukit/posix/include/semaphore.h deleted file mode 100644 index 7349270fda..0000000000 --- a/cpukit/posix/include/semaphore.h +++ /dev/null @@ -1,158 +0,0 @@ -/** - * @file - * - * @brief Private Support Information for POSIX Semaphores - * - * This file contains definitions that are internal to the RTEMS - * implementation of POSIX Semaphores. - */ - -/* - * COPYRIGHT (c) 1989-2011. - * On-Line Applications Research Corporation (OAR). - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifndef _SEMAPHORE_H -#define _SEMAPHORE_H - -#ifdef __cplusplus -extern "C" { -#endif - -/** - * @defgroup POSIX_SEMAPHORE POSIX Semaphores Support - * - * @ingroup POSIXAPI - * - * @brief Private Support Information for POSIX Semaphores - */ - -#include - -#if defined(_POSIX_SEMAPHORES) - -#include - -/* - * 11.1 Semaphore Characteristics, P1003.1b-1993, p.219 - */ -typedef uint32_t sem_t; - -/* - * Bad semaphore Id - */ -#define SEM_FAILED ((sem_t *)0) - -/* - * 11.2.1 Initialize an Unnamed Semaphore, P1003.1b-1993, p.219 - */ -int sem_init( - sem_t *sem, - int pshared, - unsigned int value -); - -/** - * @brief Destroy an unnamed semaphore. - * - * 11.2.2 Destroy an Unnamed Semaphore, P1003.1b-1993, p.220 - */ -int sem_destroy( - sem_t *sem -); - -/* - * 11.2.3 Initialize/Open a Named Semaphore, P1003.1b-1993, p.221 - * - * NOTE: Follows open() calling conventions. - */ -sem_t *sem_open( - const char *name, - int oflag, - ... -); - -/** - * @brief Close a named semaphore. - * - * Routine to close a semaphore that has been opened or initialized. - * - * 11.2.4 Close a Named Semaphore, P1003.1b-1993, p.224 - */ -int sem_close( - sem_t *sem -); - -/** - * @brief Remove a named semaphore. - * - * Unlinks a named semaphore, sem_close must also be called to remove - * the semaphore. - * - * 11.2.5 Remove a Named Semaphore, P1003.1b-1993, p.225 - */ -int sem_unlink( - const char *name -); - -/** - * @brief Lock a semaphore. - * - * 11.2.6 Lock a Semaphore, P1003.1b-1993, p.226 - * - * NOTE: P1003.4b/D8 adds sem_timedwait(), p. 27 - */ -int sem_wait( - sem_t *sem -); - -/** - * @brief Lock a semaphore. - * - * @see sem_wait() - */ -int sem_trywait( - sem_t *sem -); - -#if defined(_POSIX_TIMEOUTS) -/** - * @brief Lock a semaphore. - */ -int sem_timedwait( - sem_t *__restrict sem, - const struct timespec *__restrict timeout -); -#endif - -/** - * @brief Unlock a semaphore. - * - * 11.2.7 Unlock a Semaphore, P1003.1b-1993, p.227 - */ -int sem_post( - sem_t *sem -); - -/** - * @brief Get the value of a semaphore. - * - * 11.2.8 Get the Value of a Semaphore, P1003.1b-1993, p.229 - */ -int sem_getvalue( - sem_t *__restrict sem, - int *__restrict sval -); - -#endif /* _POSIX_SEMAPHORES */ - -#ifdef __cplusplus -} -#endif - -#endif -/* end of include file */ diff --git a/cpukit/posix/preinstall.am b/cpukit/posix/preinstall.am index 4f1b220fe1..41f7a26782 100644 --- a/cpukit/posix/preinstall.am +++ b/cpukit/posix/preinstall.am @@ -60,11 +60,6 @@ $(PROJECT_INCLUDE)/mqueue.h: include/mqueue.h $(PROJECT_INCLUDE)/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/mqueue.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/mqueue.h -if !HAVE_SEMAPHORE_H -$(PROJECT_INCLUDE)/semaphore.h: include/semaphore.h $(PROJECT_INCLUDE)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/semaphore.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/semaphore.h -endif $(PROJECT_INCLUDE)/rtems/posix/aio_misc.h: include/rtems/posix/aio_misc.h $(PROJECT_INCLUDE)/rtems/posix/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/posix/aio_misc.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/posix/aio_misc.h -- cgit v1.2.3