From dc7031904de103064da3b93ed90f0791c8b8adb4 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Fri, 13 Jan 2017 09:39:32 +0100 Subject: configure: Remove HAVE_THREADS_H support --- cpukit/configure.ac | 5 +---- cpukit/libstdthreads/Makefile.am | 2 -- testsuites/sptests/Makefile.am | 2 -- testsuites/sptests/configure.ac | 3 --- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/cpukit/configure.ac b/cpukit/configure.ac index 2a1ab64620..945bd309a4 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 semaphore.h sys/cdefs.h sys/queue.h],, +AC_CHECK_HEADERS([errno.h sched.h semaphore.h sys/cdefs.h sys/queue.h tar.h threads.h],, [RTEMS_TOOL_CHAIN_ERROR]) -AC_CHECK_HEADERS([threads.h]) -AM_CONDITIONAL([HAVE_THREADS_H],[test x"$ac_cv_header_threads_h" = x"yes"]) - ## error out if libc doesn't provide stdint.h AS_IF([test x"${ac_cv_header_stdint_h}" != xyes], [RTEMS_TOOL_CHAIN_ERROR]) diff --git a/cpukit/libstdthreads/Makefile.am b/cpukit/libstdthreads/Makefile.am index 8b4ffaae0f..b6b9138063 100644 --- a/cpukit/libstdthreads/Makefile.am +++ b/cpukit/libstdthreads/Makefile.am @@ -8,7 +8,6 @@ libstdthreads_a_CFLAGS = -std=c11 libstdthreads_a_CPPFLAGS = $(AM_CPPFLAGS) libstdthreads_a_SOURCES = -if HAVE_THREADS_H libstdthreads_a_SOURCES += call_once.c libstdthreads_a_SOURCES += cnd.c libstdthreads_a_SOURCES += mtx.c @@ -16,6 +15,5 @@ if HAS_PTHREADS libstdthreads_a_SOURCES += thrd.c endif libstdthreads_a_SOURCES += tss.c -endif include $(top_srcdir)/automake/local.am diff --git a/testsuites/sptests/Makefile.am b/testsuites/sptests/Makefile.am index 09b8b79362..144ea305b6 100644 --- a/testsuites/sptests/Makefile.am +++ b/testsuites/sptests/Makefile.am @@ -44,9 +44,7 @@ endif if HAS__THREAD_QUEUE_QUEUE _SUBDIRS += spsyslock01 endif -if HAS_THREADS_H _SUBDIRS += spstdthreads01 -endif _SUBDIRS += splinkersets01 _SUBDIRS += sptasknopreempt01 _SUBDIRS += spintrcritical23 diff --git a/testsuites/sptests/configure.ac b/testsuites/sptests/configure.ac index 0a2882498b..9feee8b015 100644 --- a/testsuites/sptests/configure.ac +++ b/testsuites/sptests/configure.ac @@ -33,9 +33,6 @@ AC_CHECK_SIZEOF([time_t]) AC_CHECK_TYPES([struct _Thread_queue_Queue],[],[],[#include ]) AM_CONDITIONAL(HAS__THREAD_QUEUE_QUEUE,test x"${ac_cv_type_struct__Thread_queue_Queue}" = x"yes") -AC_CHECK_HEADERS([threads.h]) -AM_CONDITIONAL([HAS_THREADS_H],[test x"$ac_cv_header_threads_h" = 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") -- cgit v1.2.3