diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-01-13 11:33:28 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2017-01-13 11:33:28 +0100 |
commit | 9fad437fbe4b65c3108e9735c44f0587e83bb52b (patch) | |
tree | b0da88047e08696f0abfdbe7dcf5e980120ef1a6 | |
parent | configure: Remove envlock support (diff) | |
download | rtems-9fad437fbe4b65c3108e9735c44f0587e83bb52b.tar.bz2 |
configure: Remove HAVE_STRUCT__THREAD_QUEUE_QUEUE
-rw-r--r-- | cpukit/configure.ac | 1 | ||||
-rw-r--r-- | cpukit/score/src/condition.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/futex.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/mutex.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/sched.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/semaphore.c | 4 | ||||
-rw-r--r-- | cpukit/score/src/threadq.c | 4 | ||||
-rw-r--r-- | testsuites/sptests/Makefile.am | 2 | ||||
-rw-r--r-- | testsuites/sptests/configure.ac | 3 |
9 files changed, 0 insertions, 30 deletions
diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 407093dcaf..93404e7cf3 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -70,7 +70,6 @@ AC_CHECK_DECLS([funlockfile],[AC_CHECK_FUNCS([funlockfile])],,[#include <stdio.h AC_CHECK_DECLS([ftrylockfile],[AC_CHECK_FUNCS([ftrylockfile])],,[#include <stdio.h>]) # Newlib proprietary -AC_CHECK_TYPES([struct _Thread_queue_Queue],[],[],[#include <sys/lock.h>]) AC_CHECK_MEMBER([struct _Thread_queue_Queue._name],[],[RTEMS_TOOL_CHAIN_ERROR],[#include <sys/lock.h>]) # Mandated by POSIX, older newlibs bogusly provided CLOCK_PROCESS_CPUTIME+CLOCK_THREAD_CPUTIME diff --git a/cpukit/score/src/condition.c b/cpukit/score/src/condition.c index 7c370acba3..58569b2f99 100644 --- a/cpukit/score/src/condition.c +++ b/cpukit/score/src/condition.c @@ -16,8 +16,6 @@ #include "config.h" #endif -#if HAVE_STRUCT__THREAD_QUEUE_QUEUE - #include <sys/lock.h> #include <errno.h> @@ -301,5 +299,3 @@ void _Condition_Broadcast( struct _Condition_Control *_condition ) { _Condition_Wake( _condition, INT_MAX ); } - -#endif /* HAVE_STRUCT__THREAD_QUEUE_QUEUE */ diff --git a/cpukit/score/src/futex.c b/cpukit/score/src/futex.c index 1a19f32ca7..888eeda2f2 100644 --- a/cpukit/score/src/futex.c +++ b/cpukit/score/src/futex.c @@ -16,8 +16,6 @@ #include "config.h" #endif -#if HAVE_STRUCT__THREAD_QUEUE_QUEUE - #include <sys/lock.h> #include <errno.h> @@ -168,5 +166,3 @@ int _Futex_Wake( struct _Futex_Control *_futex, int count ) &context.Base ); } - -#endif /* HAVE_STRUCT__THREAD_QUEUE_QUEUE */ diff --git a/cpukit/score/src/mutex.c b/cpukit/score/src/mutex.c index 96834bfb36..5916119f02 100644 --- a/cpukit/score/src/mutex.c +++ b/cpukit/score/src/mutex.c @@ -16,8 +16,6 @@ #include "config.h" #endif -#if HAVE_STRUCT__THREAD_QUEUE_QUEUE - #include <sys/lock.h> #include <errno.h> @@ -414,5 +412,3 @@ void _Mutex_recursive_Release( struct _Mutex_recursive_Control *_mutex ) _Mutex_Queue_release( &mutex->Mutex, level, &queue_context ); } } - -#endif /* HAVE_STRUCT__THREAD_QUEUE_QUEUE */ diff --git a/cpukit/score/src/sched.c b/cpukit/score/src/sched.c index 36d3f0c915..c4de1c3bd9 100644 --- a/cpukit/score/src/sched.c +++ b/cpukit/score/src/sched.c @@ -20,8 +20,6 @@ #include <rtems/score/schedulerimpl.h> -#if HAVE_STRUCT__THREAD_QUEUE_QUEUE - int _Sched_Count( void ) { return (int) _Scheduler_Count; @@ -66,5 +64,3 @@ int _Sched_Processor_count( int index ) return 0; } } - -#endif /* HAVE_STRUCT__THREAD_QUEUE_QUEUE */ diff --git a/cpukit/score/src/semaphore.c b/cpukit/score/src/semaphore.c index 78fec377fe..20492c6d5e 100644 --- a/cpukit/score/src/semaphore.c +++ b/cpukit/score/src/semaphore.c @@ -16,8 +16,6 @@ #include "config.h" #endif -#if HAVE_STRUCT__THREAD_QUEUE_QUEUE - #include <sys/lock.h> #include <rtems/score/assert.h> @@ -152,5 +150,3 @@ void _Semaphore_Post( struct _Semaphore_Control *_sem ) ); } } - -#endif /* HAVE_STRUCT__THREAD_QUEUE_QUEUE */ diff --git a/cpukit/score/src/threadq.c b/cpukit/score/src/threadq.c index 4885326e52..baed6325da 100644 --- a/cpukit/score/src/threadq.c +++ b/cpukit/score/src/threadq.c @@ -22,8 +22,6 @@ #include <rtems/score/rbtreeimpl.h> #include <rtems/score/threadimpl.h> -#if HAVE_STRUCT__THREAD_QUEUE_QUEUE - RTEMS_STATIC_ASSERT( #if defined(RTEMS_SMP) offsetof( Thread_queue_Syslock_queue, Queue.Lock.next_ticket ) @@ -68,8 +66,6 @@ RTEMS_STATIC_ASSERT( THREAD_QUEUE_SYSLOCK_QUEUE_SIZE ); -#endif /* HAVE_STRUCT__THREAD_QUEUE_QUEUE */ - #if defined(RTEMS_SMP) void _Thread_queue_Do_acquire_critical( Thread_queue_Control *the_thread_queue, diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index 144ea305b6..5003325475 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -41,9 +41,7 @@ if HAS_SMP else _SUBDIRS += sp29 endif -if HAS__THREAD_QUEUE_QUEUE _SUBDIRS += spsyslock01 -endif _SUBDIRS += spstdthreads01 _SUBDIRS += splinkersets01 _SUBDIRS += sptasknopreempt01 diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 9feee8b015..74ce15d656 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -30,9 +30,6 @@ AM_CONDITIONAL([HAS_CPLUSPLUS],[test $HAS_CPLUSPLUS = "yes"]) # FIXME: We should get rid of this. It's a cludge. AC_CHECK_SIZEOF([time_t]) -AC_CHECK_TYPES([struct _Thread_queue_Queue],[],[],[#include <sys/lock.h>]) -AM_CONDITIONAL(HAS__THREAD_QUEUE_QUEUE,test x"${ac_cv_type_struct__Thread_queue_Queue}" = x"yes") - # Some tests should not be built/run in SMP configurations RTEMS_CHECK_CPUOPTS([RTEMS_SMP]) AM_CONDITIONAL(HAS_SMP,test "$rtems_cv_RTEMS_SMP" = "yes") |